vue2-client 1.8.413 → 1.8.415

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -478,7 +478,7 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal'],
   methods: {
     onComponentMounted (h, cell, cellIndex) {
       if (this.getMixinData && this.getMixinData()) {
@@ -499,7 +499,7 @@ export default {
           }
           this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
             formItems: res.formJson,
-            showSubmitBtn: false,
+            showSubmitBtn: !this.isInAModal,
             businessType: '新增',
             layout: res.xAddFormLayout,
             ...res,

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

@@ -1,158 +1,166 @@
-<template>
-  <div>
-    <a-row type="flex" justfy="space-around">
-      <template v-for="(item, index) in config">
-        <!--    展示项    -->
-        <a-col :key="'col' + index" :span="Math.floor(24 / config.length)">
-          <div class="item">
-            <!--    标题    -->
-            <p class="label">{{ item.label }}</p>
-            <!--    内容 - 进度条    -->
-            <template v-if="item.type === 'percent'">
-              <p class="value" :style="'color: ' + determineColor(data[item.key])">{{ data[item.key] }}%</p>
-            </template>
-            <!--    内容 - 非进度条    -->
-            <template v-else>
-              <p class="value" :style="item.style ? item.style : ''">{{ data[item.key] }}</p>
-            </template>
-          </div>
-        </a-col>
-        <!--    分割线    -->
-        <a-col :key="'col' + index + 'after'" :span="1" v-if="index !== config.length - 1" class="divider-col">
-          <a-divider type="vertical" class="divider"/>
-        </a-col>
-      </template>
-    </a-row>
-  </div>
-</template>
-
-<script>
-
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XSimpleDescriptions',
-  props: {
-    // 配置
-    dataConfig: {
-      type: Array,
-      default: undefined
-    },
-    // 数据
-    dataContent: {
-      type: Object,
-      default: undefined
-    },
-    // 配置名
-    dataConfigName: {
-      type: String,
-      default: undefined
-    },
-    // 服务名
-    serviceName: {
-      type: String,
-      default: process.env.VUE_APP_SYSTEM_NAME
-    }
-  },
-  data () {
-    return {
-      // 配置
-      config: [],
-      // 数据
-      data: {},
-    }
-  },
-  mounted () {
-    // 初始化配置
-    if (this.dataConfig) {
-      this.config = this.dataConfig
-    } else if (this.dataConfigName) {
-      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
-        this.config = res.config
-      })
-    } else {
-      this.config = [
-        {
-          label: '未能正确获取配置',
-          key: 'totalUser'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'totalResidentArea'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'doneNum'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'todoNum'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'ratio',
-          type: 'percent'
-        }
-      ]
-    }
-
-    // 初始化数据
-    if (this.dataContent) {
-      this.data = this.dataContent
-    } else {
-      this.data = {
-        totalUser: 0,
-        totalResidentArea: 0,
-        doneNum: 0,
-        todoNum: 0,
-        ratio: 20
-      }
-    }
-  },
-  methods: {
-    // 根据完成率决定颜色
-    determineColor (ratio) {
-      let result
-      if (ratio >= 90) {
-        result = 'rgb(   1,245, 38 )'
-      } else if (ratio >= 75) {
-        result = 'rgb( 139,245,  0)'
-      } else if (ratio >= 40) {
-        result = 'rgb(245,163,  0)'
-      } else if (ratio >= 20) {
-        result = 'rgb(244, 96,  0)'
-      } else {
-        result = 'rgb(255,  0,  0)'
-      }
-      return result
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.item {
-  padding: 5%;
-
-  .label {
-    color: rgba(117, 117, 117, 0.8);
-    text-align: center;
-  }
-
-  .value {
-    color: rgb( 51,157,255 );
-    font-size: 1.6em;
-    text-align: center;
-  }
-}
-
-.divider-col {
-  display: flex;
-  justify-content: center;
-
-  .divider {
-    margin-top: 35%;
-    height: 40px;
-  }
-}
-</style>
+<template>
+  <div>
+    <a-row type="flex" justfy="space-around">
+      <template v-for="(item, index) in config">
+        <!--    展示项    -->
+        <a-col :key="'col' + index" :span="Math.floor(24 / config.length)">
+          <div class="item">
+            <!--    标题    -->
+            <p class="label">{{ item.label }}</p>
+            <!--    内容 - 进度条    -->
+            <template v-if="item.type === 'percent'">
+              <p class="value" :style="'color: ' + determineColor(data[item.key])">{{ data[item.key] }}%</p>
+            </template>
+            <!--    内容 - 非进度条    -->
+            <template v-else>
+              <p class="value" :style="item.style ? item.style : ''">{{ data[item.key] }}</p>
+            </template>
+          </div>
+        </a-col>
+        <!--    分割线    -->
+        <a-col :key="'col' + index + 'after'" :span="1" v-if="index !== config.length - 1" class="divider-col">
+          <a-divider type="vertical" class="divider"/>
+        </a-col>
+      </template>
+    </a-row>
+  </div>
+</template>
+
+<script>
+
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XSimpleDescriptions',
+  props: {
+    // 配置
+    dataConfig: {
+      type: Array,
+      default: undefined
+    },
+    // 数据
+    dataContent: {
+      type: Object,
+      default: undefined
+    },
+    // 配置名
+    dataConfigName: {
+      type: String,
+      default: undefined
+    },
+    // 服务名
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    }
+  },
+  data () {
+    return {
+      // 配置
+      config: [],
+      // 数据
+      data: {},
+    }
+  },
+  mounted () {
+    // 初始化配置
+    if (this.dataConfig) {
+      this.config = this.dataConfig
+    } else if (this.dataConfigName) {
+      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
+        this.config = res.config
+      })
+    } else {
+      this.config = [
+        {
+          label: '未能正确获取配置',
+          key: 'totalUser'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'totalResidentArea'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'doneNum'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'todoNum'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'ratio',
+          type: 'percent'
+        }
+      ]
+    }
+
+    // 初始化数据
+    if (this.dataContent) {
+      this.data = this.dataContent
+    } else {
+      this.data = {
+        totalUser: 0,
+        totalResidentArea: 0,
+        doneNum: 0,
+        todoNum: 0,
+        ratio: 20
+      }
+    }
+  },
+  methods: {
+    // 根据完成率决定颜色
+    determineColor (ratio) {
+      let result
+      if (ratio >= 90) {
+        result = 'rgb(   1,245, 38 )'
+      } else if (ratio >= 75) {
+        result = 'rgb( 139,245,  0)'
+      } else if (ratio >= 40) {
+        result = 'rgb(245,163,  0)'
+      } else if (ratio >= 20) {
+        result = 'rgb(244, 96,  0)'
+      } else {
+        result = 'rgb(255,  0,  0)'
+      }
+      return result
+    }
+  },
+  watch: {
+    dataContent: {
+      handler (newValue) {
+        this.data = newValue
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.item {
+  padding: 5%;
+
+  .label {
+    color: rgba(117, 117, 117, 0.8);
+    text-align: center;
+  }
+
+  .value {
+    color: rgb( 51,157,255 );
+    font-size: 1.6em;
+    text-align: center;
+  }
+}
+
+.divider-col {
+  display: flex;
+  justify-content: center;
+
+  .divider {
+    margin-top: 35%;
+    height: 40px;
+  }
+}
+</style>

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

@@ -6,21 +6,34 @@
         :key="index"
         :tab="tab.title"
       >
-        <component :is="tab.slotType" :key="index" :serviceName="tab.serviceName" :queryParamsName="tab.slotConfig" />
+        <component
+          :is="tab.slotType"
+          :key="index"
+          :ref="`tab_com_${tab.slotType}_${index}`"
+          :serviceName="tab.serviceName"
+          :serverName="tab.serviceName"
+          :queryParamsName="tab.slotConfig"
+          v-on="getEventHandlers(tab)"
+          @hook:mounted="(h)=>onComponentMounted(h,tab,index)"
+          :config-name="tab.slotConfig"
+        />
       </a-tab-pane>
     </a-tabs>
   </div>
 </template>
 
 <script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import { getConfigByName } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { executeStrFunctionByContext } from '@/utils/runEvalFunction'
 
 export default {
   name: 'XTab',
   components: {
-    XFormTable,
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable'),
+    XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
+    XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue')
   },
+  inject: ['isInAModal', 'getSelectedId'],
   data () {
     return {
       activeKey: 0,
@@ -41,7 +54,49 @@ export default {
       getConfigByName(this.configName, this.serverName, res => {
         this.config = res.data
       })
-    }
+    },
+    getEventHandlers (tab) {
+      const handlers = {}
+      if (!tab?.events || tab?.events?.length === 0) {
+        return handlers
+      }
+      tab.events.forEach(event => {
+        handlers[event.type] = (...args) => {
+          console.info('Event handled:', event.type, args)
+          executeStrFunctionByContext(this, event.customFunction, args)
+        }
+      })
+      return handlers
+    },
+    onComponentMounted (h, tab, index) {
+      console.log(`插槽组件已经初始化 slotType ${tab.slotType}，ref= tab_com_${tab.slotType}_${index} ， serviceName = ${tab.serviceName}`)
+      if (tab.slotType === 'x-add-native-form') {
+        // 建议表单需要主动调用初始化方法
+        getConfigByName(tab.slotConfig, tab.serviceName, async (res) => {
+          // 如果配置了 表单初始化logic
+          // 调用 logic 获取参数
+          let param = {}
+          if (res.paramLogicName) {
+            param = Object.assign(param, await runLogic(res.paramLogicName, {
+              selectedId: (!!this.getSelectedId && this.getSelectedId()) || undefined,
+              ...this.mixinData
+            }, tab.serviceName))
+          }
+          this.$refs[`tab_com_${tab.slotType}_${index}`][0].init({
+            formItems: res.formJson,
+            showSubmitBtn: !this.isInAModal,
+            businessType: '新增',
+            layout: res.xAddFormLayout,
+            ...res,
+            fixedAddForm: param,
+            modifyModelData: {
+              files: param.files,
+              images: param.images
+            }
+          })
+        })
+      }
+    },
   },
   props: {
     // 配置名

package/src/base-client/components/common/XTab/XTabDemo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <x-tab :config-name="configName" server-name="af-system"></x-tab>
+    <x-tab :config-name="configName" server-name="af-his"></x-tab>
   </div>
 </template>
 
@@ -14,7 +14,7 @@ export default {
   },
   data () {
     return {
-      configName: 'tab标签页测试'
+      configName: 'test1'
     }
   },
   methods: {},

package/src/router/async/router.map.js

@@ -78,7 +78,7 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           meta: {
               // 菜单中不显示
               invisible: true,