Преглед на файлове

fix:修复自定义组件保存后报错

liu.shiyi преди 1 година
родител
ревизия
881ee673ec
променени са 2 файла, в които са добавени 8 реда и са изтрити 7 реда
  1. 3 2
      data-room-ui/packages/G2Plots/plotList.js
  2. 5 5
      data-room-ui/packages/js/store/actions.js

+ 3 - 2
data-room-ui/packages/G2Plots/plotList.js

@@ -32,7 +32,7 @@ function getPlotList (files) {
       category: configMapKey,
       name: config.name,
       title: config.title,
-      border:{type:'',titleHeight:100,fontSize:30,isTitle:true,padding:[16,16,16,16]},
+      border: { type: '', titleHeight: 100, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] },
       icon: null,
       img: require(`../G2Plots/images/componentLogo/${config.title}.png`),
       className:
@@ -62,10 +62,11 @@ export function getCustomPlots () {
   const list = []
   customList.forEach((config) => {
     list.push({
+      version: config.version,
       category: config.category,
       name: config.name,
       title: config.title,
-      border:{type:'',titleHeight:100,fontSize:30,isTitle:true,padding:[16,16,16,16]},
+      border: { type: '', titleHeight: 100, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] },
       icon: null,
       img: config.img,
       className:

+ 5 - 5
data-room-ui/packages/js/store/actions.js

@@ -123,11 +123,11 @@ export function handleResData (data) {
 // 组件属性兼容
 function compatibility (config, originalConfig) {
   const newConfig = config
-  newConfig.version = originalConfig.version
-  newConfig.dataSource = objCompare(newConfig.dataSource, originalConfig.dataSource)
-  newConfig.customize = objCompare(newConfig.customize, originalConfig.customize)
-  newConfig.option = { ...objCompare(newConfig.option, originalConfig.option), displayOption: originalConfig.option.displayOption }
-  newConfig.setting = arrCompare(newConfig.setting, originalConfig.setting)
+  newConfig.version = originalConfig?.version || '2023071001'
+  newConfig.dataSource = objCompare(newConfig?.dataSource, originalConfig?.dataSource)
+  newConfig.customize = objCompare(newConfig?.customize, originalConfig?.customize)
+  newConfig.option = { ...objCompare(newConfig.option, originalConfig?.option), displayOption: originalConfig?.option?.displayOption }
+  newConfig.setting = arrCompare(newConfig?.setting, originalConfig?.setting)
   return newConfig
 }
 // 对象比较