From dbfc2192149fc5eff9113b68403dd06f1a52f3f4 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Mon, 18 Dec 2023 18:04:11 +0800 Subject: [PATCH 01/17] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=BC=8F=E8=BD=AC=E6=8D=A2=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/dectl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/installer/dectl b/installer/dectl index c1a2707769..d157a9ecaa 100644 --- a/installer/dectl +++ b/installer/dectl @@ -43,6 +43,11 @@ function usage() { echo " clear-images 清理 DATAEASE 旧版本的相关镜像" echo " version 查看 DATAEASE 版本" } +function _generate_compose_file_args() { + if [[ $DE_INSTALL_MODE != "community" ]];then + compose_files="${compose_files} -f docker-compose-apisix.yml" + fi +} function _check_apisix_init() { if [[ $DE_INSTALL_MODE != "community" ]];then _prepare_apisix @@ -100,7 +105,7 @@ function _get_current_version() { function status() { echo echo "DataEase 容器运行状态" - _check_apisix_init + _generate_compose_file_args cd ${DE_RUNNING_BASE} ${compose_cmd} ${compose_files} ps @@ -137,7 +142,7 @@ function start() { } function stop() { echo - _check_apisix_init + _generate_compose_file_args cd ${DE_RUNNING_BASE} ${compose_cmd} ${compose_files} down -v ${target} } From 531b28c6875ea550ed1165484ec4366e3f7a227a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 18 Dec 2023 19:24:58 +0800 Subject: [PATCH 02/17] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CoreVisualizationManage.java | 5 +++ .../server/DataVisualizationServer.java | 33 ++++++++++++------- .../modules/data-visualization/dvMain.ts | 5 +++ core/core-frontend/src/utils/canvasUtils.ts | 2 +- .../src/views/common/DeResourceTree.vue | 6 ++-- .../src/views/dashboard/index.vue | 19 +++++++++-- .../src/views/data-visualization/index.vue | 11 +++++-- 7 files changed, 60 insertions(+), 21 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java index d4979bc207..26aae651f9 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java @@ -56,6 +56,7 @@ public class CoreVisualizationManage { } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("delete_flag", false); + queryWrapper.ne("pid",-1); queryWrapper.eq(ObjectUtils.isNotEmpty(request.getLeaf()), "node_type", ObjectUtils.isNotEmpty(request.getLeaf()) && request.getLeaf() ? "leaf" : "folder"); queryWrapper.eq("type", request.getBusiFlag()); queryWrapper.orderByDesc("create_time"); @@ -108,6 +109,10 @@ public class CoreVisualizationManage { @XpackInteract(value = "visualizationResourceTree", before = false) public Long innerSave(DataVisualizationInfo visualizationInfo) { + return preInnerSave(visualizationInfo); + } + + public Long preInnerSave(DataVisualizationInfo visualizationInfo){ if (visualizationInfo.getId() == null) { Long id = IDUtils.snowID(); visualizationInfo.setId(id); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index ba43f7c297..fefd404e02 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -122,18 +122,24 @@ public class DataVisualizationServer implements DataVisualizationApi { } DataVisualizationInfo visualizationInfo = new DataVisualizationInfo(); BeanUtils.copyBean(visualizationInfo, request); - - // 检查当前节点的pid是否一致如果不一致 需要调用move 接口(预存 可能会出现pid =-1的情况) - if (request.getPid() != -1) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pid", request.getPid()); - queryWrapper.eq("id", dvId); - if (!visualizationInfoMapper.exists(queryWrapper)) { - request.setMoveFromUpdate(true); - coreVisualizationManage.move(request); + if(DataVisualizationConstants.RESOURCE_OPT_TYPE.COPY.equals(request.getOptType())){ + // 复制更新 新建权限插入 + visualizationInfoMapper.deleteById(dvId); + visualizationInfo.setNodeType(DataVisualizationConstants.NODE_TYPE.LEAF); + coreVisualizationManage.innerSave(visualizationInfo); + }else{ + // 检查当前节点的pid是否一致如果不一致 需要调用move 接口(预存 可能会出现pid =-1的情况) + if (request.getPid() != -1) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pid", request.getPid()); + queryWrapper.eq("id", dvId); + if (!visualizationInfoMapper.exists(queryWrapper)) { + request.setMoveFromUpdate(true); + coreVisualizationManage.move(request); + } } + coreVisualizationManage.innerEdit(visualizationInfo); } - coreVisualizationManage.innerEdit(visualizationInfo); //保存视图信 chartDataManage.saveChartViewFromVisualization(request.getComponentData(), dvId, request.getCanvasViewInfo()); } @@ -214,8 +220,10 @@ public class DataVisualizationServer implements DataVisualizationApi { extDataVisualizationMapper.copyLinkJump(copyId); extDataVisualizationMapper.copyLinkJumpInfo(copyId); extDataVisualizationMapper.copyLinkJumpTargetInfo(copyId); - - coreVisualizationManage.innerSave(newDv); + DataVisualizationInfo visualizationInfoTarget = new DataVisualizationInfo(); + BeanUtils.copyBean(visualizationInfoTarget,newDv); + visualizationInfoTarget.setPid(-1L); + coreVisualizationManage.preInnerSave(visualizationInfoTarget); return String.valueOf(newDvId); } @@ -321,6 +329,7 @@ public class DataVisualizationServer implements DataVisualizationApi { } wrapper.eq("delete_flag", 0); wrapper.eq("pid", request.getPid()); + wrapper.ne("pid", -1); wrapper.eq("name", request.getName().trim()); wrapper.eq("node_type", request.getNodeType()); wrapper.eq("type", request.getType()); diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index 1ac36ccf3c..36268cbac7 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -52,6 +52,7 @@ export const dvMainStore = defineStore('dataVisualization', { // 大屏基础信息 dvInfo: { dataState: null, + optType: null, id: null, name: null, pid: null, @@ -845,6 +846,7 @@ export const dvMainStore = defineStore('dataVisualization', { resetDvInfo() { this.dvInfo = { dataState: null, + optType: null, id: null, name: null, pid: null, @@ -871,6 +873,7 @@ export const dvMainStore = defineStore('dataVisualization', { updateDvInfoId(newId) { if (this.dvInfo) { this.dvInfo.dataState = 'ready' + this.dvInfo.optType = null this.dvInfo.id = newId } }, @@ -878,6 +881,7 @@ export const dvMainStore = defineStore('dataVisualization', { const optName = dvType === 'dashboard' ? '新建仪表板' : '新建数据大屏' this.dvInfo = { dataState: 'prepare', + optType: null, id: resourceId, name: optName, pid: pid, @@ -899,6 +903,7 @@ export const dvMainStore = defineStore('dataVisualization', { this.componentData = [] this.dvInfo = { dataState: null, + optType: null, id: null, name: null, pid: null, diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index bbacdce160..c5a2bb84f4 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -289,7 +289,7 @@ export function filterEmptyFolderTree(nodes) { export function findParentIdByChildIdRecursive(tree, targetChildId) { function findParentId(node, targetChildId) { - if (node.type === 'folder' && node.children) { + if (node.children) { for (const childNode of node.children) { if (childNode.id === targetChildId) { return node.id // 找到匹配的子节点，返回其父节点的 ID diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue index 7aefe562ce..7e16495c8d 100644 --- a/core/core-frontend/src/views/common/DeResourceTree.vue +++ b/core/core-frontend/src/views/common/DeResourceTree.vue @@ -244,9 +244,9 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => { copyResource(params).then(data => { const baseUrl = curCanvasType.value === 'dataV' - ? '#/dvCanvas?opt=copy&dvId=' - : '#/dashboard?opt=copy&resourceId=' - window.open(baseUrl + data.data, '_blank') + ? `#/dvCanvas?opt=copy&pid=${params.pid}&dvId=${data.data}` + : `#/dashboard?opt=copy&pid=${params.pid}&resourceId=${data.data}` + window.open(baseUrl, '_blank') }) } } diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue index f229923c55..06f8353244 100644 --- a/core/core-frontend/src/views/dashboard/index.vue +++ b/core/core-frontend/src/views/dashboard/index.vue @@ -28,8 +28,15 @@ const eventCheck = e => { const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() -const { componentData, curComponent, canvasStyleData, canvasViewInfo, editMode, batchOptStatus } = - storeToRefs(dvMainStore) +const { + componentData, + curComponent, + canvasStyleData, + canvasViewInfo, + editMode, + batchOptStatus, + dvInfo +} = storeToRefs(dvMainStore) const dataInitState = ref(false) const state = reactive({ @@ -62,6 +69,14 @@ onMounted(() => { dataInitState.value = false initCanvasData(resourceId, 'dashboard', function () { dataInitState.value = true + if (dvInfo.value && opt === 'copy') { + dvInfo.value.dataState = 'prepare' + dvInfo.value.optType = 'copy' + dvInfo.value.pid = pid + setTimeout(() => { + snapshotStore.recordSnapshotCache() + }, 1500) + } }) } else if (opt && opt === 'create') { dataInitState.value = false diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue index d8ad1e2c52..545893cd68 100644 --- a/core/core-frontend/src/views/data-visualization/index.vue +++ b/core/core-frontend/src/views/data-visualization/index.vue @@ -193,13 +193,18 @@ onMounted(() => { state.canvasInitStatus = false initCanvasData(dvId, 'dataV', function () { state.canvasInitStatus = true - if (dvInfo.value && opt === 'copy') { - dvInfo.value.dataState = 'prepare' - } // afterInit nextTick(() => { dvMainStore.setDataPrepareState(true) snapshotStore.recordSnapshotCache('renderChart') + if (dvInfo.value && opt === 'copy') { + dvInfo.value.dataState = 'prepare' + dvInfo.value.optType = 'copy' + dvInfo.value.pid = pid + setTimeout(() => { + snapshotStore.recordSnapshotCache('renderChart') + }, 1500) + } }) }) } else if (opt && opt === 'create') { From 8616ecc1d580dd935c159cd0d36a5365c59158b7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 18 Dec 2023 20:00:45 +0800 Subject: [PATCH 03/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=A4=A7=E5=B1=8F=E7=99=BE=E5=88=86=E6=AF=94=E6=97=B6?= =?UTF-8?q?=E5=AE=B9=E6=98=93=E8=A7=A6=E5=8F=91=E5=88=A0=E9=99=A4=E7=83=AD?= =?UTF-8?q?=E9=94=AE=E9=97=AE=E9=A2=98=20#7131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/data-visualization/ComponentToolBar.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue index efe0566bfc..98b13fc8be 100644 --- a/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue +++ b/core/core-frontend/src/components/data-visualization/ComponentToolBar.vue @@ -82,6 +82,8 @@ onUnmounted(() => {
Date: Mon, 18 Dec 2023 20:10:40 +0800 Subject: [PATCH 04/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=97=B6Tab=E7=BB=84=E4=BB=B6=E4=B9=9F=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/ComponentWrapper.vue | 1 + .../src/custom-component/de-tabs/Component.vue | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue index 3a75b7d178..59655240de 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -214,6 +214,7 @@ const deepScale = computed(() => scale.value / 100) :search-count="searchCount" :scale="deepScale" :disabled="true" + :is-edit="false" />
diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue index b277f58b20..b06848a8b3 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -8,7 +8,7 @@ {{ tabItem.title }} editMode.value === 'edit' && isEdit.value) + const calcTabLength = () => { setTimeout(() => { if (element.value.propValue.length > 1) { From 3d013cccec203060591481ebdd76509e59bb54ca Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 19 Dec 2023 11:17:19 +0800 Subject: [PATCH 05/17] Update issue templates --- .github/ISSUE_TEMPLATE/bug---.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug---.md b/.github/ISSUE_TEMPLATE/bug---.md index 8d9b63d462..58994bde2f 100644 --- a/.github/ISSUE_TEMPLATE/bug---.md +++ b/.github/ISSUE_TEMPLATE/bug---.md @@ -3,7 +3,7 @@ name: Bug 提交 about: 提交产品缺陷帮助我们更好的改进 title: "[Bug]" labels: 状态:待处理 -assignees: BBchicken-9527, zrfit +assignees: BBchicken-9527, Shenguobin0102, zrfit --- From e15a3469fc4abc120c2f1c828f5d5401f4930139 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Tue, 19 Dec 2023 15:26:54 +0800 Subject: [PATCH 06/17] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=84=9A=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/dectl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/dectl b/installer/dectl index d157a9ecaa..2115941e6b 100644 --- a/installer/dectl +++ b/installer/dectl @@ -229,7 +229,7 @@ def get_releases(page): releases=[ x["name"] for x in json.loads(releases) if x["prerelease"] == False ] except Exception as e: print(str(e)) - print("获取Release信息失败，请检查服务器到 %s 的网络连接是否正常" % (server_url)) + print("Failed to obtain Release information, please check the network.") exit(1) else: for release in releases: @@ -244,10 +244,10 @@ while (page <= 3): page += 1 if latest_release == None or latest_release == "": - print("未获取到最新版本，请稍候重试") + print("Failed to obtain latest version, please try again.") exit(1) else: - print("最新版本为 %s" % (latest_release)) + print("latest version is %s" % (latest_release)) # 记录最新版本号 os.popen("echo "+latest_release+" > /tmp/de_latest_release") @@ -294,7 +294,7 @@ EOF exit 1 fi - cd ${installer_file%.*} + cd ${installer_file%.tar.gz} /bin/bash install.sh cd .. From efdb7ff3f3784aeec4800c2e7270b23e6912c2bf Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 19 Dec 2023 19:23:32 +0800 Subject: [PATCH 07/17] =?UTF-8?q?feat:=20api=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/menu/manage/MenuManage.java | 3 ++- de-xpack | 2 +- .../src/main/java/io/dataease/utils/WhitelistUtils.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 87f7a08b88..e16ac95ec1 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -96,6 +96,7 @@ public class MenuManage { || coreMenu.getId().equals(21L) || coreMenu.getPid().equals(21L) || coreMenu.getId().equals(25L) - || coreMenu.getId().equals(26L); + || coreMenu.getId().equals(26L) + || coreMenu.getId().equals(35L); } } diff --git a/de-xpack b/de-xpack index dfc290223f..80f4f36ad7 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit dfc290223ffb39bcff839d43f5e828dbe647c730 +Subproject commit 80f4f36ad7d179645d635c2490dd898beda7e746 diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index 955cb8e9a4..8f1fdec13e 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -14,8 +14,8 @@ public class WhitelistUtils { "/dekey", "/index.html", "/model", - "/deApi", - "/demo.html", + // "/deApi", + // "/demo.html", "/swagger-resources", "/doc.html", "/panel.html", @@ -31,7 +31,7 @@ public class WhitelistUtils { return WHITE_PATH.contains(requestURI) || StringUtils.endsWithAny(requestURI, ".ico", "js", ".css", "svg", "png", "jpg", "js.map") || StringUtils.startsWithAny(requestURI, "data:image") - || StringUtils.startsWithAny(requestURI, "/v3/") + // || StringUtils.startsWithAny(requestURI, "/v3/") || StringUtils.startsWithAny(requestURI, "/login/platformLogin/") || StringUtils.startsWithAny(requestURI, "/static-resource/") || StringUtils.startsWithAny(requestURI, "/share/proxyInfo") From d21337eac5f7baceb3aa277f07a825c1cf7a9305 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:10:59 +0800 Subject: [PATCH 08/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index 8f1fdec13e..41ac7d5aba 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -14,8 +14,6 @@ public class WhitelistUtils { "/dekey", "/index.html", "/model", - // "/deApi", - // "/demo.html", "/swagger-resources", "/doc.html", "/panel.html", @@ -31,7 +29,6 @@ public class WhitelistUtils { return WHITE_PATH.contains(requestURI) || StringUtils.endsWithAny(requestURI, ".ico", "js", ".css", "svg", "png", "jpg", "js.map") || StringUtils.startsWithAny(requestURI, "data:image") - // || StringUtils.startsWithAny(requestURI, "/v3/") || StringUtils.startsWithAny(requestURI, "/login/platformLogin/") || StringUtils.startsWithAny(requestURI, "/static-resource/") || StringUtils.startsWithAny(requestURI, "/share/proxyInfo") From 2c02922b3bde501fe235e4e7e2c14955dd8c01b7 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:16:31 +0800 Subject: [PATCH 09/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=20console=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/data-visualization/canvas/CanvasCore.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index a2f0aff85b..7e5cb6c784 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -1185,9 +1185,7 @@ const userViewEnlargeOpen = (opt, item) => { } const initSnapshotTimer = () => { - console.log('check1==') snapshotTimer.value = setInterval(() => { - console.log('check2==') snapshotStore.snapshotCatchToStore() }, 1000) } From 8fbb3b632f766c8441309d0d4d3bd493a7e8cd1b Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:18:14 +0800 Subject: [PATCH 10/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/config/dev.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/core-frontend/config/dev.ts b/core/core-frontend/config/dev.ts index d45a92d3ef..ca7bea35d7 100644 --- a/core/core-frontend/config/dev.ts +++ b/core/core-frontend/config/dev.ts @@ -2,18 +2,12 @@ export default { server: { proxy: { '/api/f': { - // target: 'http://192.168.31.38:8100', target: 'http://localhost:8100', changeOrigin: true, rewrite: path => path.replace(/^\/api\/f/, '') }, // 使用 proxy 实例 '/api': { - // target: 'http://qa-de2.fit2cloud.com', - // target: 'http://192.168.31.74:8100', - // target: 'https://de2.fit2cloud.com', - // target: 'http://localhost:8100', - // target: 'http://192.168.0.121:9080', target: 'http://localhost:8100', changeOrigin: true, rewrite: path => path.replace(/^\/api/, 'de2api') From 3fbf613467561caf38d42b9607e46a07ad191a13 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:20:21 +0800 Subject: [PATCH 11/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/style/index.less | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index 29dcc8aa6a..e06177f686 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -6,7 +6,6 @@ color-scheme: light dark; font-synthesis: none; - // text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -webkit-text-size-adjust: 100%; @@ -284,16 +283,6 @@ body { color: var(--ed-color-primary, #3370FF); } -// .ed-drawer__footer { -// height: 64px !important; -// padding: 0px !important; -// box-shadow: 0 -1px 0px #d7d7d7 !important; -// } - -// .ed-drawer__body { -// padding: 0 0 64px 0 !important; -// } - .ed-tree-node.is-current>.ed-tree-node__content:not(.is-menu):after { display: none; } From cfc5e7ba367e984219755f66787b96a7165ece07 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:21:19 +0800 Subject: [PATCH 12/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/style.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/core-frontend/src/utils/style.ts b/core/core-frontend/src/utils/style.ts index 4cb8f1642b..e63c0355ac 100644 --- a/core/core-frontend/src/utils/style.ts +++ b/core/core-frontend/src/utils/style.ts @@ -198,14 +198,6 @@ export function getCanvasStyle(canvasStyleData) { return style } -// export function createGroupStyle(groupComponent) { -// const parentStyle = groupComponent.style -// groupComponent.propValue.forEach(component => { -// component.style.left = component.style.left - parentStyle.left -// component.style.top = component.style.top - parentStyle.top -// }) -// } - export function createGroupStyle(groupComponent) { const parentStyle = groupComponent.style groupComponent.propValue.forEach(component => { From fc6917efee7da053ad21c1b27ac20ad1aee3e3f3 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:22:01 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=20chore=EF=BC=9A=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/custom-component/group/Component.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/core-frontend/src/custom-component/group/Component.vue b/core/core-frontend/src/custom-component/group/Component.vue index aceef1095b..52429009e0 100644 --- a/core/core-frontend/src/custom-component/group/Component.vue +++ b/core/core-frontend/src/custom-component/group/Component.vue @@ -55,9 +55,6 @@ const customCanvasStyle = computed(() => { result.scale = canvasStyleData.value.scale result.width = (element.value.style.width * 100) / result.scale result.height = (element.value.style.height * 100) / result.scale - - // result.width = element.value.style.width - // result.height = element.value.style.height return result }) From 5a48eb439a917b4b1973199434c04936c5f8d639 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:23:06 +0800 Subject: [PATCH 14/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/js/util.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/js/util.ts b/core/core-frontend/src/views/chart/components/js/util.ts index 7810c1d310..abb9c65629 100644 --- a/core/core-frontend/src/views/chart/components/js/util.ts +++ b/core/core-frontend/src/views/chart/components/js/util.ts @@ -165,17 +165,6 @@ export function getColors(chart, colors, reset) { } else { if (chart.data) { const data = chart.data.data - // data 的维度值，需要根据自定义顺序排序 - // let customSortData - // if (Object.prototype.toString.call(chart.customSort) === '[object Array]') { - // customSortData = JSON.parse(JSON.stringify(chart.customSort)) - // } else { - // customSortData = JSON.parse(chart.customSort) - // } - // if (customSortData && customSortData.length > 0) { - // data = customSort(customSortData, data) - // } - for (let i = 0; i < data.length; i++) { const s = data[i] seriesColors.push({ From 332ba3f2d86c2179917c326a2509194c2cc72d44 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:23:42 +0800 Subject: [PATCH 15/17] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/visualization/UserViewEnlarge.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 33e12b8306..9daf75ed77 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -103,10 +103,6 @@ const downloadViewDetails = () => { const chart = { ...viewInfo.value, chartExtRequest, data: viewDataInfo } exportExcelDownload(chart) } -// -// const htmlToImage = () => { -// downloadCanvas('img', viewContainer.value, viewInfo.value.title) -// } const htmlToImage = () => { toPng(viewContainer.value) From eb0fcac7215b20c0e294b785988be8a46886d57e Mon Sep 17 00:00:00 2001 From: Zhimin Ruan Date: Wed, 20 Dec 2023 09:32:11 +0800 Subject: [PATCH 16/17] =?UTF-8?q?chore=EF=BC=9A=E5=88=A0=E9=99=A4=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/pom.xml | 9 ++---- .../src/main/resources/ehcache/ehcache.xml | 28 ------------------- .../src/components/dashboard/DbToolbar.vue | 1 - .../editor/editor-senior/Senior.vue | 16 ----------- .../src/views/common/DeResourceTree.vue | 6 ---- .../views/data-visualization/PreviewHead.vue | 1 - .../system/parameter/basic/BasicEdit.vue | 28 ------------------- .../src/views/system/parameter/index.vue | 1 - .../visualized/data/datasource/index.vue | 1 - 9 files changed, 3 insertions(+), 88 deletions(-) diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml index 633c8177bd..ad0152efa1 100644 --- a/core/core-backend/pom.xml +++ b/core/core-backend/pom.xml @@ -218,14 +218,14 @@ - + distributed distributed - + io.dataease distributed @@ -239,7 +239,7 @@ maven-compiler-plugin - + io/dataease/substitute/** @@ -269,9 +269,6 @@ org.springframework.boot spring-boot-maven-plugin - diff --git a/core/core-backend/src/main/resources/ehcache/ehcache.xml b/core/core-backend/src/main/resources/ehcache/ehcache.xml index 27b2096ef5..05361056d6 100644 --- a/core/core-backend/src/main/resources/ehcache/ehcache.xml +++ b/core/core-backend/src/main/resources/ehcache/ehcache.xml @@ -10,26 +10,6 @@ - - @@ -138,14 +118,6 @@ java.lang.String java.util.List - diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index 9449b6f512..616799591f 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -411,7 +411,6 @@ onMounted(() => { > - { 已设置 - - - - - - - -
-