cloud-web-corejs 1.0.276 → 1.0.277

package/src/layout/components/langTool.vue

@@ -1,123 +1,128 @@
-<template>
-  <div class="item" v-if="i18nEnabled && languageSettings.length > 1">
-    <el-dropdown class="lang-box" trigger="click">
-      <span class="el-dropdown-link">
-        <i class="iconfont icon-duoyuyan"></i
-        ><i class="el-icon-arrow-down el-icon--right"></i>
-      </span>
-      <el-dropdown-menu slot="dropdown" class="lang-box-pup">
-        <el-dropdown-item
-          v-for="(item, index) in languageSettings"
-          :key="index"
-          :command="item.languageCode"
-          @click.native="changeLanguage(item.languageCode)"
-          :class="{ cur: currentName == item.languageName }"
-          >{{ $t1(item.languageName) }}
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-  </div>
-</template>
-
-<script>
-import settingConfig from "@/settings";
-
-export default {
-  name: "langTool",
-  data() {
-    return {
-      languageSettings: [],
-      languageSettingMap: {},
-      i18nEnabled: settingConfig.i18nEnabled,
-    };
-  },
-  computed: {
-    currentName() {
-      return this.languageSettingMap[this.$i18n.locale];
-    },
-  },
-  mounted() {
-    this.initLanguageSetting();
-  },
-  methods: {
-    changeLanguage(command) {
-      if (this.$i18n.locale != command) {
-        this.$http({
-          url: USER_PREFIX + `/auth/switchLanguage`,
-          method: `post`,
-          data: {
-            stringOne: command,
-          },
-          isLoading: true,
-          modalStrictly: true,
-          loadingTarget: document.body,
-          success: (res) => {
-            this.$i18n.locale = command; // 设置给本地的i18n插件
-            localStorage.setItem("i18n-lang", command);
-            this.$message.success("切换多语言成功");
-            location.reload();
-          },
-        });
-      }
-    },
-    initLanguageSetting() {
-      if (settingConfig.i18nEnabled !== true) return;
-      let languageSettings = [];
-      languageSettings.push(...this.$store.state.user.languageSettings);
-      let map = {};
-      languageSettings.forEach((item) => {
-        map[item.languageCode] = item.languageName;
-      });
-      this.languageSettingMap = map;
-      this.languageSettings = languageSettings;
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-/*多语言*/
-.lang-box {
-  border-right: solid 1px #ffffff24;
-  padding-right: 7px;
-  height: 18px;
-  line-height: 18px;
-  vertical-align: middle;
-  color: #fff;
-  font-size: 12px;
-
-  .el-icon--right {
-    margin-left: 3px;
-  }
-
-  .el-dropdown-link {
-    color: #fff;
-
-    .name {
-      display: inline-block;
-      width: 28px;
-      height: 19px;
-      overflow: hidden;
-      vertical-align: middle;
-      font-size: 12px;
-      line-height: 19px;
-    }
-
-    i {
-      zoom: 0.7;
-      margin-left: 3px;
-      opacity: 0.8;
-
-      &.iconfont {
-        font-size: 24px;
-        vertical-align: middle;
-        margin-right: 2px;
-      }
-    }
-  }
-}
-
-.lang-box-pup .el-dropdown-menu__item.cur {
-  background-color: #eaf0f4;
-  color: #5583a9;
-}
-</style>
+<template>
+  <div class="item" v-if="i18nEnabled && languageSettings.length > 1">
+    <el-dropdown class="lang-box" trigger="click">
+      <span class="el-dropdown-link">
+        <i class="iconfont icon-duoyuyan"></i
+        ><i class="el-icon-arrow-down el-icon--right"></i>
+      </span>
+      <el-dropdown-menu slot="dropdown" class="lang-box-pup">
+        <el-dropdown-item
+          v-for="(item, index) in languageSettings"
+          :key="index"
+          :command="item.languageCode"
+          @click.native="changeLanguage(item.languageCode)"
+          :class="{ cur: currentName == item.languageName }"
+          >{{ $t1(item.languageName) }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+
+<script>
+import settingConfig from "@/settings";
+
+export default {
+  name: "langTool",
+  data() {
+    return {
+      languageSettings: [],
+      languageSettingMap: {},
+      i18nEnabled: settingConfig.i18nEnabled,
+    };
+  },
+  computed: {
+    currentName() {
+      return this.languageSettingMap[this.$i18n.locale];
+    },
+  },
+  mounted() {
+    this.initLanguageSetting();
+  },
+  methods: {
+    changeLanguage(command) {
+      if (this.$i18n.locale != command) {
+        this.$http({
+          url: USER_PREFIX + `/auth/switchLanguage`,
+          method: `post`,
+          data: {
+            stringOne: command,
+          },
+          isLoading: true,
+          modalStrictly: true,
+          loadingTarget: document.body,
+          success: (res) => {
+            this.$i18n.locale = command; // 设置给本地的i18n插件
+            localStorage.setItem("i18n-lang", command);
+            this.$message.success("切换多语言成功");
+            // qiankun 子应用形态（自治嵌入壳可见时才有本入口）：reload 会刷新宿主整页，
+            // 降级为仅切换本应用词条；存量页面快照词条需刷新后完全生效
+            if (this.$store.state.micro && this.$store.state.micro.isMicro) {
+              return;
+            }
+            location.reload();
+          },
+        });
+      }
+    },
+    initLanguageSetting() {
+      if (settingConfig.i18nEnabled !== true) return;
+      let languageSettings = [];
+      languageSettings.push(...this.$store.state.user.languageSettings);
+      let map = {};
+      languageSettings.forEach((item) => {
+        map[item.languageCode] = item.languageName;
+      });
+      this.languageSettingMap = map;
+      this.languageSettings = languageSettings;
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+/*多语言*/
+.lang-box {
+  border-right: solid 1px #ffffff24;
+  padding-right: 7px;
+  height: 18px;
+  line-height: 18px;
+  vertical-align: middle;
+  color: #fff;
+  font-size: 12px;
+  margin-left: 5px;
+  .el-icon--right {
+    margin-left: 3px;
+  }
+
+  .el-dropdown-link {
+    color: #fff;
+
+    .name {
+      display: inline-block;
+      width: 28px;
+      height: 19px;
+      overflow: hidden;
+      vertical-align: middle;
+      font-size: 12px;
+      line-height: 19px;
+    }
+
+    i {
+      zoom: 0.7;
+      margin-left: 3px;
+      opacity: 0.8;
+
+      &.iconfont {
+        font-size: 24px;
+        vertical-align: middle;
+        margin-right: 2px;
+      }
+    }
+  }
+}
+
+.lang-box-pup .el-dropdown-menu__item.cur {
+  background-color: #eaf0f4;
+  color: #5583a9;
+}
+</style>

package/src/layout/defaultLayout.vue

@@ -1,158 +1,170 @@
-<template>
-  <div :class="{'app-wrapper openSidebar':showSidebar,'empty-home-wrapper':!showSidebar}">
-    <sidebar v-show="showSidebar" class="sidebar-container" :class="{ hoverold: hoverSidebar }" @selfClose="hoverSidebar = false"
-             @selfEnter="hoverSidebar = true" :isMenu.sync="isMenu"/>
-    <div :class="{'main-container':showSidebar,telescopMenu:!isMenu}">
-      <div class="fixed-header" v-show="showSidebar">
-        <tags-view v-if="needTagsView" :isMenu.sync="isMenu"/>
-      </div>
-      <app-main v-if="showAppMain" ref="appMain"/>
-    </div>
-    <modifyPasswordDialog ref="modifyPasswordDialog"></modifyPasswordDialog>
-  </div>
-</template>
-
-<script>
-import {mapState} from 'vuex';
-import modifyPasswordDialog from "@base/views/user/user/modifyPasswordDialog";
-
-export default {
-  components: {
-    AppMain: () => import('./components/AppMain'),
-    Sidebar: () => import('./components/Sidebar'),
-    TagsView: () => import('./components/TagsView'),
-    modifyPasswordDialog
-  },
-  computed: {
-    ...mapState({
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      showSettings: state => state.settings.showSettings,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
-    }),
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      };
-    },
-    showSidebar() {
-      let result = true
-      return result;
-    }
-  },
-  data() {
-    return {
-      hoverSidebar: false,
-      showAppMain: false,
-      showModifyPasswordDialog: true,
-      passwordStatus: 2,
-      isMenu:true
-    };
-  },
-  created() {
-    this.$http({
-      url: USER_PREFIX + `/auth/resetPrincipal`,
-      method: `post`,
-      data: {},
-      isLoading: true,
-      success: res => {
-      }
-    });
-    this.$baseEventBus.$on("triggerMenu",(value)=>{
-      this.isMenu = !this.isMenu;
-    });
-  },
-  async mounted() {
-    if (sessionStorage.getItem('toHome') == '1') {
-      sessionStorage.removeItem('toHome');
-      await this.closeAllTags();
-      this.$nextTick(() => {
-        this.showAppMain = true;
-      });
-    } else {
-      this.showAppMain = true;
-    }
-    this.$refs.modifyPasswordDialog.init();//校验是否需要修改密码
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false});
-    },
-    async closeAllTags() {
-      return this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
-        this.$router.replace({path: '/redirect/home'});
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-@import '~@/styles/mixin.scss';
-@import '~@/styles/variables.scss';
-
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
-  }
-}
-
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 10px;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth} - 20px);
-  transition: width 0.28s;
-  height: 33px;
-  padding-top: 2px;
-  //box-shadow:0 2px 6px rgba(0,0,0,0.04);
-  //background:#FFF;
-  // border-bottom: solid 2px $baseColor;
-  display: -moz-box;
-  display: -webkit-box;
-  display: box;
-}
-
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px);
-}
-
-.mobile .fixed-header {
-  width: 100%;
-}
-
-.info-box {
-  text-align: right;
-  padding-right: 16px;
-  line-height: 50px;
-  margin-left: 18px;
-  cursor: pointer;
-  font-size: 12px;
-}
-</style>
-<style>
-.vxe-custom--body > li[title='　'] {
-  display: none;
-}
-</style>
+<template>
+  <div :class="{'app-wrapper openSidebar':showSidebar,'empty-home-wrapper':!showSidebar}">
+    <sidebar v-show="showSidebar" class="sidebar-container" :class="{ hoverold: hoverSidebar }" @selfClose="hoverSidebar = false"
+             @selfEnter="hoverSidebar = true" :isMenu.sync="isMenu"/>
+    <div :class="{'main-container':showSidebar,telescopMenu:!isMenu}">
+      <div class="fixed-header" v-if="showSidebar">
+        <tags-view v-if="needTagsView" :isMenu.sync="isMenu"/>
+      </div>
+      <app-main v-if="showAppMain" ref="appMain"/>
+    </div>
+    <modifyPasswordDialog ref="modifyPasswordDialog"></modifyPasswordDialog>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex';
+import modifyPasswordDialog from "@base/views/user/user/modifyPasswordDialog";
+
+export default {
+  components: {
+    AppMain: () => import('./components/AppMain'),
+    Sidebar: () => import('./components/Sidebar'),
+    TagsView: () => import('./components/TagsView'),
+    modifyPasswordDialog
+  },
+  computed: {
+    ...mapState({
+      sidebar: state => state.app.sidebar,
+      device: state => state.app.device,
+      showSettings: state => state.settings.showSettings,
+      needTagsView: state => state.settings.tagsView,
+      fixedHeader: state => state.settings.fixedHeader
+    }),
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      };
+    },
+    showSidebar() {
+      let result = true
+      let micro = this.$store.state.micro || {};
+      if (micro.isMicro && !micro.selfManaged) {
+        // qiankun 子应用模式：侧边栏/页签壳由主应用提供；
+        // 自治嵌入模式（主应用未下发菜单）保留自身壳整站运行
+        result = false;
+      }
+      return result;
+    }
+  },
+  data() {
+    return {
+      hoverSidebar: false,
+      showAppMain: false,
+      showModifyPasswordDialog: true,
+      passwordStatus: 2,
+      isMenu:true
+    };
+  },
+  created() {
+    this.$http({
+      url: USER_PREFIX + `/auth/resetPrincipal`,
+      method: `post`,
+      data: {},
+      isLoading: true,
+      success: res => {
+      }
+    });
+    // handler 存实例属性并在销毁时 $off：事件总线是应用级单例，
+    // 不解绑会在登出重建布局后累积 handler 并钉住旧实例（内存泄露）
+    this.triggerMenuHandler = (value)=>{
+      this.isMenu = !this.isMenu;
+    };
+    this.$baseEventBus.$on("triggerMenu", this.triggerMenuHandler);
+  },
+  beforeDestroy() {
+    this.$baseEventBus.$off("triggerMenu", this.triggerMenuHandler);
+  },
+  async mounted() {
+    if (sessionStorage.getItem('toHome') == '1') {
+      sessionStorage.removeItem('toHome');
+      await this.closeAllTags();
+      this.$nextTick(() => {
+        this.showAppMain = true;
+      });
+    } else {
+      this.showAppMain = true;
+    }
+    this.$refs.modifyPasswordDialog.init();//校验是否需要修改密码
+  },
+  methods: {
+    handleClickOutside() {
+      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false});
+    },
+    async closeAllTags() {
+      return this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
+        this.$router.replace({path: '/redirect/home'});
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import '~@/styles/mixin.scss';
+@import '~@/styles/variables.scss';
+
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+  &.mobile.openSidebar {
+    position: fixed;
+    top: 0;
+  }
+}
+
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
+
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 10px;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth} - 20px);
+  transition: width 0.28s;
+  height: 33px;
+  padding-top: 2px;
+  //box-shadow:0 2px 6px rgba(0,0,0,0.04);
+  //background:#FFF;
+  // border-bottom: solid 2px $baseColor;
+  display: -moz-box;
+  display: -webkit-box;
+  display: box;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px);
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.info-box {
+  text-align: right;
+  padding-right: 16px;
+  line-height: 50px;
+  margin-left: 18px;
+  cursor: pointer;
+  font-size: 12px;
+}
+</style>
+<style>
+.vxe-custom--body > li[title='　'] {
+  display: none;
+}
+</style>

package/src/mixins/wf/index.js

@@ -1,38 +1,40 @@
-/**version-1.0*/
-import {initWf} from '../../components/wf/wfUtil'
-
-let mixins = {};
-mixins = {
-  methods: {
-    '_getBillInfo': async function (option) {
-      let defaultOption = {
-        url: null,
-        method: `post`,
-        data: {},
-        isLoading: true,
-        modalStrictly: true,
-        success: null
-      };
-      let opt = Object.assign({}, defaultOption, option);
-      delete opt.wfConfig;
-      return this.$commonHttp({
-        ...opt,
-        success: (res, response) => {
-          option.success && option.success(res, response);
-          if (option.wfConfig) {
-            let wfConfig = option.wfConfig(res);
-            if (wfConfig) {
-              let urlArr = opt.url.split('/');
-              let opt2 = Object.assign({}, wfConfig, {
-                serviceId: urlArr[1]
-              });
-              //初始化流程
-              initWf.call(this, opt2);
-            }
-          }
-        }
-      });
-    }
-  }
-}
-export default mixins;
+/**version-1.0*/
+import {initWf} from '../../components/wf/wfUtil'
+
+let mixins = {};
+mixins = {
+  methods: {
+    '_getBillInfo': async function (option) {
+      let defaultOption = {
+        url: null,
+        method: `post`,
+        data: {},
+        isLoading: true,
+        modalStrictly: true,
+        success: null
+      };
+      let opt = Object.assign({}, defaultOption, option);
+      delete opt.wfConfig;
+      return this.$commonHttp({
+        ...opt,
+        success: (res, response) => {
+          option.success && option.success(res, response);
+          if (option.wfConfig) {
+            let wfConfig = option.wfConfig(res);
+            if (wfConfig) {
+              let urlArr = opt.url.split('/');
+              let opt2 = Object.assign({}, wfConfig, {
+                //显式传的 serviceId 优先(与 xform/mixins/scriptHttp.js 口径一致)，
+                //没传才按取数 url 的首段推导——单据取数与流程不在同一服务时必须显式传。
+                serviceId: wfConfig.serviceId || urlArr[1]
+              });
+              //初始化流程
+              initWf.call(this, opt2);
+            }
+          }
+        }
+      });
+    }
+  }
+}
+export default mixins;