Merge pull request #6392 from dataease/pr@dev-v2_dzz

Pr@dev v2 dzz

core/core-frontend/src/components/data-visualization/canvas/Area.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { defineProps, toRefs } from 'vue'
+import { toRefs } from 'vue'
 const props = defineProps({
   start: {
     type: Object,

core/core-frontend/src/components/visualization/FrameLinks.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineEmits, reactive, ref, toRefs, watch } from 'vue'
+import { reactive, ref, toRefs, watch } from 'vue'
 import { dvMainStoreWithOut } from '../../store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia/dist/pinia'
 import { checkAddHttp, deepCopy } from '../../utils/utils'

core/core-frontend/src/custom-component/rich-text/DeRichEditor.vue

@@ -21,7 +21,7 @@ import 'tinymce/plugins/code' // 源码
 
 //接下来定义编辑器所需要的插件数据
 import { reactive, ref } from 'vue'
-import { onMounted, defineEmits, watch } from 'vue'
+import { onMounted, watch } from 'vue'
 import axios from 'axios'
 // import { updateImg } from '@/api/order/order'
 const emits = defineEmits(['getContent'])

core/core-frontend/src/custom-component/v-query/Component.vue

@@ -499,6 +499,7 @@ const opacityStyle = computed(() => {
   position: relative;
   display: flex;
   margin: auto 0;
+  padding: 16px;
   .query-fields-container {
     display: flex;
     flex-wrap: wrap;

core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextLabelThresholdEdit.vue

@@ -1,5 +1,5 @@
 <script lang="tsx" setup>
-import { defineEmits, reactive } from 'vue'
+import { reactive } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { COLOR_PANEL } from '../../../util/chart'
 

core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue

@@ -1,5 +1,5 @@
 <script lang="tsx" setup>
-import { defineEmits, reactive } from 'vue'
+import { reactive } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { COLOR_PANEL } from '../../../util/chart'
 

core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue

@@ -113,10 +113,7 @@ const showAll = ref(true)
 const dataset = ref()
 const loading = ref(false)
 const createDataset = ref(false)
-let tData = []
-const filterMethod = value => {
-  state.tData = [...tData].filter(item => item.name.includes(value))
-}
+const filterMethod = (value, data) => data.name.includes(value)
 const resetForm = () => {
   createDataset.value = false
 }
@@ -160,7 +157,6 @@ const createInit = (type, data: Tree, exec, name: string) => {
         state.tData[0].name = '数据集'
       }
       data.id = formatRootMiss(data.id, state.tData)
-      tData = [...state.tData]
       if (exec) {
         pid.value = data.pid
         id.value = data.id
@@ -322,7 +318,7 @@ const emits = defineEmits(['finish'])
           style="width: 100%"
           :props="props"
           @node-click="nodeClick"
-          :filter-method="filterMethod"
+          :filter-node-method="filterMethod"
           filterable
         >
           <template #default="{ data: { name } }">

core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue

@@ -107,11 +107,7 @@ const showAll = ref(true)
 const datasource = ref()
 const loading = ref(false)
 const createDataset = ref(false)
-let tData = []
-
-const filterMethod = value => {
-  state.tData = [...tData].filter(item => item.name.includes(value))
-}
+const filterMethod = (value, data) => data.name.includes(value)
 const resetForm = () => {
   createDataset.value = false
 }
@@ -147,7 +143,6 @@ const createInit = (type, data: Tree, exec, name: string) => {
         if (state.tData.length && state.tData[0].name === 'root' && state.tData[0].id === '0') {
           state.tData[0].name = '数据源'
         }
-        tData = [...state.tData]
       })
     }
     if (exec) {