vue2-client 1.15.19 → 1.15.21

package/.env.liuli

@@ -1,4 +1,4 @@
-VUE_APP_PUBLIC_PATH=/
+VUE_APP_PUBLIC_PATH=/liuli-web
 VUE_APP_NAME=Admin
 VUE_APP_ROUTES_KEY=admin.routes
 VUE_APP_PERMISSIONS_KEY=admin.permissions
@@ -15,5 +15,6 @@ VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
 VUE_APP_SYSTEM_NAME=af-liuli
+VUE_APP_SINGLE_PAPER=TRUE
 VUE_APP_LOGIN_VERSION=V4
 

package/package.json

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

package/src/bootstrap.js

@@ -28,9 +28,11 @@ async function bootstrap ({ router, store, i18n, message }) {
         }
       })
     }
-    await getConfigByName('componentStyles', undefined, res => {
-      localStorage.setItem(process.env.VUE_APP_WEB_STYLES_KEY, JSON.stringify(res))
-    })
+    if (process.env.VUE_APP_SYSTEM_NAME && process.env.VUE_APP_SYSTEM_NAME === 'af-his') {
+      await getConfigByName('componentStyles', undefined, res => {
+        localStorage.setItem(process.env.VUE_APP_WEB_STYLES_KEY, JSON.stringify(res))
+      })
+    }
   }
   // 设置应用配置
   setAppOptions({ router, store, i18n })

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -190,7 +190,7 @@
                         <p v-else>{{ nextBtnTitle }}</p>
                       </template>
                       <a-button
-                        v-show="!lastStep"
+                        v-if="!lastStep"
                         :disabled="!showNextBtn && !stepDone"
                         type="primary"
                         @click="nextClick"
@@ -229,7 +229,7 @@
           <a-form layout="vertical">
             <a-form-item label="退回原因" :wrapper-col="{ span: 24 }" required>
               <a-textarea
-                v-model="note"
+                v-model="backNote"
                 :auto-size="{ minRows: 4, maxRows: 10 }"
                 placeholder="请填写退回原因 / 备注"
               />
@@ -480,6 +480,7 @@ export default {
       formValid: false,
       // 备忘
       note: '',
+      backNote: '', // 新增退回原因专用变量
       // 是否是最后一步
       lastStep: false,
       // 存储每一步骤填表人和时间数据
@@ -754,7 +755,7 @@ export default {
       })
     },
     async preClick () {
-      const notes = this.note.trim()
+      const notes = this.backNote.trim()
       if (!notes) {
         this.$message.error('退回请在备注中填写理由')
         return
@@ -768,6 +769,7 @@ export default {
           res => {
             this.saveWorkflowLog('退回', this.generateStepChangeText(this.currentStepId, this.preBtnTo), { notes })
             this.$message.success('退回成功')
+            this.backNote = '' // 退回成功后清空退回原因
             this.loading = true
             this.loadingHistory = true
             this.currentStepId = this.preBtnTo

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

@@ -53,9 +53,9 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
 path: 'example',
   name: '示例主页面',
-  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
+  component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
@@ -98,7 +98,8 @@ const routerMap = {
   root: {
     path: '/',
     name: '首页',
-    redirect: homePage,
+    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
+    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
     component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
   },
   exp403: {

package/src/utils/routerUtil.js

@@ -182,7 +182,9 @@ function loadRoutes (routesConfig) {
     if (routesConfig && routesConfig.length > 0) {
       const routes = parseRoutes(routesConfig, appRouterMap.routerMap)
       // 设置路由首页
-      routes[0].redirect = store.state.setting.homePage
+      if (!window.__MICRO_APP_ENVIRONMENT__) {
+        routes[0].redirect = store.state.setting.homePage
+      }
       let finalRoutes = mergeRoutes(basicOptions.routes, routes)
       formatRoutes(finalRoutes)
       const duplicates = checkDuplicateRouteNames(finalRoutes)