vue2-client 1.9.78 → 1.9.79

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

@@ -1,207 +1,207 @@
-<template>
-  <a-modal
-    :confirm-loading="loading"
-    :destroyOnClose="true"
-    :visible="visible"
-    width="80%"
-    height="60%"
-    okText="提交"
-    @cancel="close"
-    @ok="onSubmit"
-    v-bind="attr">
-    <div style="max-height: 70vh; overflow-y: auto;overflow-x: hidden;" v-if="showReport">
-      <x-report
-        @updateImg="updateImg"
-        @selectRow="selectRow"
-        ref="main"
-        :env="env"
-        :use-oss-for-img="false"
-        :config-name="configName"
-        :show-img-in-cell="true"
-        :display-only="displayOnly"
-        :edit-mode="false"
-        :show-save-button="false"
-        :dont-format="true"/>
-    </div>
-  </a-modal>
-</template>
-<script>
-import { mapState } from 'vuex'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import { runLogic } from '@vue2-client/services/api/common'
-import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
-import { getRealKeyData } from '@vue2-client/utils/util'
-
-export default {
-  name: 'XAddReport',
-  components: {
-    XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
-  },
-  props: {
-    env: {
-      type: String,
-      default: 'prod'
-    }
-  },
-  data () {
-    return {
-      // 业务类型
-      businessType: '',
-      showReport: true,
-      configName: '',
-      displayOnly: true,
-      serverName: '',
-      // 业务标题
-      title: '',
-      // 自定义标题
-      resolvedTitle: '',
-      // 新增或修改业务是否执行中
-      loading: false,
-      // 是否显示新增/修改模态框
-      visible: false,
-      // 选中的处理对象的id号
-      selectedId: null,
-      // 混入插槽组件的数据
-      mixinData: {},
-      // 打开窗口接收到的外部环境数据
-      outEnv: {},
-      // 外部传递来的 modal 参数
-      attr: {},
-    }
-  },
-  provide () {
-    return {
-      getSelectedId: () => this.getSelectedId(),
-      getSelectedData: () => {
-        return this.selectedId
-      },
-      getMixinData: () => {
-        return this.mixinData
-      },
-      getOutEnv: () => {
-        return this.outEnv
-      },
-      isInAModal: () => {
-        return true
-      },
-      currUser: this.currUser
-    }
-  },
-  inject: ['getParentComponentByName'],
-  computed: {
-    businessTitle () {
-      return this.businessType + this.title
-    },
-    ...mapState('account', { currUser: 'user' })
-  },
-  methods: {
-    getWindow,
-    isMicroAppEnv,
-    microDispatch,
-    getMicroData,
-    runLogic,
-    getRealKeyData,
-    init (params) {
-      console.log('params', params)
-      const {
-        configName = 'medicalRecordCover',
-        serverName = process.env.VUE_APP_SYSTEM_NAME,
-        displayOnly = true,
-        selectedId = null,
-        outEnv = {},
-        mixinData = {},
-        attr = {}
-      } = params
-      this.configName = configName
-      this.serverName = serverName
-      this.displayOnly = displayOnly
-      this.visible = true
-      this.attr = attr
-      // 有选中项，给选中项赋值
-      if (selectedId) {
-        this.selectedId = selectedId
-      }
-      // 当有些组件需要外部传数据时 使用这个混入
-      this.mixinData = mixinData
-      // 把打开时的环境传递给打开窗口，以便js脚本中使用
-      this.outEnv = outEnv
-    },
-    getSelectedId () {
-      if (typeof this.selectedId === 'object') {
-        if (this.selectedId.selectedId) {
-          return this.selectedId.selectedId
-        }
-        if (Object.keys(this.selectedId) > 0) {
-          return this.selectedId[Object.keys(this.selectedId)[0]]
-        }
-      } else {
-        return this.selectedId
-      }
-    },
-    selectRow (selectedRowKeys, selectedRows) {
-      this.table_selectedRowKeys = selectedRowKeys
-      this.table_selectedRows = selectedRows
-      console.log('XAddReport')
-      this.$emit('selectRow', selectedRowKeys, selectedRows)
-    },
-    close () {
-      this.loading = false
-      this.visible = false
-      this.$emit('close')
-    },
-    getComponentByName (name) {
-      const innerRef = this.getParentComponentByName(name)
-      if (innerRef) {
-        return innerRef
-      } else {
-        return this.$refs.main.getComponentByName(name)
-      }
-    },
-    async onSubmit () {
-      if (this.$refs.main?.config?.confirmFunction) {
-        console.info('执行自定义确认逻辑')
-        let func = this.$refs.main?.config?.confirmFunction
-        if (func && func.startsWith('function')) {
-          func = func.replace('function', 'async function')
-        }
-        const result = executeStrFunctionByContext(this, func, [])
-        if (result instanceof Promise) {
-          result.then((res) => {
-            if (!res) {
-              this.close()
-              return
-            }
-            let messageType = 'success'
-            // 如果传递了组件名字 自动调用刷新
-            if (res?.name) {
-              const waitRefreshRef = this.getComponentByName(res.name)
-              if (waitRefreshRef) {
-                waitRefreshRef.refresh()
-              } else {
-                console.warn(`未找到组件${res.name}无法刷新`)
-              }
-            }
-            // 如果传递消息类型 自动调用消息
-            if (res?.messageType) {
-              messageType = res.messageType
-            }
-            // 如果传递了提示信息自动调用提示
-            if (res?.message) {
-              this.$message[messageType](res?.message)
-            }
-            this.close()
-          })
-        } else {
-          this.close()
-        }
-      } else {
-        console.warn('未配置modal确认按钮逻辑')
-        this.close()
-      }
-    },
-    updateImg (data) {
-      console.log(data)
-    }
-  }
-}
-</script>
+<template>
+  <a-modal
+    :confirm-loading="loading"
+    :destroyOnClose="true"
+    :visible="visible"
+    width="80%"
+    height="60%"
+    okText="提交"
+    @cancel="close"
+    @ok="onSubmit"
+    v-bind="attr">
+    <div style="max-height: 70vh; overflow-y: auto;overflow-x: hidden;" v-if="showReport">
+      <x-report
+        @updateImg="updateImg"
+        @selectRow="selectRow"
+        ref="main"
+        :env="env"
+        :use-oss-for-img="false"
+        :config-name="configName"
+        :show-img-in-cell="true"
+        :display-only="displayOnly"
+        :edit-mode="false"
+        :show-save-button="false"
+        :dont-format="true"/>
+    </div>
+  </a-modal>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { runLogic } from '@vue2-client/services/api/common'
+import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
+import { getRealKeyData } from '@vue2-client/utils/util'
+
+export default {
+  name: 'XAddReport',
+  components: {
+    XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
+  },
+  props: {
+    env: {
+      type: String,
+      default: 'prod'
+    }
+  },
+  data () {
+    return {
+      // 业务类型
+      businessType: '',
+      showReport: true,
+      configName: '',
+      displayOnly: true,
+      serverName: '',
+      // 业务标题
+      title: '',
+      // 自定义标题
+      resolvedTitle: '',
+      // 新增或修改业务是否执行中
+      loading: false,
+      // 是否显示新增/修改模态框
+      visible: false,
+      // 选中的处理对象的id号
+      selectedId: null,
+      // 混入插槽组件的数据
+      mixinData: {},
+      // 打开窗口接收到的外部环境数据
+      outEnv: {},
+      // 外部传递来的 modal 参数
+      attr: {},
+    }
+  },
+  provide () {
+    return {
+      getSelectedId: () => this.getSelectedId(),
+      getSelectedData: () => {
+        return this.selectedId
+      },
+      getMixinData: () => {
+        return this.mixinData
+      },
+      getOutEnv: () => {
+        return this.outEnv
+      },
+      isInAModal: () => {
+        return true
+      },
+      currUser: this.currUser
+    }
+  },
+  inject: ['getParentComponentByName'],
+  computed: {
+    businessTitle () {
+      return this.businessType + this.title
+    },
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    getWindow,
+    isMicroAppEnv,
+    microDispatch,
+    getMicroData,
+    runLogic,
+    getRealKeyData,
+    init (params) {
+      console.log('params', params)
+      const {
+        configName = 'medicalRecordCover',
+        serverName = process.env.VUE_APP_SYSTEM_NAME,
+        displayOnly = true,
+        selectedId = null,
+        outEnv = {},
+        mixinData = {},
+        attr = {}
+      } = params
+      this.configName = configName
+      this.serverName = serverName
+      this.displayOnly = displayOnly
+      this.visible = true
+      this.attr = attr
+      // 有选中项，给选中项赋值
+      if (selectedId) {
+        this.selectedId = selectedId
+      }
+      // 当有些组件需要外部传数据时 使用这个混入
+      this.mixinData = mixinData
+      // 把打开时的环境传递给打开窗口，以便js脚本中使用
+      this.outEnv = outEnv
+    },
+    getSelectedId () {
+      if (typeof this.selectedId === 'object') {
+        if (this.selectedId.selectedId) {
+          return this.selectedId.selectedId
+        }
+        if (Object.keys(this.selectedId) > 0) {
+          return this.selectedId[Object.keys(this.selectedId)[0]]
+        }
+      } else {
+        return this.selectedId
+      }
+    },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.table_selectedRowKeys = selectedRowKeys
+      this.table_selectedRows = selectedRows
+      console.log('XAddReport')
+      this.$emit('selectRow', selectedRowKeys, selectedRows)
+    },
+    close () {
+      this.loading = false
+      this.visible = false
+      this.$emit('close')
+    },
+    getComponentByName (name) {
+      const innerRef = this.getParentComponentByName(name)
+      if (innerRef) {
+        return innerRef
+      } else {
+        return this.$refs.main.getComponentByName(name)
+      }
+    },
+    async onSubmit () {
+      if (this.$refs.main?.config?.confirmFunction) {
+        console.info('执行自定义确认逻辑')
+        let func = this.$refs.main?.config?.confirmFunction
+        if (func && func.startsWith('function')) {
+          func = func.replace('function', 'async function')
+        }
+        const result = executeStrFunctionByContext(this, func, [])
+        if (result instanceof Promise) {
+          result.then((res) => {
+            if (!res) {
+              this.close()
+              return
+            }
+            let messageType = 'success'
+            // 如果传递了组件名字 自动调用刷新
+            if (res?.name) {
+              const waitRefreshRef = this.getComponentByName(res.name)
+              if (waitRefreshRef) {
+                waitRefreshRef.refresh()
+              } else {
+                console.warn(`未找到组件${res.name}无法刷新`)
+              }
+            }
+            // 如果传递消息类型 自动调用消息
+            if (res?.messageType) {
+              messageType = res.messageType
+            }
+            // 如果传递了提示信息自动调用提示
+            if (res?.message) {
+              this.$message[messageType](res?.message)
+            }
+            this.close()
+          })
+        } else {
+          this.close()
+        }
+      } else {
+        console.warn('未配置modal确认按钮逻辑')
+        this.close()
+      }
+    },
+    updateImg (data) {
+      console.log(data)
+    }
+  }
+}
+</script>

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

@@ -1,94 +1,94 @@
-<template>
-  <div v-if="dictionary && dictionary.status !== 'none'">
-    <!-- 徽标存在时 -->
-    <a-badge
-      v-if="dictionary.status !== 'gary'"
-      :color="dictionary.status"
-      :text="!isExternalText ? dictionary.text: null"/>
-    <a-badge v-else color="#D9D9D9" :text="!isExternalText ? dictionary.text: null"/>
-    <span v-if="isExternalText">{{ dictionary.text }}</span>
-  </div>
-  <div v-else-if="dictionary" :class="{data_card: dataCard}">
-    <!-- 徽标为none时 -->
-    {{ dictionary.text }}
-  </div>
-  <div v-else>
-    <!-- 其他情况直接显示替代文本或者原值 -->
-    {{ replaceText ? replaceText : value }}
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'XBadge',
-  props: {
-    badgeKey: {
-      type: String,
-      required: true,
-    },
-    value: {
-      type: [Number, String],
-      required: true,
-    },
-    replaceText: {
-      type: String,
-      default: ''
-    },
-    serviceName: {
-      type: String,
-      default: process.env.VUE_APP_SYSTEM_NAME
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    isExternalText: {
-      type: Boolean,
-      required: false
-    },
-    // 是否在看板模式下显示
-    dataCard: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {},
-  watch: {
-    badgeKey (newVal, oldVal) {
-      this.updateDictionary()
-    },
-    value (newVal, oldVal) {
-      this.updateDictionary()
-    }
-  },
-  data () {
-    return {
-      dictionary: undefined
-    }
-  },
-  created () {
-    this.updateDictionary()
-  },
-  methods: {
-    // todo 修改方式  想办法不使用回调方式
-    async updateDictionary () {
-      const result = this.$appdata.getParam(this.badgeKey, this.value)
-      if (result) {
-        this.dictionary = result
-        return
-      }
-      this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined, this.env === 'dev', this.serviceName)
-    },
-    badgeFilter (key, value) {
-      return this.$appdata.getParam(key, value)
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.data_card {
-  display: inline;
-}
-</style>
+<template>
+  <div v-if="dictionary && dictionary.status !== 'none'">
+    <!-- 徽标存在时 -->
+    <a-badge
+      v-if="dictionary.status !== 'gary'"
+      :color="dictionary.status"
+      :text="!isExternalText ? dictionary.text: null"/>
+    <a-badge v-else color="#D9D9D9" :text="!isExternalText ? dictionary.text: null"/>
+    <span v-if="isExternalText">{{ dictionary.text }}</span>
+  </div>
+  <div v-else-if="dictionary" :class="{data_card: dataCard}">
+    <!-- 徽标为none时 -->
+    {{ dictionary.text }}
+  </div>
+  <div v-else>
+    <!-- 其他情况直接显示替代文本或者原值 -->
+    {{ replaceText ? replaceText : value }}
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'XBadge',
+  props: {
+    badgeKey: {
+      type: String,
+      required: true,
+    },
+    value: {
+      type: [Number, String],
+      required: true,
+    },
+    replaceText: {
+      type: String,
+      default: ''
+    },
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    isExternalText: {
+      type: Boolean,
+      required: false
+    },
+    // 是否在看板模式下显示
+    dataCard: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {},
+  watch: {
+    badgeKey (newVal, oldVal) {
+      this.updateDictionary()
+    },
+    value (newVal, oldVal) {
+      this.updateDictionary()
+    }
+  },
+  data () {
+    return {
+      dictionary: undefined
+    }
+  },
+  created () {
+    this.updateDictionary()
+  },
+  methods: {
+    // todo 修改方式  想办法不使用回调方式
+    async updateDictionary () {
+      const result = this.$appdata.getParam(this.badgeKey, this.value)
+      if (result) {
+        this.dictionary = result
+        return
+      }
+      this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined, this.env === 'dev', this.serviceName)
+    },
+    badgeFilter (key, value) {
+      return this.$appdata.getParam(key, value)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.data_card {
+  display: inline;
+}
+</style>

package/src/base-client/components/common/XButtons/XButtonDemo.vue

@@ -1,28 +1,28 @@
-<template>
-  <div>
-    <x-buttons ref="xButtons"></x-buttons>
-  </div>
-</template>
-
-<script>
-  import XButtons from './XButtons.vue'
-  import { getConfigByName } from '@vue2-client/services/api/common'
-
-  export default {
-    name: 'XButtonDemo',
-    components: {
-        XButtons
-    },
-    data () {
-      return {}
-    },
-    mounted () {
-      getConfigByName('testButtonGroup', 'af-his', res => {
-        this.$refs.xButtons.init({
-          value: res.value
-        })
-      }, true)
-    },
-    methods: {},
-  }
-</script>
+<template>
+  <div>
+    <x-buttons ref="xButtons"></x-buttons>
+  </div>
+</template>
+
+<script>
+  import XButtons from './XButtons.vue'
+  import { getConfigByName } from '@vue2-client/services/api/common'
+
+  export default {
+    name: 'XButtonDemo',
+    components: {
+        XButtons
+    },
+    data () {
+      return {}
+    },
+    mounted () {
+      getConfigByName('testButtonGroup', 'af-his', res => {
+        this.$refs.xButtons.init({
+          value: res.value
+        })
+      }, true)
+    },
+    methods: {},
+  }
+</script>