vue2-client 1.9.52 → 1.9.54

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

@@ -6,6 +6,8 @@
 # 通过this可以调用的函数
 - openDialog(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
 - openDialog(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
+- openDrawer(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
+- openDrawer(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
   * selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
   * mixinData: form表单需要的数据
   * outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问

package/package.json

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

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

@@ -0,0 +1,198 @@
+<template>
+  <a-drawer
+    :destroyOnClose="true"
+    :visible="visible"
+    placement="right"
+    width="85vw"
+    @close="visible=false"
+    v-bind="attr">
+    <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"/>
+  </a-drawer>
+</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'
+
+export default {
+  name: 'XReportDrawer',
+  components: {
+    XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
+  },
+  props: {
+    env: {
+      type: String,
+      default: 'prod'
+    }
+  },
+  data () {
+    return {
+      // 业务类型
+      businessType: '',
+      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
+    },
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    getWindow,
+    isMicroAppEnv,
+    microDispatch,
+    getMicroData,
+    runLogic,
+    init (params) {
+      console.log('params', params)
+      const {
+        configName = '',
+        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/XReportDrawer/index.js

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

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

@@ -77,6 +77,11 @@
       :env="env"
       ref="xAddReport"
     />
+    <!-- 弹出框 -->
+    <x-report-drawer
+      :env="env"
+      ref="xReportDrawer"
+    />
   </div>
 </template>
 
@@ -189,6 +194,7 @@ export default {
   },
   components: {
     XAddReport: () => import('@vue2-client/base-client/components/common/XAddReport'),
+    XReportDrawer: () => import('@vue2-client/base-client/components/common/XReportDrawer'),
     XReportDesign
   },
   data () {
@@ -285,7 +291,18 @@ export default {
         configName: configName,
         selectedId: selectedId,
         mixinData: mixinData,
-        outEnv: outEnv
+        outEnv: outEnv,
+        attr
+      })
+    },
+    openDrawer (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
+      console.log('openDialog', configName, selectedId)
+      this.$refs.xReportDrawer.init({
+        configName,
+        selectedId,
+        mixinData,
+        outEnv,
+        attr
       })
     },
     // 向外暴露图片修改后的数据，某些外部需要自己管理图片的保存与修改

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

@@ -27,7 +27,7 @@ export default {
     XReport, XAddReport
   },
   mounted () {
-
+      this.$refs.main.openDrawer('medicalTestCover', -1, {})
   },
   data () {
     return {

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

@@ -59,7 +59,6 @@ export default {
         return
       }
       const oldKey = this.activeKey
-      this.activeKey = newKey
       if (this.config.changeFunc) {
         const args = [
           oldKey,
@@ -74,7 +73,12 @@ export default {
           args.push(this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`][0])
           this.$nextTick(() => {
             // fromKey,toKey,fromConfig,toConfig,fromRef,toRef
-            executeStrFunctionByContext(this, this.config.changeFunc, args)
+            const result = executeStrFunctionByContext(this, this.config.changeFunc, args)
+            if (result && result.noChange) {
+              console.info('不切换页签作为按钮使用')
+            } else {
+              this.activeKey = newKey
+            }
           })
         }
       }

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

@@ -85,9 +85,9 @@ routerResource.example = {
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示