vue2-client 1.9.22 → 1.9.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.22",
+  "version": "1.9.24",
   "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

@@ -29,6 +29,7 @@
 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 '@/utils/microAppUtils'
 
 export default {
   name: 'XAddReport',
@@ -92,6 +93,10 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   methods: {
+    getWindow,
+    isMicroAppEnv,
+    microDispatch,
+    getMicroData,
     runLogic,
     init (params) {
       console.log('params', params)

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

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="medicalRecordCover"
+        config-name="templateManageView2"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

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

@@ -12,7 +12,8 @@
           :span="cell.colSpan ? cell.colSpan * 2 : undefined">
           <!-- 插槽渲染 -->
           <template v-if="cell.type === 'slot'">
-            <template v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group'].includes(cell.slotType)">
+            <template
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -393,6 +394,7 @@ import { formatDate } from '@vue2-client/utils/util'
 import { nanoid } from 'nanoid'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@/utils/microAppUtils'
 
 export default {
   name: 'XReportTrGroup',
@@ -492,6 +494,10 @@ export default {
   },
   inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv'],
   methods: {
+    getWindow,
+    isMicroAppEnv,
+    microDispatch,
+    getMicroData,
     onComponentMounted (h, cell, cellIndex) {
       if (this.getMixinData && this.getMixinData()) {
         this.mixinData = this.getMixinData()

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

@@ -28,6 +28,7 @@
 <script>
 import { getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@/utils/microAppUtils'
 
 export default {
   name: 'XTab',
@@ -45,6 +46,10 @@ export default {
     }
   },
   methods: {
+    getWindow,
+    isMicroAppEnv,
+    microDispatch,
+    getMicroData,
     initConfig () {
       if (this.configName) {
         this.getConfig()

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

@@ -52,6 +52,7 @@
               @check-change="handleCheckChange"
               :default-expanded-keys="expandedKeys"
               @node-expand="nodeExpand"
+              @node-collapse="nodeCollapse"
               @node-click="handleNodeClick"
               :filter-node-method="filterNode"
               :props="props"
@@ -207,6 +208,7 @@ export default {
     }
   },
   methods: {
+    // 节点展开暂存
     nodeExpand (node) {
       if (this.expandedKeys.includes(node[this.replaceFields.key])) {
         this.expandedKeys = this.expandedKeys.filter(item => item !== node[this.replaceFields.key])
@@ -214,6 +216,10 @@ export default {
         this.expandedKeys.push(node[this.replaceFields.key])
       }
     },
+    // 节点关闭
+    nodeCollapse (node) {
+      this.expandedKeys = this.expandedKeys.filter(item => item !== node[this.replaceFields.key])
+    },
     highlightKeyword (label, keyword) {
       const maxLen = this.config.deepNodeMaxWidth
 

package/src/utils/microAppUtils.js

@@ -0,0 +1,40 @@
+/**
+ * 获取 window 对象
+ * @returns {Window} window 对象
+ */
+export function getWindow () {
+  return window
+}
+
+/**
+ * 判断是否处于 microApp 环境
+ * @returns {boolean} 如果在 microApp 环境下返回 true，否则返回 false
+ */
+export function isMicroAppEnv () {
+  return window.__MICRO_APP_ENVIRONMENT__
+}
+
+/**
+ * 发送事件给基座应用
+ * @param {Object} data 要传递的数据
+ * @param {Function} callBack 如果不是 microApp 环境时的回调函数
+ * @returns {*} 在 microApp 环境下返回 dispatch 的结果，否则执行 callBack
+ */
+export function microDispatch (data, callBack) {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    return window.microApp.dispatch(data)
+  }
+  if (callBack) {
+    return callBack()
+  }
+}
+
+/**
+ * 获取 microApp 的数据
+ * @returns {*} microApp 的数据，如果不在 microApp 环境下返回 undefined
+ */
+export function getMicroData () {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    return window.microApp.getData()
+  }
+}