From 90abec6193a4914556859dffff8850548ed1f3f9 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 31 Jan 2023 10:00:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E4=BB=B6=E6=9C=80=E5=B0=8F=E9=95=BF?= =?UTF-8?q?=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/editor/EditBar.vue | 4 ++-- frontend/src/components/deDrag/index.vue | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue index 86311555c3..19707fb2cc 100644 --- a/frontend/src/components/canvas/components/editor/EditBar.vue +++ b/frontend/src/components/canvas/components/editor/EditBar.vue @@ -346,10 +346,10 @@ export default { return this.targetLinkageInfo[this.element.propValue.viewId] }, miniHeight() { - return this.mobileLayoutStatus ? 1 : 4 + return this.mobileLayoutStatus ? 1 : 1 }, miniWidth() { - return this.mobileLayoutStatus ? 1 : 4 + return this.mobileLayoutStatus ? 1 : 1 }, curCanvasScaleSelf() { return this.curCanvasScaleMap[this.canvasId] diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 5d277f402e..47b96e2c9c 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -630,7 +630,8 @@ export default { } if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) { const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight - return (height - this.curGap * 2) + 'px' + const hp = (height - this.curGap * 2) + return (hp > 3 ? hp : 3) + 'px' } else { return (this.height - this.curGap * 2) + 'px' } @@ -682,14 +683,14 @@ export default { return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0 }, miniWidth() { - return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 4) : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 1) : 0 }, miniHeight() { if (this.element.auxiliaryMatrix) { if (this.element.component === 'de-number-range') { - return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 1) : 0 } else { - return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0 + return this.element.auxiliaryMatrix ? this.curCanvasScaleSelf.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 1) : 0 } } else { return 0 From c26afede20483ba5096780aa6c2ada5cb6892296 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 31 Jan 2023 10:55:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?perf(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E9=9A=90=E8=97=8Fpdf=E5=AF=BC=E5=87=BA=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/Toolbar.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index b2138a1d57..c2e3132a1c 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -154,7 +154,7 @@ /> - + Date: Tue, 31 Jan 2023 14:44:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=20API=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E4=B8=8D=E6=A0=A1=E9=AA=8Cjsonpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- frontend/src/views/system/datasource/DsConfiguration.vue | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 9beb7b3421..f97d2eb399 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1884,7 +1884,7 @@ export default { all_compute_mode: 'Direct connection and extraction mode', extra_params: 'Extra JDBC connection string', please_input_dataPath: 'Please enter the JsonPath data path', - show_api_data: 'View API raw data', + show_api_data: 'View API data structure', warning: 'Contains invalid table', data_table: 'Dataset Table', data_table_name: 'Dataset Table name', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 7efd09f9c8..ee62fb3c3d 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1878,7 +1878,7 @@ export default { all_compute_mode: '直連、抽取模式', extra_params: '額外的JDBC連接字符串', please_input_dataPath: '請輸入 JsonPath 數據路徑', - show_api_data: '查看API原始數據', + show_api_data: '查看API数据結構', warning: '包含無效數據表', data_table: '數據表', data_table_name: '數據表名稱', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 38a00e387d..1fb1fe5f52 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1877,7 +1877,7 @@ export default { all_compute_mode: '直连、抽取模式', extra_params: '额外的JDBC连接字符串', please_input_dataPath: '请输入 JsonPath 数据路径', - show_api_data: '查看API原始数据', + show_api_data: '查看API数据结构', warning: '包含无效数据表', data_table: '数据表', data_table_name: '数据表名称', diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue index 9d52574195..f1eaa8c582 100644 --- a/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/frontend/src/views/system/datasource/DsConfiguration.vue @@ -1174,10 +1174,6 @@ export default { } }, showApiData(){ - if (this.apiItem.useJsonPath && !this.apiItem.jsonPath) { - this.$message.error(i18n.t('datasource.please_input_dataPath')) - return - } this.$refs.apiItemBasicInfo.validate((valid) => { if (valid) { const data = Base64.encode(JSON.stringify(this.apiItem)) From 1364fa7f953b137d9c7cc74a7be6a9b5b8f0a86b Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 31 Jan 2023 15:05:59 +0800 Subject: [PATCH 4/6] Create sync2gitee.yml --- .github/workflows/sync2gitee.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/sync2gitee.yml diff --git a/.github/workflows/sync2gitee.yml b/.github/workflows/sync2gitee.yml new file mode 100644 index 0000000000..bd6df50f81 --- /dev/null +++ b/.github/workflows/sync2gitee.yml @@ -0,0 +1,17 @@ +name: sync2gitee +on: [push] + +jobs: + repo-sync: + runs-on: ubuntu-latest + steps: + - name: Mirror the Github organization repos to Gitee. + uses: Yikun/hub-mirror-action@master + with: + src: 'github/dataease' + dst: 'gitee/fit2cloud-feizhiyun' + dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} + dst_token: ${{ secrets.GITEE_TOKEN }} + static_list: ${{ github.event.repository.name }} + force_update: true + debug: true From bce2adbaf5906f5832ea0fe97092df1599230cc2 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 31 Jan 2023 15:08:12 +0800 Subject: [PATCH 5/6] Update sync2gitee.yml --- .github/workflows/sync2gitee.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sync2gitee.yml b/.github/workflows/sync2gitee.yml index bd6df50f81..6fe33c8402 100644 --- a/.github/workflows/sync2gitee.yml +++ b/.github/workflows/sync2gitee.yml @@ -14,4 +14,3 @@ jobs: dst_token: ${{ secrets.GITEE_TOKEN }} static_list: ${{ github.event.repository.name }} force_update: true - debug: true From 6cc159a7b0cb90632159b25450d7709c3abea4e7 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 31 Jan 2023 15:11:40 +0800 Subject: [PATCH 6/6] Update sync2gitee.yml --- .github/workflows/sync2gitee.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync2gitee.yml b/.github/workflows/sync2gitee.yml index 6fe33c8402..10dccce369 100644 --- a/.github/workflows/sync2gitee.yml +++ b/.github/workflows/sync2gitee.yml @@ -12,5 +12,5 @@ jobs: dst: 'gitee/fit2cloud-feizhiyun' dst_key: ${{ secrets.GITEE_PRIVATE_KEY }} dst_token: ${{ secrets.GITEE_TOKEN }} - static_list: ${{ github.event.repository.name }} + static_list: "DataEase" force_update: true