From 4152b425736541a22b8be89512ed9247e346ed11 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 25 Dec 2023 16:38:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6-?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6-?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98-=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6-=E4=BB=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=A0=E9=99=A4=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/Component.vue    | 85 +------------------
 .../v-query/QueryConditionConfiguration.vue   | 12 +--
 .../src/custom-component/v-query/options.ts   | 64 ++++++++++++++
 3 files changed, 69 insertions(+), 92 deletions(-)
 create mode 100644 core/core-frontend/src/custom-component/v-query/options.ts

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index c50df58029..5d228903f5 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -4,6 +4,7 @@ import { ElMessage } from 'element-plus-secondary'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import QueryConditionConfiguration from './QueryConditionConfiguration.vue'
 import type { ComponentInfo } from '@/api/chart'
+import { infoFormat } from './options'
 import {
   onBeforeUnmount,
   reactive,
@@ -16,7 +17,6 @@ import {
 } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useI18n } from '@/hooks/web/useI18n'
-import { guid } from '@/views/visualized/data/dataset/form/util.js'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { comInfo } from './com-info'
 import { useEmitt } from '@/hooks/web/useEmitt'
@@ -192,55 +192,6 @@ const dragover = () => {
   // do
 }
 
-const infoFormat = (obj: ComponentInfo) => {
-  const { id, name, deType, type, datasetId } = obj
-  return {
-    id: guid(),
-    name,
-    showError: true,
-    timeGranularity: 'date',
-    timeGranularityMultiple: 'datetimerange',
-    field: {
-      id,
-      type,
-      name,
-      deType
-    },
-    timeType: 'fixed',
-    relativeToCurrent: 'custom',
-    required: false,
-    timeNum: 0,
-    relativeToCurrentType: 'year',
-    around: 'f',
-    parametersStart: null,
-    parametersEnd: null,
-    arbitraryTime: new Date(),
-    timeNumRange: 0,
-    relativeToCurrentTypeRange: 'year',
-    aroundRange: 'f',
-    arbitraryTimeRange: new Date(),
-    auto: false,
-    defaultValue: undefined,
-    selectValue: undefined,
-    optionValueSource: 0,
-    valueSource: [],
-    dataset: {
-      id: datasetId,
-      name: '',
-      fields: []
-    },
-    visible: true,
-    defaultValueCheck: false,
-    multiple: false,
-    displayType: '0',
-    checkedFields: [],
-    parameters: [],
-    parametersCheck: false,
-    parametersList: [],
-    checkedFieldsMap: {}
-  }
-}
-
 const drop = e => {
   const componentInfo: ComponentInfo = JSON.parse(e.dataTransfer.getData('dimension') || '{}')
   if (!componentInfo.id) return
@@ -268,34 +219,9 @@ const editeQueryConfig = (queryId: string) => {
   queryConfig.value.setCondition(queryId)
 }
 
-const addQueryCriteria = () => {
-  const componentInfo: ComponentInfo = {
-    id: '',
-    name: '未命名',
-    deType: 0,
-    type: 'VARCHAR',
-    datasetId: ''
-  }
-  list.value.push(infoFormat(componentInfo))
-  element.value.propValue = [...list.value]
-  snapshotStore.recordSnapshotCache()
-  editeQueryConfig(list.value[list.value.length - 1].id)
-}
-
-const addQueryCriteriaConfig = () => {
-  const componentInfo: ComponentInfo = {
-    id: '',
-    name: '未命名',
-    deType: 0,
-    type: 'VARCHAR',
-    datasetId: ''
-  }
-  return infoFormat(componentInfo)
-}
-
 const editQueryCriteria = () => {
   if (!list.value.length) {
-    addQueryCriteria()
+    addCriteriaConfigOut()
     return
   }
   editeQueryConfig(list.value[0].id)
@@ -341,10 +267,6 @@ const listVisible = computed(() => {
   return list.value.filter(itx => itx.visible)
 })
 
-const addCriteriaConfig = () => {
-  queryConfig.value.setConditionInit(queryConfig.value.addCriteriaConfig())
-}
-
 const queryData = () => {
   let requiredName = ''
   const emitterList = (element.value.propValue || []).reduce((pre, next) => {
@@ -415,7 +337,7 @@ const opacityStyle = computed(() => {
       <div v-if="!listVisible.length" class="no-list-label flex-align-center">
         <div class="container flex-align-center">
           将右侧的字段拖拽到这里 或 点击
-          <el-button :disabled="showPosition === 'preview'" @click="addCriteriaConfig" text>
+          <el-button :disabled="showPosition === 'preview'" @click="addCriteriaConfigOut" text>
             添加查询条件
           </el-button>
         </div>
@@ -471,7 +393,6 @@ const opacityStyle = computed(() => {
   </div>
   <Teleport to="body">
     <QueryConditionConfiguration
-      :add-query-criteria-config="addQueryCriteriaConfig"
       :query-element="element"
       ref="queryConfig"
     ></QueryConditionConfiguration>
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index f91e08c21d..053ef16c92 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { ref, reactive, nextTick, computed, shallowRef, toRefs, watch } from 'vue'
 import { storeToRefs } from 'pinia'
+import { addQueryCriteriaConfig } from './options'
 import { getCustomTime } from './time-format'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
@@ -32,10 +33,6 @@ interface DatasetField {
 }
 
 const props = defineProps({
-  addQueryCriteriaConfig: {
-    type: Function,
-    default: () => ({})
-  },
   queryElement: {
     type: Object,
     default() {
@@ -406,10 +403,6 @@ const setCondition = (queryId: string) => {
   init(queryId)
 }
 
-const setConditionInit = (queryId: string) => {
-  init(queryId)
-}
-
 const setConditionOut = () => {
   conditions.value = cloneDeep(props.queryElement.propValue) || []
   addQueryCriteria()
@@ -744,7 +737,7 @@ const renameInputBlur = () => {
 }
 
 const addQueryCriteria = () => {
-  conditions.value.push(props.addQueryCriteriaConfig())
+  conditions.value.push(addQueryCriteriaConfig())
 }
 
 const addCriteriaConfig = () => {
@@ -754,7 +747,6 @@ const addCriteriaConfig = () => {
 
 defineExpose({
   setCondition,
-  setConditionInit,
   addCriteriaConfig,
   setConditionOut
 })
diff --git a/core/core-frontend/src/custom-component/v-query/options.ts b/core/core-frontend/src/custom-component/v-query/options.ts
new file mode 100644
index 0000000000..0a89c3afa6
--- /dev/null
+++ b/core/core-frontend/src/custom-component/v-query/options.ts
@@ -0,0 +1,64 @@
+import type { ComponentInfo } from '@/api/chart'
+import { guid } from '@/views/visualized/data/dataset/form/util.js'
+
+const infoFormat = (obj: ComponentInfo) => {
+  const { id, name, deType, type, datasetId } = obj
+  return {
+    id: guid(),
+    name,
+    showError: true,
+    timeGranularity: 'date',
+    timeGranularityMultiple: 'datetimerange',
+    field: {
+      id,
+      type,
+      name,
+      deType
+    },
+    timeType: 'fixed',
+    relativeToCurrent: 'custom',
+    required: false,
+    timeNum: 0,
+    relativeToCurrentType: 'year',
+    around: 'f',
+    parametersStart: null,
+    parametersEnd: null,
+    arbitraryTime: new Date(),
+    timeNumRange: 0,
+    relativeToCurrentTypeRange: 'year',
+    aroundRange: 'f',
+    arbitraryTimeRange: new Date(),
+    auto: false,
+    defaultValue: undefined,
+    selectValue: undefined,
+    optionValueSource: 0,
+    valueSource: [],
+    dataset: {
+      id: datasetId,
+      name: '',
+      fields: []
+    },
+    visible: true,
+    defaultValueCheck: false,
+    multiple: false,
+    displayType: '0',
+    checkedFields: [],
+    parameters: [],
+    parametersCheck: false,
+    parametersList: [],
+    checkedFieldsMap: {}
+  }
+}
+
+const addQueryCriteriaConfig = () => {
+  const componentInfo: ComponentInfo = {
+    id: '',
+    name: '未命名',
+    deType: 0,
+    type: 'VARCHAR',
+    datasetId: ''
+  }
+  return infoFormat(componentInfo)
+}
+
+export { infoFormat, addQueryCriteriaConfig }