vue2-client 1.9.15 → 1.9.16

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -5,13 +5,14 @@
 
 # 通过this可以调用的函数
 - openDialog(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
-- openDialog(configName, selectedId, mixinData, outEnv)：打开一个对话框：
-* selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
-* mixinData: form表单需要的数据
-* outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
-* getOutEnv 获取获取 outEnv
+- openDialog(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
+  * selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
+  * mixinData: form表单需要的数据
+  * outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
+  * attr: 用于传递参数绑定到 modal 弹框上
+- getOutEnv 获取获取 outEnv
 ```js
-this.openDialog('xxx', 5, {}, {})
+this.openDialog('xxx', 5, {}, {}, {})
 ```
 - runLogic(logicName, parameter): 运行业务逻辑, 例如: this.runLogic('xxx', {})
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.15",
+  "version": "1.9.16",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -2,13 +2,13 @@
   <a-modal
     :confirm-loading="loading"
     :destroyOnClose="true"
-    :title="resolvedTitle? resolvedTitle : businessTitle"
     :visible="visible"
     width="80%"
     height="60%"
     okText="提交"
     @cancel="close"
-    @ok="onSubmit">
+    @ok="onSubmit"
+    v-bind="attr">
     <div style="max-height: 70vh; overflow-y: auto;" v-if="showReport">
       <x-report
         @updateImg="updateImg"
@@ -29,152 +29,168 @@
 import { mapState } from 'vuex'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { runLogic } from '@vue2-client/services/api/common'
-// import XReport from '@vue2-client/pages/XReportGridView/XReport.vue'
 
 export default {
-    name: 'XAddReport',
-    components: {
-      XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
-    },
-    props: {
-      env: {
-        type: String,
-        default: 'prod'
+  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
       }
+    }
+  },
+  inject: ['getParentComponentByName'],
+  computed: {
+    businessTitle () {
+      return this.businessType + this.title
     },
-    data () {
-      return {
-        // 业务类型
-        businessType: '',
-        showReport: true,
-        configName: '',
-        displayOnly: true,
-        serverName: '',
-        // 业务标题
-        title: '',
-        // 自定义标题
-        resolvedTitle: '选择',
-        // 新增或修改业务是否执行中
-        loading: false,
-        // 是否显示新增/修改模态框
-        visible: false,
-        // 选中的处理对象的id号
-        selectedId: null,
-        // 混入插槽组件的数据
-        mixinData: {},
-        // 打开窗口接收到的外部环境数据
-        outEnv: {},
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    runLogic,
+    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
     },
-    provide () {
-      return {
-        getSelectedId: () => this.getSelectedId(),
-        getSelectedData: () => { return this.selectedId },
-        getMixinData: () => { return this.mixinData },
-        getOutEnv: () => { return this.outEnv },
-        isInAModal: () => { return true }
+    getSelectedId () {
+      if (typeof this.selectedId === 'object') {
+        if (Object.keys(this.selectedId) > 0) {
+          return this.selectedId[Object.keys(this.selectedId)[0]]
+        }
+      } else {
+        return this.selectedId
       }
     },
-    inject: ['getParentComponentByName'],
-    computed: {
-      businessTitle () {
-        return this.businessType + this.title
-      },
-      ...mapState('account', { currUser: 'user' })
+    selectRow (selectedRowKeys, selectedRows) {
+      this.table_selectedRowKeys = selectedRowKeys
+      this.table_selectedRows = selectedRows
+      console.log('XAddReport')
+      this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
-    methods: {
-      runLogic,
-      init (params) {
-        console.log('params', params)
-        const {
-          configName = 'medicalRecordCover', serverName = process.env.VUE_APP_SYSTEM_NAME, displayOnly = true, selectedId = null, outEnv = {}, mixinData = {}
-        } = params
-        this.configName = configName
-        this.serverName = serverName
-        this.displayOnly = displayOnly
-        this.visible = true
-        // 有选中项，给选中项赋值
-        if (selectedId) {
-          this.selectedId = selectedId
-        }
-        // 当有些组件需要外部传数据时 使用这个混入
-        this.mixinData = mixinData
-        // 把打开时的环境传递给打开窗口，以便js脚本中使用
-        this.outEnv = outEnv
-      },
-      getSelectedId () {
-        if (typeof this.selectedId === 'object') {
-          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)
+    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')
         }
-      },
-      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)
-              }
+        const result = executeStrFunctionByContext(this, func, [])
+        if (result instanceof Promise) {
+          result.then((res) => {
+            if (!res) {
               this.close()
-            })
-          } else {
+              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 {
-          console.warn('未配置modal确认按钮逻辑')
           this.close()
         }
-      },
-      updateImg (data) {
-        console.log(data)
+      } else {
+        console.warn('未配置modal确认按钮逻辑')
+        this.close()
       }
+    },
+    updateImg (data) {
+      console.log(data)
     }
   }
+}
 </script>

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

@@ -276,9 +276,10 @@ export default {
      * @param configName 栅格配置名称
      * @param selectedId 选中得id
      * @param mixinData  需要混入得数据
-     * @param env 其他传递给打开窗口的数据
+     * @param outEnv 其他传递给打开窗口的数据
+     * @param attr 传递给Modal弹框用的信息
      */
-    openDialog (configName, selectedId, mixinData, outEnv) {
+    openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
       console.log('openDialog', configName, selectedId)
       this.$refs.xAddReport.init({
         configName: configName,

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -67,13 +67,17 @@
                   </a-tooltip>
                 </span>
                 <a-space style="float:right;margin-right: .2rem">
-                  <a-icon
-                    v-for="icon in config.btn"
-                    @click.stop="action(data, icon.func)"
+                  <a-tooltip
+                    :title="icon.title"
                     :key="icon.func"
-                    v-if="executeStrFunction( icon.customFunction,[data])"
-                    :type="icon.icon"
-                    :style="{color:icon.color}"></a-icon>
+                    v-for="icon in config.btn"
+                  >
+                    <a-icon
+                      @click.stop="action(data, icon.func)"
+                      v-if="executeStrFunction( icon.customFunction,[data])"
+                      :type="icon.icon"
+                      :style="{color:icon.color}"></a-icon>
+                  </a-tooltip>
                 </a-space>
               </span>
             </vue-easy-tree>