fix: 修复自定义JS数据集，编辑、保存接口不存在的情况

data-room-ui/example/customDatasetComponents/jsDataSet/index.vue

@@ -353,7 +353,7 @@
 import ParamsSettingDialog from './ParamsSettingDialog.vue'
 import OutputFieldDialog from './OutputFieldDialog.vue'
 import FieldFillDialog from './FieldFillDialog.vue'
-import { nameCheckRepeat, datasetAddorUpdate, getDataset, getDatasetTypeList } from 'packages/js/utils/datasetConfigService'
+import { nameCheckRepeat, datasetAdd, datasetUpdate, getDataset, getCategoryTree } from 'packages/js/utils/datasetConfigService'
 import { codemirror } from 'vue-codemirror'
 import 'codemirror/mode/javascript/javascript'
 import 'codemirror/lib/codemirror.css'
@@ -457,7 +457,7 @@ export default {
   },
   methods: {
     async init () {
-      this.categoryData = await getDatasetTypeList({ tableName: 'r_dataset', moduleCode: this.appCode })
+      this.categoryData = await getCategoryTree({ tableName: 'dataset', moduleCode: this.appCode })
       if (this.typeId) {
         this.dataForm.typeId = this.typeId
         this.$nextTick(() => {
@@ -520,8 +520,8 @@ export default {
               fieldList: outputFieldList
             }
           }
-          // const datasetSave = this.dataForm.id === '' ? datasetAdd : datasetUpdate
+          const datasetSave = this.dataForm.id === '' ? datasetAdd : datasetUpdate
-          datasetAddorUpdate(form).then(() => {
+          datasetSave(form).then(() => {
             this.$message.success('操作成功')
             this.$parent.init(false)
             this.$parent.setType = null

data-room-ui/packages/DataSetManagement/src/index.vue

@@ -200,6 +200,7 @@
     />
     <component
       :is="componentData.component"
+      v-if="datasetType"
       ref="EditForm"
       :key="componentData.key"
       :config="componentData.config"

data-room-ui/packages/PlotRender/index.vue

@@ -77,7 +77,8 @@ export default {
         this.newChart(config.option)
 
         // 再根据数据更新组件
-        this.updateChart()
+        // this.updateChart()
+        this.updateData()
       } else {
         // 否则说明是更新或者复制
         this.newChart(this.config.option)
@@ -96,9 +97,7 @@ export default {
       this.chart.render()
       this.registerEvent()
     },
-    /**
+    // 根据G2Plot组件配置的dataKey，将获取到的数据赋值给指定的dataKey
-     * @description: 只更新数据
-     */
     updateData () {
       this.getCurrentOption().then(({ data, config }) => {
         if (data.success) {
@@ -123,23 +122,23 @@ export default {
     /**
      * 更新组件
      */
-    updateChart () {
+    // updateChart () {
-      if (this.isPreview) {
+    //   if (this.isPreview) {
-        this.getCurrentOption().then(({ data, config }) => {
+    //     this.getCurrentOption().then(({ data, config }) => {
-          if (data.success) {
+    //       if (data.success) {
-            // 成功后更新数据
+    //         // 成功后更新数据
-            config = this.buildOption(config, data)
+    //         config = this.buildOption(config, data)
-            this.changeChartConfig(config)
+    //         this.changeChartConfig(config)
-            this.chart.update(config.option)
+    //         this.chart.update(config.option)
-          } else {
+    //       } else {
-            config.option.data = this.plotList.find(plot => plot.name === config.name)?.option.data
+    //         config.option.data = this.plotList.find(plot => plot.name === config.name)?.option.data
-            this.chart.update(config.option)
+    //         this.chart.update(config.option)
-          }
+    //       }
-        })
+    //     })
-      } else {
+    //   } else {
-        this.updateChartData(this.config)
+    //     this.updateChartData(this.config)
-      }
+    //   }
-    },
+    // },
     /**
      * 注册事件
      */
@@ -182,7 +181,7 @@ export default {
       // eslint-disable-next-line no-unused-vars
       const option = config.option
       // eslint-disable-next-line no-unused-vars
-      const setting = config.setting
+      // const setting = config.setting
       if (this.config.optionHandler) {
         try {
           // 此处函数处理config
@@ -225,3 +224,20 @@ export default {
 }
 
 </style>
+function generateRandomData() {
+  const data = [];
+  function generateRandomValue() {
+    // 生成随机的字符串作为值
+    return Math.random().toString(36).substr(2, 7);
+  }
+
+  for (let i = 0; i < 10; i++) {
+    const obj = {
+      key1: generateRandomValue(),
+      key2: generateRandomValue(),
+      key3: generateRandomValue()
+    };
+    data.push(obj);
+  }
+  return data;
+}

data-room-ui/packages/assets/images/alignIcon/export.js

@@ -3,7 +3,6 @@ const svgFiles = require.context('./svg', true, /\.svg$/)
 const iconList = svgFiles.keys()?.map(item => svgFiles(item))
 export default {
   getNameList () {
-    console.log(iconList)
     return iconList?.map(item => {
       return item?.default?.id?.split('-')[1]
     }) || []

data-room-ui/packages/js/mixins/commonMixins.js

@@ -63,9 +63,36 @@ export default {
       }
     },
     // 组件仅更新数据
-    changeData () {},
+    changeData () { },
     // 组件仅更新样式
-    changeStyle () {},
+    changeStyle () {
+      this.config = _.cloneDeep(this.config)
+      // 遍历config.setting，将config.setting中的值赋值给config.option中对应的optionField
+      this.config.setting.forEach(set => {
+        if (set.optionField) {
+          const optionField = set.optionField.split('.')
+          let option = this.config.option
+          optionField.forEach((field, index) => {
+            if (index === optionField.length - 1) {
+              // 数据配置时，必须有值才更新
+              if ((set.tabName === 'data' && set.value) || set.tabName === 'custom') {
+                option[field] = set.value
+              }
+            } else {
+              option = option[field]
+            }
+          })
+        }
+      })
+      if (this.config.optionHandler) {
+        try {
+          // 此处函数处理config
+          eval(this.config.optionHandler)
+        } catch (e) {
+          console.error(e)
+        }
+      }
+    },
     /**
      * 初始化组件时获取后端返回的数据, 返回数据和当前组件的配置
      * @param settingConfig 设置时的配置。不传则为当前组件的配置