lw-cdp-ui 1.4.22 → 1.4.23

package/dist/components/lwBiChart/page.vue

@@ -11,7 +11,7 @@
           <div v-if="item.data?.setting?.activeDateUnitFilter" class="filter-top">
             <el-radio-group v-model="item.timeUnit" @change="changeTimeUnit(item, index)">
               <el-radio-button :label="key" :value="value"
-                v-for="(value, key) in item.data?.setting?.optionalDateUnitRanges" />
+                v-for="(value, key) in item.data?.setting?.optionalDateUnitRanges" :key="key" />
               <el-radio-button disabled
                 v-if="Object.keys(item.data?.setting?.optionalDateUnitRanges).length == 0">未选择周期列表</el-radio-button>
             </el-radio-group>
@@ -160,60 +160,93 @@ export default {
     removeChart(index) {
       this.modelValue.splice(index, 1)
     },
-    getFilter(filterControls) {
-      filterControls.forEach(async control => {
-        switch (control.type) {
-          case 'DATA_PICKER':
-          case 'DATA_CASCADE':
-            if (control.dataPickerSetting.options.type == 'DICT') {
-              this.searchOptions.push({
-                label: control.name,
-                prop: `values.${control.dataPickerSetting.code}`,
-                renderType: 'select',
-                options: Object.entries(control.dataPickerSetting.options.dict).map(([key, value]) => ({
-                  value: key,
-                  label: value
-                })),
-                valueKey: 'value',
-                labelKey: 'label'
-              })
-            } else {
-              let list = await this.$api.dimensionChild.list({}, control.dataPickerSetting.options.dimensionTableId)
-              this.searchOptions.push({
-                label: control.name,
-                prop: `values.${control.dataPickerSetting.code}`,
-                renderType: 'select',
-                options: list.map(item => ({
-                  value: item.id,
-                  label: item.name
-                })),
-                valueKey: 'value',
-                labelKey: 'label'
-              })
-            }
+    async getFilter(filterControls) {
+      for (const control of filterControls) {
+        const { type } = control
 
+        const getOptions = async (setting) => {
+          const { type, dict, dataInterfaceUri, dimensionTableId } = setting.options
+          if (type === 'DICT') {
+            return Object.entries(dict).map(([key, value]) => ({ value: key, label: value }))
+          } else if (type === 'DATA_INTERFACE') {
+            const res = await this.$http.get(dataInterfaceUri)
+            return res.map((item) => ({ value: item.id, label: item.name }))
+          } else {
+            const res = await this.$api.dimensionChild.list({}, dimensionTableId)
+            return res.map((item) => ({ value: item.id, label: item.name }))
+          }
+        }
+
+        const getTreeOptions = async (setting) => {
+          const { type, dict, dataInterfaceUri, dimensionTableId } = setting.options
+          if (type === 'DICT') {
+            return Object.entries(dict).map(([key, value]) => ({ value: key, label: value }))
+          } else if (type === 'DATA_INTERFACE') {
+            const res = await this.$http.get(dataInterfaceUri)
+            return this.listToTree(res)
+          } else {
+            const res = await this.$api.dimensionChild.list({}, dimensionTableId)
+            return this.listToTree(res)
+          }
+        }
+
+        switch (type) {
+          case 'DATA_PICKER': {
+            const setting = control.dataPickerSetting
+            const options = await getOptions(setting)
+            this.searchOptions.push({
+              label: control.name,
+              prop: `values.${setting.code}`,
+              renderType: 'select',
+              options,
+              valueKey: 'value',
+              labelKey: 'label'
+            })
             break
-          case 'DATA_INPUT':
+          }
+
+          case 'DATA_CASCADE': {
+            const setting = control.dataPickerSetting
+            const items = await getTreeOptions(setting)
+            this.searchOptions.push({
+              label: control.name,
+              name: `values.${setting.code}`,
+              value: '',
+              component: 'treeSelect',
+              options: {
+                items,
+                placeholder: '请选择' + control.name,
+                checkStrictly: true
+              }
+            })
+            break
+          }
+
+          case 'DATA_INPUT': {
             this.searchOptions.push({
               label: control.name,
               prop: `values.${control.dataInputSetting.code}`,
               renderType: 'input'
             })
             break
-          case 'DATE_PICKER':
+          }
+
+          case 'DATE_PICKER': {
+            const setting = control.datePickerSetting
             this.searchOptions.push({
               label: control.name,
-              prop: `ranges.${control.datePickerSetting.code}`,
+              prop: `ranges.${setting.code}`,
               renderType: 'dateRange',
               valueFormat: 'YYYY-MM-DDTHH:mm:ss.SSSZ'
             })
-            this.globalFilter.ranges[control.datePickerSetting.code] = {
+            this.globalFilter.ranges[setting.code] = {
               timeRange: {},
-              type: control.datePickerSetting.type
+              type: setting.type
             }
             break
+          }
         }
-      })
+      }
     }
   }
 }