vue2-client 1.9.25 → 1.9.27

package/package.json

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

package/src/App.vue

@@ -96,11 +96,15 @@ export default {
     },
     setMicroApp () {
       let baseApp = '/login'
+      let queryData = {}
       const that = this
       if (window.__MICRO_APP_ENVIRONMENT__) {
         const data = window.microApp.getData() // 获取主应用下发的data数据
         if (data.baseroute) {
           baseApp = data.baseroute
+        } // 获取主应用下发的data数据
+        if (data.queryData) {
+          queryData = data.queryData
         }
         this.setMicroAppTheme(data.themeStore)
         window.microApp.addDataListener((_data) => {
@@ -110,7 +114,7 @@ export default {
           that.setMicroAppTheme(_data.themeStore)
         })
         console.log('microApp', window.microApp)
-        this.$router.replace({ path: baseApp })
+        this.$router.replace({ path: baseApp, query: queryData })
       }
     },
     setMicroAppTheme (themeStore) {

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

@@ -60,32 +60,28 @@
               <span class="custom-tree-node" slot-scope="{ node,data }">
                 <span :class="{ 'selected': data === selectedNode }" @click="nodeItemClick(data)">
                   <a-tooltip placement="right" :title="node.label">
-                    <a-space>
-                      <a-icon
-                        v-if="data.icon"
-                        :style="{color: data.iconColor}"
-                        :type="data.icon"/>
-                      <span
-                        v-html="highlightKeyword(node.label, searchInput)"></span>
-                      <span v-if="countVisible">{{
-                        data.hasOwnProperty('count') ? ' (' + data.count + ')' : ''
-                      }}</span>
-                    </a-space>
-                  </a-tooltip>
-                </span>
-                <a-space style="float:right;margin-right: .2rem">
-                  <a-tooltip
-                    :title="icon.title"
-                    :key="icon.func"
-                    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>
+                      v-if="data.icon"
+                      :style="{color: data.iconColor, marginRight: '5px'}"
+                      :type="data.icon"/>
+                    <span
+                      v-html="highlightKeyword(node.label, searchInput)"></span>
+                    <span v-if="countVisible">{{
+                      data.hasOwnProperty('count') ? ' (' + data.count + ')' : ''
+                    }}</span>
                   </a-tooltip>
-                </a-space>
+                </span>
+                <a-tooltip
+                  :title="icon.title"
+                  :key="icon.func"
+                  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, marginLeft: '8px'}"></a-icon>
+                </a-tooltip>
               </span>
             </vue-easy-tree>
           </div>
@@ -429,6 +425,10 @@ export default {
   :deep(.el-tree-node__content) {
     cursor: default;
   }
+
+  :deep(.vue-recycle-scroller__item-wrapper) {
+    overflow-x: auto;
+  }
 }
 
 </style>

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -96,6 +96,8 @@ export default {
       dataMode: undefined,
       // 保存数据调用的Logic名称
       saveDataLogicName: undefined,
+      // 保存数据调用Logic传入的额外参数
+      logicExtraParams: undefined,
       // 服务名
       serviceName: undefined
     }
@@ -112,6 +114,7 @@ export default {
         resId,
         bindObject,
         saveDataLogicName,
+        logicExtraParams,
         serviceName,
         showModeChoose = true,
         modeType = 'readonly'
@@ -124,6 +127,7 @@ export default {
         this.dataMode = 'template'
       }
       this.saveDataLogicName = saveDataLogicName
+      this.logicExtraParams = logicExtraParams
       this.serviceName = serviceName
       this.showModeChoose = showModeChoose
       this.modeType = modeType
@@ -155,7 +159,8 @@ export default {
           doc: this.editorRef.getHtml(),
           dataObject: this.editorRef.getBindObject(),
           dataMode: this.dataMode,
-          resId: this.resId
+          resId: this.resId,
+          logicExtraParams: this.logicExtraParams
         }
         // 保存HTML文档和结构化数据到后端服务
         runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {