vue2-client 1.9.26 → 1.9.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.26",
+  "version": "1.9.28",
   "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/his/XHisEditor/XHisEditor.vue

@@ -132,14 +132,14 @@ export default {
       this.showModeChoose = showModeChoose
       this.modeType = modeType
       this.ready = true
-      this.loadFile(fileUrl)
+      this.loadFile(fileUrl, bindObject)
     },
     // 加载文档
-    loadFile (fileUrl) {
+    loadFile (fileUrl, bindObject) {
       this.loading = true
       this.editorRef.loadUrl(fileUrl).then(() => {
-        if (this.bindObject) {
-          this.editorRef.setBindObject(this.bindObject)
+        if (bindObject) {
+          this.editorRef.setBindObject(bindObject)
         }
         this.changeMode()
         this.fileUrl = fileUrl
@@ -164,7 +164,7 @@ export default {
         }
         // 保存HTML文档和结构化数据到后端服务
         runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
-          this.loadFile(res.url)
+          this.loadFile(res.url, res.bindObject)
           this.$message.success('保存成功')
         })
       } else {
@@ -181,7 +181,7 @@ export default {
     },
     // 刷新文档
     refresh () {
-      this.loadFile(this.fileUrl)
+      this.loadFile(this.fileUrl, this.bindObject)
     },
     // 导出下拉菜单
     handleExportMenuClick (e) {