n20-common-lib 2.1.32 → 2.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.32",
+  "version": "2.1.33",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Filters/index.vue

@@ -67,6 +67,7 @@
           :is-filter="true"
           :auto-save="true"
           :page-id="pageId"
+          :width="remoteWidth"
           @setColumns="setRemoteChange"
         />
       </template>
@@ -121,6 +122,10 @@ export default {
     isGroup: {
       type: Boolean,
       default: false
+    },
+    remoteWidth: {
+      type: String,
+      default: undefined
     }
   },
   data() {

package/src/components/Layout/HeaderWrap/index.vue

@@ -22,20 +22,22 @@
     <!-- eslint-disable-next-line vue/no-v-html -->
     <h3 class="header-title m-r-auto" v-html="headerTitle"></h3>
     <!-- YSCW -->
-    <sapn v-if="ectad" class="f-s-s">
-      <span class="m-r-ss">
-        {{ '用户' | $lc }}: <span class="color-666">{{ userInfo.userName }}</span>
-      </span>
-      <span class="m-r-ss b-center">
-        {{ '角色' | $lc }}:
-        <span v-title:br="rolesList.map((el) => el.name)" class="text-ellipsis color-666" style="max-width: 150px">{{
-          rolesList.map((el) => el.name).join(',')
-        }}</span>
-      </span>
-      <span>
-        {{ '单位' | $lc }}: <span class="color-666">{{ userInfo.companyName }}</span>
-      </span>
-    </sapn>
+    <slot name="header-ectad">
+      <sapn v-if="ectad" class="f-s-s">
+        <span class="m-r-ss">
+          {{ '用户' | $lc }}: <span class="color-666">{{ userInfo.userName }}</span>
+        </span>
+        <span class="m-r-ss b-center">
+          {{ '角色' | $lc }}:
+          <span v-title:br="rolesList.map((el) => el.name)" class="text-ellipsis color-666" style="max-width: 150px">{{
+            rolesList.map((el) => el.name).join(',')
+          }}</span>
+        </span>
+        <span>
+          {{ '单位' | $lc }}: <span class="color-666">{{ userInfo.companyName }}</span>
+        </span>
+      </sapn>
+    </slot>
     <!-- YSCW-end -->
     <el-tooltip v-if="!hideHelpDoc" :content="'帮助文档' | $lc">
       <span class="set-user-btn n20-icon-xinxitishi header-color m-l-m" @click="openHelp"></span>
@@ -113,6 +115,7 @@
             >
           </div>
         </el-dropdown-item>
+        <slot name="header-dropdown"></slot>
         <el-divider class="m-t-s m-b-s" />
         <div class="user-log-time p-l p-r p-b-s">
           <i class="el-icon-s-help m-r-s" style="color: var(--color-success)"></i>

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -22,24 +22,22 @@
     <!-- eslint-disable-next-line vue/no-v-html -->
     <h3 class="header-title m-r-auto" v-html="headerTitle"></h3>
     <!-- YSCW -->
-    <sapn v-if="ectad" class="f-s-s">
-      <span class="m-r-ss">
-        {{ '用户' | $lc }}: <span class="color-666">{{ userInfo.userName }}</span>
-      </span>
-      <span class="m-r-ss b-center">
-        {{ '角色' | $lc }}:
-        <span v-title:br="rolesList.map((el) => el.name)" class="text-ellipsis color-666" style="max-width: 150px">{{
-          rolesList.map((el) => el.name).join(',')
-        }}</span>
-      </span>
-      <span>
-        {{ '单位' | $lc }}: <span class="color-666">{{ userInfo.companyName }}</span>
-      </span>
-    </sapn>
-    <span v-else-if="byLabel && !inBack" class="header-uif-by">{{ byLabel }}</span>
-    <el-button v-if="inBack" class="header-hdyy f-s-s" plain round size="mini" @click="toSystem">{{
-      '回到应用' | $lc
-    }}</el-button>
+    <slot name="header-ectad">
+      <sapn v-if="ectad" class="f-s-s">
+        <span class="m-r-ss">
+          {{ '用户' | $lc }}: <span class="color-666">{{ userInfo.userName }}</span>
+        </span>
+        <span class="m-r-ss b-center">
+          {{ '角色' | $lc }}:
+          <span v-title:br="rolesList.map((el) => el.name)" class="text-ellipsis color-666" style="max-width: 150px">{{
+            rolesList.map((el) => el.name).join(',')
+          }}</span>
+        </span>
+        <span>
+          {{ '单位' | $lc }}: <span class="color-666">{{ userInfo.companyName }}</span>
+        </span>
+      </sapn>
+    </slot>
     <!-- YSCW-end -->
     <el-dropdown class="m-l-lg" @command="setLang">
       <!-- <el-tooltip v-if="!hideLang" :content="'语言切换' | $lc"> -->
@@ -183,6 +181,7 @@
             <i class="el-icon-caret-right m-l-auto m-r-0"></i>
           </div>
         </el-dropdown-item>
+        <slot name="header-dropdown"></slot>
         <el-dropdown-item command="logOut">
           <div class="flex-box flex-v">
             <span>{{ '退出' | $lc }}</span>
@@ -342,10 +341,14 @@ export default {
       })
 
       this.getByLabel().then(() => {
-        this.byV = true
-        setTimeout(() => {
-          this.byV = false
-        }, 6000)
+        let notFirstShowBy = sessionStorage.getItem('notFirstShowBy')
+        if (!notFirstShowBy) {
+          this.byV = true
+          setTimeout(() => {
+            this.byV = false
+          }, 6000)
+          sessionStorage.setItem('notFirstShowBy', true)
+        }
       })
     })
 

package/src/components/Layout/index.vue

@@ -6,7 +6,10 @@
       :before-logout="beforeLogout"
       :after-logout="afterLogout"
       @custom-event="(par) => $emit('custom-event', par)"
-    />
+    >
+      <slot slot="header-ectad" name="header-ectad"></slot>
+      <slot slot="header-dropdown" name="header-dropdown"></slot>
+    </headerWrap>
     <asideNav :menus="menusC" :active-nav="activeNavC" :collapse.sync="collapse" @menu-click="menuClick" />
     <tabsNav
       class="tabs-nav-wrap"

package/src/components/Layout/indexN.vue

@@ -6,7 +6,10 @@
       :before-logout="beforeLogout"
       :after-logout="afterLogout"
       @custom-event="(par) => $emit('custom-event', par)"
-    />
+    >
+      <slot slot="header-ectad" name="header-ectad"></slot>
+      <slot slot="header-dropdown" name="header-dropdown"></slot>
+    </headerWrap>
     <asideNav :menus="menusC" :active-nav="activeNavC" :collapse.sync="collapse" @menu-click="menuClick" />
     <tabsNav
       class="tabs-nav-wrap"

package/src/components/LoginTemporary/indexN.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!OL" style="width: 100vw; height: 100vh; overflow: hidden">
+  <div style="width: 100vw; height: 100vh; overflow: hidden">
     <div v-if="alV" v-loading="alV" class="login-wrap">
       <loginForm
         ref="login-form"
@@ -7,6 +7,7 @@
         :login-types="loginTypes"
         :login-then="loginThen"
         :async-rela-nos="asyncRelaNos"
+        :extra-form="extraForm"
         style="display: none"
       />
     </div>
@@ -80,12 +81,12 @@
 
       <loginForm
         v-if="operateType === 'login'"
+        class="login-form"
         :before-login="beforeLogin"
         :login-types="loginTypes"
         :login-then="loginThenT"
         :async-rela-nos="asyncRelaNos"
         :extra-form="extraForm"
-        class="login-form"
         @changType="getChangetype"
       >
         <div slot="header" class="login-form-header m-b text-c">{{ '欢 迎 登 录' | $lc }}</div>
@@ -93,11 +94,7 @@
           <slot name="others"></slot>
         </el-dropdown-item>
         <div slot="footer" class="login-form-footer m-t text-r">
-          <slot name="footer">
-            <!-- <span>{{ '为达到更好的体验效果，请' | $lc }}</span>
-          <a class="login-form-download el-icon-bottom" href="/portal/server-assets/qicheng-browser.exe" download="browser.exe" >{{ '下载' | $lc }}</a >
-          <span>{{ '启程浏览器' | $lc }}</span> -->
-          </slot>
+          <slot name="footer"></slot>
         </div>
       </loginForm>
       <retrievePw v-if="operateType === 'retrievePw'" class="login-form" @changType="getChangetype" />
@@ -122,7 +119,6 @@
       @to-login="inspectionV = false"
     />
   </div>
-  <OLogin v-else />
 </template>
 
 <script>
@@ -137,7 +133,6 @@ import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
 import Inspection from './inspection/index.vue'
 import IconMap from './systemIconMap'
-import OLogin from './index.vue'
 
 import imgLoad from '../../utils/imgLoad'
 window.imgLoad = imgLoad
@@ -145,7 +140,6 @@ window.imgLoad = imgLoad
 export default {
   name: 'Login',
   components: {
-    OLogin,
     loginForm,
     retrievePw,
     Inspection
@@ -186,7 +180,6 @@ export default {
     let { protocol, host, pathname } = window.location
     return {
       wrapStyle: '',
-      OL: false, // 切换到旧的登录页
       logUrl: `${protocol}//${host}${pathname}`,
       jsonData: {
         loginTypes: ['account'],
@@ -383,40 +376,7 @@ export default {
       const { _layoutData = {}, loginSetting } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
       if (_loginSetting !== 'JSON') {
-        let por = this.$axios.post(
-          '/bems/portal/portalSysLoginCon/getCuurSysSetting',
-          { logUrl: this.logUrl },
-          { noMsg: true }
-        )
-        por.catch((err) => {
-          this.watchOLogin()
-        })
-        let res = await por
-        let list = res.data || []
-
-        for (let k in this.form) {
-          if (k !== 'SYSTEM_LIST') {
-            let obj = list.find((d) => d.pmName === k)
-            if (obj) {
-              try {
-                this.form[k] = k === 'LOGIN_URL' ? obj.pmValue : JSON.parse(obj.pmValue)
-              } catch (error) {
-                console.error(k + '解析错误')
-              }
-            }
-          } else {
-            this.form.SYSTEM_LIST.forEach((item, i) => {
-              let obj = list.find((d) => d.pmName === `SYSTEM_LIST_${item.NO}`)
-              if (obj) {
-                try {
-                  this.$set(this.form.SYSTEM_LIST, i, JSON.parse(obj.pmValue))
-                } catch (error) {
-                  console.error('SYSTEM_LIST[' + item.NO + ']解析错误')
-                }
-              }
-            })
-          }
-        }
+        await this.getSysSet()
       }
       this.jsonData = _layoutData
 
@@ -441,6 +401,42 @@ export default {
         }
       })
     },
+    getSysSet() {
+      return new Promise((resolve) => {
+        this.$axios
+          .post('/bems/portal/portalSysLoginCon/getCuurSysSetting', { logUrl: this.logUrl }, { noMsg: true })
+          .then((res) => {
+            let list = res.data || []
+
+            for (let k in this.form) {
+              if (k !== 'SYSTEM_LIST') {
+                let obj = list.find((d) => d.pmName === k)
+                if (obj) {
+                  try {
+                    this.form[k] = k === 'LOGIN_URL' ? obj.pmValue : JSON.parse(obj.pmValue)
+                  } catch (error) {
+                    console.error(k + '解析错误')
+                  }
+                }
+              } else {
+                this.form.SYSTEM_LIST.forEach((item, i) => {
+                  let obj = list.find((d) => d.pmName === `SYSTEM_LIST_${item.NO}`)
+                  if (obj) {
+                    try {
+                      this.$set(this.form.SYSTEM_LIST, i, JSON.parse(obj.pmValue))
+                    } catch (error) {
+                      console.error('SYSTEM_LIST[' + item.NO + ']解析错误')
+                    }
+                  }
+                })
+              }
+            }
+          })
+          .finally(() => {
+            resolve()
+          })
+      })
+    },
     async getImg(url) {
       try {
         let blob = await axios.get(url, null, { responseType: 'blob', loading: false, noMsg: true })
@@ -510,10 +506,6 @@ export default {
     },
     selSystem(item) {
       this.sltSys = item
-    },
-    // 切换到旧的登录页
-    watchOLogin() {
-      this.OL = true
     }
   }
 }