@lambo-design/pro-layout 1.0.0-beta.447 → 1.0.0-beta.449

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.447",
+  "version": "1.0.0-beta.449",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,8 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.177",
-    "@lambo-design/shared": "^1.0.0-beta.358"
+    "@lambo-design/core": "^4.7.1-beta.178",
+    "@lambo-design/shared": "^1.0.0-beta.361"
   },
   "scripts": {
     "release-pro-layout": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/components/pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-document.vue

@@ -1,7 +1,17 @@
 <template>
-  <Tooltip :content="tooltipContent" placement="bottom">
-    <Icon @click="collectEvent"  type="ios-help-circle-outline" size="16" style="cursor: pointer" />
-  </Tooltip>
+  <div>
+    <Tooltip :content="tooltipContent" placement="bottom">
+      <Icon @click="collectEvent" type="ios-help-circle-outline" size="16" style="cursor: pointer" />
+    </Tooltip>
+    <Modal v-model="modalShow" fullscreen :mask-closable="false" :closable="false">
+      <div class="document-modal-iframe-wrap">
+        <iframe class="document-modal-iframe" :src="modalLink" frameborder="0"></iframe>
+      </div>
+      <div slot="footer">
+        <Button type="primary" @click="closeDocumentModal">关闭</Button>
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
@@ -16,7 +26,9 @@ export default {
     return {
       documentUpdateLink: '',
       documentLinkTarget: 'blank',
-      documentDescText: ''
+      documentDescText: '',
+      modalShow: false,
+      modalLink: ''
     }
   },
   computed: {
@@ -49,9 +61,12 @@ export default {
         }
       }
     },
-    collectEvent(){
+    collectEvent() {
       if (this.documentUpdateLink) {
-        if (this.documentLinkTarget === 'tab') {
+        if (this.documentLinkTarget === 'modal') {
+          this.modalLink = this.documentUpdateLink
+          this.modalShow = true
+        } else if (this.documentLinkTarget === 'tab') {
           let menuItem = {
             meta: {
               appId: "home",
@@ -68,8 +83,12 @@ export default {
         }
       } else {
         let url = '%E5%A4%A7%E6%95%B0%E6%8D%AE%E5%B9%B3%E5%8F%B0%E6%93%8D%E4%BD%9C%E6%89%8B%E5%86%8C/';
-        window.open('/dw-guide-doc/'+url, '_blank');
+        window.open('/dw-guide-doc/' + url, '_blank');
       }
+    },
+    closeDocumentModal() {
+      this.modalShow = false
+      this.modalLink = ''
     }
   },
   created() {
@@ -80,3 +99,18 @@ export default {
   }
 }
 </script>
+
+<style scoped lang="less">
+.document-modal-iframe-wrap {
+  height: calc(100vh - 60px);
+  overflow: hidden;
+}
+.document-modal-iframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+}
+/deep/.ivu-modal-wrap {
+    z-index: 99999 !important;
+}
+</style>

package/src/components/pro-layout-header/pro-layout-tools/components/pro-layout-tools-quick-intl.vue

@@ -68,7 +68,8 @@ export default {
     },
     switchLang(name) {
         window.sessionStorage.clear();
-        localStorage.removeItem(config.routerBase + '-tagNavList');
+        // localStorage.removeItem(config.routerBase + '-tagNavList');
+        sessionStorage.removeItem(config.routerBase + '-tagNavList');
         this.defaultLang = this.langCodeDict[name];
         sessionStorage.setItem("lambo_lang_code", name);
         this.callSwitchLangApi(name, true);

package/src/components/pro-layout-tabs/index.vue

@@ -46,6 +46,7 @@ import {
   getPreviousTagIndex,
   getDelTagIndex,
   setTagNavListInLocalstorage,
+  setTagNavListInSessionstorage,
   showTitle, getRootPermission
 } from '@lambo-design/shared/utils/platform'
 import beforeClose from '@lambo-design/shared/utils/menu/before-close'
@@ -134,7 +135,8 @@ export default {
         let index = getDelTagIndex(data,current);
         data.splice(index,1);
       }
-      setTagNavListInLocalstorage(data, config.routerBase + '-tagNavList');
+      // setTagNavListInLocalstorage(data, config.routerBase + '-tagNavList');
+      setTagNavListInSessionstorage(data, config.routerBase + '-tagNavList');
       this.tagList = data;
       if (current !== this.value) {
         this.value = current;

package/src/index.vue

@@ -68,7 +68,7 @@ import LamboProLayoutTabs from './components/pro-layout-tabs'
 import Bus from '@lambo-design/shared/utils/bus'
 import config from "@lambo-design/shared/config/config";
 import {
-  getTagNavListFromLocalstorage, isOpenBlank, routeEqual, tagExists,
+  getTagNavListFromLocalstorage, isOpenBlank, routeEqual, tagExists,getTagNavListFromSessionstorage
 } from "@lambo-design/shared/utils/platform";
 import {deepCopy} from "@lambo-design/shared/utils/assist";
 import Locale from '@lambo-design/core/src/mixins/locale';
@@ -318,7 +318,8 @@ export default {
       Bus.$emit('other-datas',this.otherDatas)
     },
     initTags(){
-      let tagList = getTagNavListFromLocalstorage(config.routerBase + '-tagNavList');
+      // let tagList = getTagNavListFromLocalstorage(config.routerBase + '-tagNavList');
+      let tagList = getTagNavListFromSessionstorage(config.routerBase + '-tagNavList');
       if (tagList.length == 0) {
         tagList.push(this.homeRouter);
       }
@@ -390,7 +391,8 @@ export default {
       } else {
         name = menu.name;
         menuItem = deepCopy(menu);
-        let tagList = getTagNavListFromLocalstorage(config.routerBase + '-tagNavList');
+        // let tagList = getTagNavListFromLocalstorage(config.routerBase + '-tagNavList');
+        let tagList = getTagNavListFromSessionstorage(config.routerBase + '-tagNavList');
         if (!tagExists(tagList,name)) {
           tagList.push(menuItem);
         } else {