n20-common-lib 2.7.0-beta.14 → 2.7.0-beta.16

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

@@ -125,7 +125,7 @@ export default {
         .post(
           '/bems/prod_1.0/uas/api/authorization/password/validate',
           {
-            username: this.form.username,
+            // username: this.form.username,
             password: value
           },
           { noMsg: true, loading: false }
@@ -181,7 +181,7 @@ export default {
             .post(
               '/bems/prod_1.0/uas/api/authorization/password/update',
               {
-                username: this.form.username,
+                password: this.form.orginPassword,
                 newPassword: this.form.newPassword
               },
               {

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

@@ -24,7 +24,7 @@
       <svg class="icon" aria-hidden="true">
         <use xlink:href="#n20-icon-caidan"></use>
       </svg>
-      <span class="m-l-ss f-s-b color-primary">{{ $lc('系统切换') }}</span>
+      <span class="m-l-ss f-s-b color-primary">{{ $lc('导航') }}</span>
       <svg class="icon m-l-ss f-s-s" aria-hidden="true">
         <use xlink:href="#n20-icon-lujing"></use>
       </svg>
@@ -375,12 +375,12 @@ export default {
   created() {
     getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting }) => {
       let _loginSetting = loginSetting || _layoutData.loginSetting
-      this.headerLogoUrl = realUrl(_layoutData.headerLogoUrl, true)
+      this.headerLogoUrl = realUrl(_layoutData.headerLogoUrl)
       this.headerLogoWidth = _layoutData.headerLogoWidth
       this.headerLogoHeight = _layoutData.headerLogoHeight
       this.headerTitle = _layoutData.headerTitle
       this.headerColor = _layoutData.headerColor
-      this.headerBgUrl = realUrl(_layoutData.headerBgUrl, true)
+      this.headerBgUrl = realUrl(_layoutData.headerBgUrl)
       this.headerBgColor = _layoutData.headerBgColor
       this.hideHelpDoc = _layoutData.hideHelpDoc
       this.hideLang = _layoutData.hideLang
@@ -393,7 +393,7 @@ export default {
       this.show = true
 
       this.getUserImg().catch(() => {
-        this.headerUserUrl = realUrl(_layoutData.headerUserUrl, true)
+        this.headerUserUrl = realUrl(_layoutData.headerUserUrl)
       })
 
       this.getByLabel().then(() => {
@@ -439,39 +439,43 @@ export default {
     },
     setMenuData(menuTree) {
       let system_list = JSON.parse(localStorage.getItem('SYSTEM_LIST'))
-      this.headerSystem = system_list.map((system) => {
-        const icon =
-          {
-            CSZHYW: '#n20-icon-zhcsyw',
-            CSYWGL: '#n20-icon-bianzu',
-            CSFZJC: '#n20-icon-a-bianzu70',
-            CSWY: '#n20-icon-a-bianzu69',
-            JTZL: '#n20-icon-a-bianzu3',
-            JRWG: '#n20-icon-a-bianzu1',
-            JTSKYWGK: '#n20-icon-a-bianzu701',
-            JTSKSJFX: '#n20-icon-a-bianzu2'
-          }[system.NO] || ''
+      this.headerSystem = system_list
+        .map((system) => {
+          const icon =
+            {
+              CSZHYW: '#n20-icon-zhcsyw',
+              CSYWGL: '#n20-icon-bianzu',
+              CSFZJC: '#n20-icon-a-bianzu70',
+              CSWY: '#n20-icon-a-bianzu69',
+              JTZL: '#n20-icon-a-bianzu3',
+              JRWG: '#n20-icon-a-bianzu1',
+              JTSKYWGK: '#n20-icon-a-bianzu701',
+              JTSKSJFX: '#n20-icon-a-bianzu2'
+            }[system.NO] || ''
 
-        system.icon = icon
-        system.menuTree = menuTree
-          ?.filter((menu) => menu.systemNo === system.NO && menu.isBackmenu === '0')
-          .map((menu) => ({
-            ...menu,
-            icon:
-              {
-                CSZHYW: '#n20-icon-zhcsyw',
-                CSYWGL: '#n20-icon-bianzu',
-                CSFZJC: '#n20-icon-a-bianzu70',
-                CSWY: '#n20-icon-a-bianzu69',
-                JTZL: '#n20-icon-a-bianzu3',
-                JRWG: '#n20-icon-a-bianzu1',
-                JTSKYWGK: '#n20-icon-a-bianzu701',
-                JTSKSJFX: '#n20-icon-a-bianzu2'
-              }[menu.NO] || ''
-          }))
-        return system
-      })
+          system.icon = icon
+          system.menuTree = menuTree
+            ?.filter((menu) => menu.systemNo === system.NO && menu.isBackmenu === '0' && menu.children?.length > 0)
+            .map((menu) => ({
+              ...menu,
+              icon:
+                {
+                  CSZHYW: '#n20-icon-zhcsyw',
+                  CSYWGL: '#n20-icon-bianzu',
+                  CSFZJC: '#n20-icon-a-bianzu70',
+                  CSWY: '#n20-icon-a-bianzu69',
+                  JTZL: '#n20-icon-a-bianzu3',
+                  JRWG: '#n20-icon-a-bianzu1',
+                  JTSKYWGK: '#n20-icon-a-bianzu701',
+                  JTSKSJFX: '#n20-icon-a-bianzu2'
+                }[menu.NO] || ''
+            }))
+
+          return system
+        })
+        .filter((item) => item.menuTree?.length > 0)
       this.showDrawerBox = !this.showDrawerBox
+      console.log(this.headerSystem)
       this.$emit('clickSystem', this.headerSystem, this.showDrawerBox)
     },
 

package/src/components/Layout/indexN.vue

@@ -220,7 +220,8 @@ export default {
             m.route = base + m.route.replace(/\/$/, '')
             m.route || (m.route = '/')
             m.uuid = m.route
-
+            // 新增一个字段用于接收初始化的url携带参数的处理之后的url
+            m.originPath = getBeforeQuestionMark(m.route)
             menuList.push(m)
           }
         })
@@ -239,6 +240,7 @@ export default {
       this.menusC = menus
       this.menuList = menuList
     },
+
     getTabList() {
       let tabList = JSON.parse(window.sessionStorage.getItem('tab-list')) || []
       this.tabList = tabList
@@ -287,7 +289,6 @@ export default {
     },
     tabClick(tab) {
       this.activeNav = tab.uuid
-
       this.routerPush({
         path: tab.route,
         query: tab.query
@@ -486,8 +487,18 @@ export default {
   }
 }
 
+// 处理携带参数的url，只取参数之前的路径
+function getBeforeQuestionMark(url) {
+  const questionMarkIndex = url.indexOf('?')
+  if (questionMarkIndex !== -1) {
+    return url.slice(0, questionMarkIndex)
+  }
+  return url
+}
+
 function getShowUuid(uuid, list) {
-  let menu = list.find((m) => m.uuid === uuid)
+  // 拿uuid去菜单中找对应的uuid或者originPath,originPath主要用与匹配初始化的菜单上携带参数的问题
+  let menu = list.find((m) => m.uuid === uuid || m.originPath === uuid)
   if (menu) {
     return menu.hide ? menu.pid : menu.uuid
   }

package/src/components/Pagination/index.vue

@@ -1,78 +1,13 @@
-<template>
-  <div class="n20-pagination-1">
-    <el-pagination
-      layout="prev,next,slot"
-      :current-page.sync="pageObjC[pageKey.no]"
-      :page-size="pageObjC[pageKey.size]"
-      :total="pageObjC[pageKey.total]"
-      :size="size"
-      @current-change="setnoOrsize"
-    />
-    <span class="m-r-ss"
-      ><span class="color-primary">{{ pageObjC[pageKey.no] }}</span
-      >/{{ max }}</span
-    >
-    <span>{{ '到第' | $lc }}</span>
-    <el-input-number
-      v-model="toNo"
-      class="n20-pagination-jumper-1 m-r-ss"
-      :min="1"
-      :max="max"
-      :step="1"
-      :step-strictly="true"
-      :controls="false"
-      :size="size"
-      @change="setnoOrsize"
-    />
-    <span class="m-r-s">{{ '页' | $lc }}</span>
-    <el-popover v-model="settingV" placement="top" trigger="click">
-      <el-link slot="reference" icon="n20-icon-shezhi" :underline="false" style="font-size: 16px" />
-      <div>
-        <span>{{ '每页显示' | $lc }}</span>
-        <el-radio-group
-          v-model="pageObjC[pageKey.size]"
-          class="n20-pagination-sizes-1 m-l-s"
-          size="mini"
-          @change="
-            () => {
-              setnoOrsize()
-              settingV = false
-            }
-          "
-        >
-          <el-radio-button v-for="item in pageSizes" :key="item" class="m-r-s" :label="item" />
-        </el-radio-group>
-        <el-input-number
-          v-model="userSize"
-          class="n20-pagination-usersizes-1"
-          :class="{
-            'is-active': !pageSizes.includes(pageObjC[pageKey.size])
-          }"
-          :min="1"
-          :max="sizeMax"
-          :step="1"
-          :step-strictly="true"
-          :controls="false"
-          size="mini"
-          :placeholder="'自定义' | $lc"
-          @change="
-            () => {
-              setnoOrsize()
-              settingV = false
-            }
-          "
-        />
-      </div>
-    </el-popover>
-  </div>
-</template>
-
 <script>
-import mixins from './mixins/index.js'
-import { $lc } from '../../utils/i18n/index.js'
+import RemotePagination from './remotePagination.vue'
+import StaticPagination from './staticPagination.vue'
+
 export default {
   name: 'Pagination',
-  mixins: [mixins],
+  components: {
+    RemotePagination,
+    StaticPagination
+  },
   props: {
     size: {
       type: String,
@@ -111,71 +46,24 @@ export default {
       default: 'page/pId'
     }
   },
-  data() {
-    return {
-      settingV: false,
-      noOrsize: '',
-      pageObjC: {}
-    }
-  },
-  computed: {
-    max() {
-      let total = this.pageObj[this.pageKey.total]
-      let size = this.pageObj[this.pageKey.size]
-      return Math.ceil(total / size) || 1
-    },
-    toNo: {
-      get() {
-        return this.pageObjC[this.pageKey.no]
-      },
-      set(val) {
-        if (val) {
-          this.pageObjC[this.pageKey.no] = Math.ceil(val)
-        } else {
-          this.pageObjC[this.pageKey.no] = 1
-        }
-      }
-    },
-    userSize: {
-      get() {
-        return this.pageObjC[this.pageKey.size]
-      },
-      set(val) {
-        if (val) {
-          this.pageObjC[this.pageKey.size] = Math.ceil(val)
-        } else {
-          this.pageObjC[this.pageKey.size] = this.pageSizes[0]
-        }
-        this.pageObjC[this.pageKey.no] = !this.remote ? 1 : this.pageObjC[this.pageKey.no]
-      }
-    }
-  },
-  watch: {
-    noOrsize() {
-      this.pageObj[this.pageKey.no] = this.pageObjC[this.pageKey.no]
-      this.pageObj[this.pageKey.size] = this.pageObjC[this.pageKey.size]
-      this.pageObjC[this.pageKey.total] = this.pageObj[this.pageKey.total]
-      this.$emit('change', this.pageObjC)
-    },
-    pageObj: {
-      immediate: true,
-      deep: true,
-      handler(newValue, oldValue) {
-        this.pageObjC = this.pageObj
-      }
-    }
-  },
-  methods: {
-    setnoOrsize() {
-      let no = this.pageObjC[this.pageKey.no]
-      let size = this.pageObjC[this.pageKey.size]
-
-      this.remote
-        ? this.setRemoteData(this.pageObjC).finally(() => {
-            this.noOrsize = no + ',' + size + Date.now()
-          })
-        : (this.noOrsize = no + ',' + size + Date.now())
-    }
+  render(h) {
+    const { remote } = this
+    // 判断是否为远程分页
+    return remote
+      ? h(RemotePagination, {
+          props: this.$props,
+          on: {
+            change: (page) => {
+              this.$emit('change', page)
+            }
+          }
+        })
+      : h(StaticPagination, {
+          props: this.$props,
+          on: {
+            change: (page) => this.$emit('change', page)
+          }
+        })
   }
 }
 </script>

package/src/components/Pagination/remotePagination.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="n20-pagination-1">
+    <el-pagination
+      layout="prev,next,slot"
+      :current-page.sync="pageRemote[pageKey.no]"
+      :page-size="pageRemote[pageKey.size]"
+      :total="pageRemote[pageKey.total]"
+      :size="size"
+      @current-change="setnoOrsize"
+    />
+    <span class="m-r-ss"
+      ><span class="color-primary">{{ pageRemote[pageKey.no] }}</span
+      >/{{ max }}</span
+    >
+    <span>{{ '到第' | $lc }}</span>
+    <el-input-number
+      v-model="toNo"
+      class="n20-pagination-jumper-1 m-r-ss"
+      :min="1"
+      :max="max"
+      :step="1"
+      :step-strictly="true"
+      :controls="false"
+      :size="size"
+      @change="setnoOrsize"
+    />
+    <span class="m-r-s">{{ '页' | $lc }}</span>
+    <el-popover v-model="settingV" placement="top" trigger="click">
+      <el-link slot="reference" icon="n20-icon-shezhi" :underline="false" style="font-size: 16px" />
+      <div>
+        <span>{{ '每页显示' | $lc }}</span>
+        <el-radio-group
+          v-model="pageRemote[pageKey.size]"
+          class="n20-pagination-sizes-1 m-l-s"
+          size="mini"
+          @change="handleChange"
+        >
+          <el-radio-button v-for="item in pageSizes" :key="item" class="m-r-s" :label="item" />
+        </el-radio-group>
+        <el-input-number
+          v-model="userSize"
+          class="n20-pagination-usersizes-1"
+          :class="{
+            'is-active': !pageSizes.includes(pageRemote[pageKey.size])
+          }"
+          :min="1"
+          :max="sizeMax"
+          :step="1"
+          :step-strictly="true"
+          :controls="false"
+          size="mini"
+          :placeholder="'自定义' | $lc"
+          @change="handleChange"
+        />
+      </div>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+import axios from '../../utils/axios.js'
+import { $lc } from '../../utils/i18n/index.js'
+
+export default {
+  name: 'RemotePagination',
+  props: {
+    size: {
+      type: String,
+      default: 'mini'
+    },
+    pageObj: {
+      type: Object,
+      default: () => ({
+        no: 1,
+        size: 20,
+        total: 0
+      })
+    },
+    pageKey: {
+      type: Object,
+      default: () => ({
+        no: 'no',
+        size: 'size',
+        total: 'total'
+      })
+    },
+    pageSizes: {
+      type: Array,
+      default: () => [20, 50, 100]
+    },
+    sizeMax: {
+      type: Number,
+      default: 1000
+    },
+    remote: {
+      type: Boolean,
+      default: false
+    },
+    pId: {
+      type: String,
+      default: 'pages/global'
+    }
+  },
+  data() {
+    return {
+      settingV: false,
+      userNo: sessionStorage.getItem('userNo'),
+      noOrsize: '',
+      pageRemote: {}
+    }
+  },
+  computed: {
+    max() {
+      let total = this.pageRemote[this.pageKey.total]
+      let size = this.pageRemote[this.pageKey.size]
+      return Math.ceil(total / size) || 1
+    },
+    toNo: {
+      get() {
+        return this.pageRemote[this.pageKey.no]
+      },
+      set(val) {
+        this.pageRemote[this.pageKey.no] = val ? Math.ceil(val) : 1
+      }
+    },
+    userSize: {
+      get() {
+        return this.pageRemote[this.pageKey.size]
+      },
+      set(val) {
+        this.pageRemote[this.pageKey.size] = val ? Math.ceil(val) : this.pageSizes[0]
+      }
+    }
+  },
+  watch: {
+    noOrsize() {
+      this.$set(this.pageObj, this.pageKey.no, this.pageRemote[this.pageKey.no])
+      this.$set(this.pageObj, this.pageKey.size, this.pageRemote[this.pageKey.size])
+      this.$set(this.pageObj, this.pageKey.total, this.pageRemote[this.pageKey.total])
+      this.$emit('change', this.pageObj)
+    },
+    pageObj: {
+      handler(page) {
+        this.$set(this.pageRemote, this.pageKey.no, page[this.pageKey.no])
+        this.$set(this.pageRemote, this.pageKey.total, page[this.pageKey.total])
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  mounted() {
+    this.getSessionData()
+  },
+  methods: {
+    async getSessionData() {
+      const { data } = await axios.post(
+        `/bems/prod_1.0/user/pageHabit/list?t=${Date.now()}`,
+        {
+          userNo: this.userNo,
+          pageId: this.pId
+        },
+        { loading: false, noMsg: true }
+      )
+      if (data) {
+        this.$set(
+            this.pageRemote,
+            this.pageKey.size,
+            JSON.parse(data)[this.pageKey.size] || this.pageObj[this.pageKey.size]
+        )
+        this.$set(this.pageObj, this.pageKey.size, JSON.parse(data)[this.pageKey.size] || this.pageObj[this.pageKey.size])
+      } else {
+        this.pageRemote = this.pageObj
+      }
+      this.$emit('change', this.pageObj)
+    },
+    async setRemoteData(data) {
+      return await axios.post(
+        '/bems/prod_1.0/user/pageHabit',
+        {
+          userNo: this.userNo,
+          pageId: this.pId,
+          showStructure: JSON.stringify(data)
+        },
+        { loading: false, onMsg: true }
+      )
+    },
+    setnoOrsize() {
+      let no = this.pageRemote[this.pageKey.no]
+      let size = this.pageRemote[this.pageKey.size]
+      this.noOrsize = no + ',' + size + Date.now()
+    },
+
+    handleChange() {
+      this.setRemoteData({ [this.pageKey.size]: this.pageRemote[this.pageKey.size] }).finally(() => {
+        this.setnoOrsize()
+      })
+      this.settingV = false
+    }
+  }
+}
+</script>