Merge branch 'dev-v2' of github.com:dataease/dataease into dev-v2

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')

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)
 }

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)

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
 })
 </script>

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;
 }

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 => {

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({