vue2-client 1.15.84 → 1.15.86

package/src/base-client/components/common/XAddNativeForm/demo.vue

@@ -1,40 +1,54 @@
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XAddNativeForm },
-  mounted () {
-    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
-      this.$refs.xAddFrom.init(Object.assign(res, {
-        modifyModelData: {
-          data: {}
-        }
-      }))
-    })
-  },
-  methods: {
-    aaa (attr, value) {
-    },
-    singLocal () {
-      console.log('singLocal')
-    }
-  }
-}
-</script>
-
-<template>
-  <a-card>
-    <x-add-native-form
-      ref="xAddFrom"
-      @getinfo="aaa"
-      @onSubmit="aaa"
-      @singLocal="singLocal"
-    />
-  </a-card>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XAddNativeForm },
+  data () {
+    return {
+        form: {}
+    }
+  },
+  mounted () {
+    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
+      this.$refs.xAddFrom.init(Object.assign(res, {
+        modifyModelData: {
+          data: {}
+        }
+      }))
+    })
+  },
+  methods: {
+    aaa (value) {
+      this.form = Object.assign({}, value.realForm)
+      this.$refs.xAddFrom.loading = false
+    },
+    singLocal () {
+      console.log('singLocal')
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <a-card>
+      <x-add-native-form
+        ref="xAddFrom"
+        @getinfo="aaa"
+        @onSubmit="aaa"
+        @singLocal="singLocal"
+      />
+    </a-card>
+    <a-card>
+      <pre>{{
+        form ? JSON.stringify(form, null, 2) : '请先点击获取表单数据' }}
+    </pre>
+    </a-card>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -1,3 +1,3 @@
-import XAddNativeForm from './XAddNativeForm'
-
-export default XAddNativeForm
+import XAddNativeForm from './XAddNativeForm'
+
+export default XAddNativeForm

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

@@ -1,212 +1,212 @@
-<template>
-  <a-modal
-    :confirm-loading="loading"
-    :destroyOnClose="true"
-    :visible="visible"
-    width="80%"
-    height="60%"
-    okText="提交"
-    :footer="showButtons ? undefined : null"
-    @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: {},
-      // 是否显示对话框按钮
-      showButtons: true,
-    }
-  },
-  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', 'setGlobalData', 'getGlobalData'],
-  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 = {},
-        showButtons = true,
-      } = params
-      this.configName = configName
-      this.serverName = serverName
-      this.displayOnly = displayOnly
-      this.visible = true
-      this.attr = attr
-      this.showButtons = showButtons
-      // 有选中项，给选中项赋值
-      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="提交"
+    :footer="showButtons ? undefined : null"
+    @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: {},
+      // 是否显示对话框按钮
+      showButtons: true,
+    }
+  },
+  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', 'setGlobalData', 'getGlobalData'],
+  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 = {},
+        showButtons = true,
+      } = params
+      this.configName = configName
+      this.serverName = serverName
+      this.displayOnly = displayOnly
+      this.visible = true
+      this.attr = attr
+      this.showButtons = showButtons
+      // 有选中项，给选中项赋值
+      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/index.js

@@ -1,3 +1,3 @@
-import XBadge from './XBadge'
-
-export default XBadge
+import XBadge from './XBadge'
+
+export default XBadge

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

@@ -1,39 +1,39 @@
-# XBadge 重封装徽标
-
-对antdv的badge组件进行重封装
-
-
-
-## 何时使用
-
-当需要一个徽标时
-
-
-引用方式：
-
-```javascript
-import XBadge from '@vue2-client/base-client/components/XBadge'
-
-export default {
-    components: {
-      XBadge
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<x-badge :badgeKey="badgeKey" :value="value"/>
-```
-
-## API
-
-| 参数             | 说明     | 类型      | 默认值   |
-|----------------|--------|---------|-------|
-| badgeKey       | 徽标键    | String  | null  |
-| value          | 数据值    | String  | null  |
-| replaceText    | 替代文本   | String  | ''    |
-| isExternalText | 是否文本外置 | Boolean | false |
+# XBadge 重封装徽标
+
+对antdv的badge组件进行重封装
+
+
+
+## 何时使用
+
+当需要一个徽标时
+
+
+引用方式：
+
+```javascript
+import XBadge from '@vue2-client/base-client/components/XBadge'
+
+export default {
+    components: {
+      XBadge
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-badge :badgeKey="badgeKey" :value="value"/>
+```
+
+## API
+
+| 参数             | 说明     | 类型      | 默认值   |
+|----------------|--------|---------|-------|
+| badgeKey       | 徽标键    | String  | null  |
+| value          | 数据值    | String  | null  |
+| replaceText    | 替代文本   | String  | ''    |
+| isExternalText | 是否文本外置 | Boolean | false |