vue2-client 1.8.205 → 1.8.207

package/src/base-client/components/common/XDescriptions/XDescriptions.vue

@@ -30,21 +30,23 @@
 import { mapState } from 'vuex'
 import { getRealKeyData } from '@vue2-client/utils/formatter'
 import { getConfigByName } from '@vue2-client/services/api/common'
+import lowcodeComponentMixin from '@vue2-client/utils/lowcode/lowcodeComponentMixin'
 
 export default {
   name: 'XDescriptions',
   components: {
   },
+  mixins: [lowcodeComponentMixin],
   props: {
     // 标题
     title: {
       type: String,
-      required: true
+      default: ''
     },
     // 内容
     content: {
       type: Object,
-      required: true
+      default: undefined
     },
     // 模型名
     model: {
@@ -55,7 +57,7 @@ export default {
     // 配置名称
     configName: {
       type: String,
-      required: true
+      default: ''
     },
     // 配置所属命名空间
     serviceName: {
@@ -89,6 +91,13 @@ export default {
   },
   methods: {
     initConfig () {
+      console.warn('content', this.content, typeof this.content)
+      console.warn('configName', this.configName, typeof this.configName)
+      console.warn('serviceName', this.serviceName, typeof this.serviceName)
+      if (this.content === undefined || this.configName === '' || this.serviceName === undefined) {
+        console.error('未传递content, serviceName或configName！加载失败')
+        return
+      }
       this.loading = true
       this.loadError = false
       if (this.configName) {
@@ -99,7 +108,9 @@ export default {
       }
     },
     getConfig () {
+      console.warn('1')
       getConfigByName(this.configName, this.serviceName, (res) => {
+        console.warn('res')
         const mapIndex = {}
         const result = {}
         if (res.formJson) {
@@ -139,6 +150,23 @@ export default {
     formatText (value) {
       return value || '--'
     }
+  },
+  watch: {
+    content: {
+      handler () {
+        this.initConfig()
+      }
+    },
+    configName: {
+      handler () {
+        this.initConfig()
+      }
+    },
+    serviceName: {
+      handler () {
+        this.initConfig()
+      }
+    }
   }
 }
 </script>

package/src/base-client/components/common/XDescriptions/lowcodeEditorRegister.js

@@ -0,0 +1,21 @@
+export const XDescriptionsConfig = {
+  type: 'XDescriptions',
+  properties: {
+    title: {
+      type: 'string'
+    },
+    content: {
+      type: 'object'
+    },
+    configName: {
+      type: 'string'
+    },
+    serviceName: {
+      type: 'string'
+    },
+    getRealData: {
+      type: 'boolean'
+    }
+  },
+  selfEvent: []
+}

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -88,7 +88,11 @@ import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XTree from '@vue2-client/base-client/components/common/XTree'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { getConfigByName, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
+import {
+  getConfigByName,
+  getConfigByLogic,
+  parseConfig,
+} from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 import lowcodeComponentMixin from '@vue2-client/utils/lowcode/lowcodeComponentMixin'
 
@@ -239,6 +243,11 @@ export default {
       handler () {
         this.initConfig()
       }
+    },
+    serviceName: {
+      handler () {
+        this.initConfig()
+      }
     }
   },
   created () {
@@ -361,7 +370,7 @@ export default {
      */
     action (record, id, actionType, fun = 'action') {
       this.$emit(fun, record, id, actionType)
-      this.$lowCodeEmit('action', record)
+      this.$lowCodeEmit(fun, record)
     },
     treeOnChecked (checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)

package/src/base-client/components/common/XReportSlot/index.md

@@ -1,48 +1,48 @@
-# XReportSlot 暂时废弃
-
-
-动态报表的插槽组件，可以递归使用
-
-
-## 何时使用
-
-> 当需要一个动态生成的报表时
-
-> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
-> 则递归此组件
-
-引用方式：
-
-```javascript
-import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
-
-export default {
-    components: {
-      XReportSlot
-    }
-}
-```
-
-
-## API
-
-| 参数              | 说明                       | 类型     | 默认值  |
-|-----------------|--------------------------|--------|------|
-| config | 表格完整配置 | Object | 无（必填） |
-| forDisplay | 是否为展示页 | Boolean | false |
-| slotConfigName | 插槽名 | String | undefined |
-
-## 例子1
-----
-```vue
-<XReportSlot
-  :config="activatedConfig"
-  :slot-config-name="slotConfig"
-  :for-display="forDisplay">
-</XReportSlot>
-```
-## 注意事项
-> slotConfigName如果不填，则展示整个表格。
-> 如果填写，则仅展示插槽中的内容
-
-> 该组件可以递归调用
+# XReportSlot 暂时废弃
+
+
+动态报表的插槽组件，可以递归使用
+
+
+## 何时使用
+
+> 当需要一个动态生成的报表时
+
+> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
+> 则递归此组件
+
+引用方式：
+
+```javascript
+import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
+
+export default {
+    components: {
+      XReportSlot
+    }
+}
+```
+
+
+## API
+
+| 参数              | 说明                       | 类型     | 默认值  |
+|-----------------|--------------------------|--------|------|
+| config | 表格完整配置 | Object | 无（必填） |
+| forDisplay | 是否为展示页 | Boolean | false |
+| slotConfigName | 插槽名 | String | undefined |
+
+## 例子1
+----
+```vue
+<XReportSlot
+  :config="activatedConfig"
+  :slot-config-name="slotConfig"
+  :for-display="forDisplay">
+</XReportSlot>
+```
+## 注意事项
+> slotConfigName如果不填，则展示整个表格。
+> 如果填写，则仅展示插槽中的内容
+
+> 该组件可以递归调用