vue2-client 1.10.21 → 1.10.26

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

@@ -1,201 +1,201 @@
-<template>
-  <a-card :bordered="false">
-    <a-tabs :tabBarGutter="10" :activeKey="activeKey" @change="tabPaneChange">
-      <a-tab-pane
-        v-for="(tab, index) in config.data"
-        :key="index"
-        :tab="tab.title"
-      >
-        <div>
-          <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,index)"
-            @hook:mounted="(h)=>onComponentMounted(h,tab,index)"
-            :config-name="tab.slotConfig"
-            :env="env"
-          />
-        </div>
-      </a-tab-pane>
-    </a-tabs>
-  </a-card>
-</template>
-
-<script>
-import { getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import { getRealKeyData } from '@vue2-client/utils/util'
-import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'XTab',
-  components: {
-    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', 'getSelectedData', 'getOutEnv'],
-  provide () {
-    return {
-      currUser: this.currUser
-    }
-  },
-  data () {
-    return {
-      activeKey: 0,
-      // 配置
-      config: undefined,
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  methods: {
-    // 自定义函数中调用的方法  这个不能删
-    getWindow,
-    runLogic,
-    isMicroAppEnv,
-    microDispatch,
-    getMicroData,
-    getRealKeyData,
-    getConfigByName,
-    getConfigByNameAsync,
-    tabPaneChange (newKey) {
-      if (this.activeKey === newKey) {
-        return
-      }
-      const oldKey = this.activeKey
-      if (this.config.changeFunc) {
-        const args = [
-          oldKey,
-          newKey,
-          this.config.data[oldKey],
-          this.config.data[newKey],
-          this.$refs[`tab_com_${this.config.data[oldKey].slotType}_${oldKey}`][0]
-        ]
-        if (!this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`]) {
-          console.warn('新页签示例切换页签时暂未初始化，仅调用该页签初始化方法不调用切换函数')
-        } else {
-          args.push(this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`][0])
-          this.$nextTick(() => {
-            // fromKey,toKey,fromConfig,toConfig,fromRef,toRef
-            const result = executeStrFunctionByContext(this, this.config.changeFunc, args)
-            if (result && result.noChange) {
-              console.info('不切换页签作为按钮使用')
-            } else {
-              this.activeKey = newKey
-            }
-          })
-        }
-      } else {
-        this.activeKey = newKey
-      }
-    },
-    initConfig () {
-      if (this.configName) {
-        this.getConfig()
-      } else if (this.localConfig) {
-        this.config = this.localConfig
-      }
-    },
-    getConfig () {
-      getConfigByName(this.configName, this.serverName, res => {
-        this.config = res
-      }, this.env === 'dev')
-    },
-    getEventHandlers (tab, index) {
-      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.$refs[`tab_com_${tab.slotType}_${index}`][0], 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 = {}
-          let selectedId
-          if (res.paramLogicName) {
-            if (!!this.getSelectedId) {
-              selectedId = this.getSelectedId()
-              if (typeof selectedId !== 'object') {
-                selectedId = { selectedId: selectedId }
-              }
-            }
-            param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, 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
-            }
-          })
-        }, this.env === 'dev')
-      }
-    },
-  },
-  props: {
-    // 配置名
-    configName: {
-      type: String,
-      default: undefined
-    },
-    serverName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    // 本地配置，调试用
-    localConfig: {
-      type: Object,
-      default: undefined
-    },
-  },
-  watch: {
-    configName: {
-      deep: true,
-      immediate: true,
-      handler (val) {
-        this.initConfig()
-      }
-    },
-    // 如果本地配置更改了，重新初始化
-    localConfig: {
-      deep: true,
-      immediate: true,
-      handler (val) {
-        this.initConfig()
-      }
-    },
-  },
-}
-</script>
-<style scoped>
-:deep(.ant-tabs-bar) {
-  margin: 0
-}
-</style>
+<template>
+  <a-card :bordered="false">
+    <a-tabs :tabBarGutter="10" :activeKey="activeKey" @change="tabPaneChange">
+      <a-tab-pane
+        v-for="(tab, index) in config.data"
+        :key="index"
+        :tab="tab.title"
+      >
+        <div>
+          <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,index)"
+            @hook:mounted="(h)=>onComponentMounted(h,tab,index)"
+            :config-name="tab.slotConfig"
+            :env="env"
+          />
+        </div>
+      </a-tab-pane>
+    </a-tabs>
+  </a-card>
+</template>
+
+<script>
+import { getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { getRealKeyData } from '@vue2-client/utils/util'
+import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'XTab',
+  components: {
+    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', 'getSelectedData', 'getOutEnv'],
+  provide () {
+    return {
+      currUser: this.currUser
+    }
+  },
+  data () {
+    return {
+      activeKey: 0,
+      // 配置
+      config: undefined,
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    // 自定义函数中调用的方法  这个不能删
+    getWindow,
+    runLogic,
+    isMicroAppEnv,
+    microDispatch,
+    getMicroData,
+    getRealKeyData,
+    getConfigByName,
+    getConfigByNameAsync,
+    tabPaneChange (newKey) {
+      if (this.activeKey === newKey) {
+        return
+      }
+      const oldKey = this.activeKey
+      if (this.config.changeFunc) {
+        const args = [
+          oldKey,
+          newKey,
+          this.config.data[oldKey],
+          this.config.data[newKey],
+          this.$refs[`tab_com_${this.config.data[oldKey].slotType}_${oldKey}`][0]
+        ]
+        if (!this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`]) {
+          console.warn('新页签示例切换页签时暂未初始化，仅调用该页签初始化方法不调用切换函数')
+        } else {
+          args.push(this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`][0])
+          this.$nextTick(() => {
+            // fromKey,toKey,fromConfig,toConfig,fromRef,toRef
+            const result = executeStrFunctionByContext(this, this.config.changeFunc, args)
+            if (result && result.noChange) {
+              console.info('不切换页签作为按钮使用')
+            } else {
+              this.activeKey = newKey
+            }
+          })
+        }
+      } else {
+        this.activeKey = newKey
+      }
+    },
+    initConfig () {
+      if (this.configName) {
+        this.getConfig()
+      } else if (this.localConfig) {
+        this.config = this.localConfig
+      }
+    },
+    getConfig () {
+      getConfigByName(this.configName, this.serverName, res => {
+        this.config = res
+      }, this.env === 'dev')
+    },
+    getEventHandlers (tab, index) {
+      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.$refs[`tab_com_${tab.slotType}_${index}`][0], 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 = {}
+          let selectedId
+          if (res.paramLogicName) {
+            if (!!this.getSelectedId) {
+              selectedId = this.getSelectedId()
+              if (typeof selectedId !== 'object') {
+                selectedId = { selectedId: selectedId }
+              }
+            }
+            param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, 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
+            }
+          })
+        }, this.env === 'dev')
+      }
+    },
+  },
+  props: {
+    // 配置名
+    configName: {
+      type: String,
+      default: undefined
+    },
+    serverName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // 本地配置，调试用
+    localConfig: {
+      type: Object,
+      default: undefined
+    },
+  },
+  watch: {
+    configName: {
+      deep: true,
+      immediate: true,
+      handler (val) {
+        this.initConfig()
+      }
+    },
+    // 如果本地配置更改了，重新初始化
+    localConfig: {
+      deep: true,
+      immediate: true,
+      handler (val) {
+        this.initConfig()
+      }
+    },
+  },
+}
+</script>
+<style scoped>
+:deep(.ant-tabs-bar) {
+  margin: 0
+}
+</style>

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

@@ -1,22 +1,22 @@
-<template>
-  <div>
-    <x-tab :config-name="configName" server-name="af-his"></x-tab>
-  </div>
-</template>
-
-<script>
-import XTab from './XTab.vue'
-
-export default {
-  name: 'XTabDemo',
-  components: {
-    XTab
-  },
-  data () {
-    return {
-      configName: 'drugInventAuditTab'
-    }
-  },
-  methods: {},
-}
-</script>
+<template>
+  <div>
+    <x-tab :config-name="configName" server-name="af-his"></x-tab>
+  </div>
+</template>
+
+<script>
+import XTab from './XTab.vue'
+
+export default {
+  name: 'XTabDemo',
+  components: {
+    XTab
+  },
+  data () {
+    return {
+      configName: 'drugInventAuditTab'
+    }
+  },
+  methods: {},
+}
+</script>

package/src/base-client/components/common/XTab/index.js

@@ -1,3 +1,3 @@
-import tab from './XTab.vue'
-
-export default tab
+import tab from './XTab.vue'
+
+export default tab

package/src/base-client/components/common/XTable/CustomFuncCel.vue

@@ -1,51 +1,51 @@
-<script>
-import { Ellipsis } from '@vue2-client/components'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'CustomFuncCel',
-  methods: {
-    runLogic,
-    async fetchSlotValue () {
-      try {
-        let func = this.item.slotCustomFunction
-        if (this.item.slotCustomFunction.startsWith('function')) {
-          func = `async ${func}`
-        }
-        this.slotValueResult = await executeStrFunctionByContext(this, func, [this.text, this.record, this.localDataSource, this.index, runLogic, getConfigByNameAsync])
-        this.loading = false
-      } catch (error) {
-        console.error('Error fetching slot value:', error)
-      }
-    }
-  },
-  mounted () {
-    this.fetchSlotValue()
-  },
-  data: () => {
-    return {
-      slotValueResult: '',
-      loading: true
-    }
-  },
-  components: { Ellipsis },
-  // eslint-disable-next-line
-  props: ['item', 'text', 'record', 'index', 'localDataSource'],
-}
-</script>
-
-<template>
-  <span>
-    <template v-if="item.slotValue">
-      <ellipsis :length="item.slotValue" tooltip>{{ loading ? text : slotValueResult }}</ellipsis>
-    </template>
-    <template v-else>
-      {{ loading ? text : slotValueResult }}
-    </template>
-  </span>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import { Ellipsis } from '@vue2-client/components'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'CustomFuncCel',
+  methods: {
+    runLogic,
+    async fetchSlotValue () {
+      try {
+        let func = this.item.slotCustomFunction
+        if (this.item.slotCustomFunction.startsWith('function')) {
+          func = `async ${func}`
+        }
+        this.slotValueResult = await executeStrFunctionByContext(this, func, [this.text, this.record, this.localDataSource, this.index, runLogic, getConfigByNameAsync])
+        this.loading = false
+      } catch (error) {
+        console.error('Error fetching slot value:', error)
+      }
+    }
+  },
+  mounted () {
+    this.fetchSlotValue()
+  },
+  data: () => {
+    return {
+      slotValueResult: '',
+      loading: true
+    }
+  },
+  components: { Ellipsis },
+  // eslint-disable-next-line
+  props: ['item', 'text', 'record', 'index', 'localDataSource'],
+}
+</script>
+
+<template>
+  <span>
+    <template v-if="item.slotValue">
+      <ellipsis :length="item.slotValue" tooltip>{{ loading ? text : slotValueResult }}</ellipsis>
+    </template>
+    <template v-else>
+      {{ loading ? text : slotValueResult }}
+    </template>
+  </span>
+</template>
+
+<style scoped lang="less">
+
+</style>