n20-common-lib 2.2.7 → 2.2.9

package/package.json

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

package/src/assets/css/umy-table/ux-grid.scss

@@ -1,4 +1,4 @@
-.elx-table {
+.plTableBox .elx-table {
   .elx-body--column,
   .elx-footer--column,
   .elx-header--column {
@@ -41,6 +41,12 @@
         top: 3px;
       }
     }
+    .elx-checkbox--indeterminate-icon:after {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 7px;
+    }
   }
 
   .elx-cell--sort {
@@ -89,7 +95,13 @@
     padding-left: 0;
   }
   .elx-table--filter-wrapper {
-    margin-top: 16px;
+    margin-top: 6px;
+    min-width: auto;
+    border: 1px solid #ebeef5;
+    border-radius: 2px;
+    background-color: #fff;
+    box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15);
+    box-sizing: border-box;
   }
   .filter--active {
     .elx-cell--title {

package/src/components/LoginTemporary/form.vue

@@ -146,6 +146,7 @@ import qrCode from './qrcode.vue'
 import { siteTree2menus, siteTree2RelaNos } from './utils'
 import CaMap from '../../plugins/Sign/CaMap.js'
 import importG from '../../utils/importGlobal.js'
+import { setItem } from '../../utils/storageEdit'
 
 function encode(pwd = '', key = 0) {
   if (pwd === '') return ''
@@ -596,15 +597,25 @@ export default {
       sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
 
       let relaNos = siteTree2RelaNos(data)
-      sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
+      // sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
+      setItem('relaNos', relaNos)
+
+      let relaNosG = []
+      for (let i = 0; i < relaNos.length; i++) {
+        let item = relaNos[i]
+        relaNosG.push(...item.relaNos)
+      }
+      setItem('relaNosGlobal', relaNosG)
 
       // XXX: 兼容旧版resources
-      sessionStorage.setItem('resources', JSON.stringify(data))
+      // sessionStorage.setItem('resources', JSON.stringify(data))
+      setItem('resources', data)
     },
     // 新增不同单位对应不同角色,具有不同权限
     getCltRelaNos() {
       if (this.asyncRelaNos) {
-        sessionStorage.setItem('cltrelaNos', '{}')
+        // sessionStorage.setItem('cltrelaNos', '{}')
+        setItem('cltrelaNos', {})
         return Promise.resolve()
       }
 
@@ -621,7 +632,8 @@ export default {
             cltrelaMap.forEach((item) => {
               cltrelaNos[item.cltNo] = item.relaNos
             })
-            sessionStorage.setItem('cltrelaNos', JSON.stringify(cltrelaNos))
+            // sessionStorage.setItem('cltrelaNos', JSON.stringify(cltrelaNos))
+            setItem('cltrelaNos', cltrelaNos)
           })
           .finally(resolve)
       })

package/src/components/Table/filters.js

@@ -75,7 +75,7 @@ export function colf_BD_F(colf, map) {
   return ({ row }) => tplFn(row, sc, mck, map)
 }
 
-export function colft_BD_F(colft, fMap) {
+export function colft_BD_F(colft, fMap, key) {
   let list = undefined
   if (typeof colft !== 'string') {
     list = colft
@@ -83,6 +83,10 @@ export function colft_BD_F(colft, fMap) {
     list = fMap[colft]
   }
   if (Array.isArray(list)) {
-    return list.map((item) => ({ ...item, label: item.text }))
+    return list.map((item) => ({
+      label: item.text,
+      data: { count: item.count },
+      ...item
+    }))
   }
 }

package/src/components/Table/index.vue

@@ -26,24 +26,28 @@
   </el-table>
   <ux-table
     v-else
+    ref="ux-table"
     :key="colsKey"
     :header-cell-style="{ 'text-align': 'center' }"
     :data="data"
     :height="height"
     v-bind="$attrs"
-    v-on="$listeners"
+    v-on="{ ...$listeners, 'filter-change': bigFilter, 'expand-change': bigExpand }"
   >
     <template v-for="(item, i) in columns">
-      <slot v-if="item.slotName" :name="item.slotName" :column="item"></slot>
+      <slot v-if="item.slotName" :name="item.slotName" :column="item" :big-data="bigData"></slot>
       <ux-table-column
         v-else-if="item.render"
         :key="'cl-table-' + i"
+        :filters="item.filters | colft_BD_F(filtersMap)"
+        :class-name="item | colKey"
         :field="item.prop"
         :title="item.label"
         :type="item.type | typeF"
+        :show-overflow="item | overflowF"
         v-bind="item"
       >
-        <columnRender slot-scope="{ row, $index }" :c-render="item.render" :row="row" :index="$index" />
+        <columnRender slot-scope="{ row, $rowIndex }" :c-render="item.render" :row="row" :index="$rowIndex" />
       </ux-table-column>
 
       <ux-table-column
@@ -51,9 +55,11 @@
         :key="'cl-table-' + i"
         :formatter="item.formatter | colf_BD_F(item.formatterMap)"
         :filters="item.filters | colft_BD_F(filtersMap)"
+        :class-name="item | colKey"
         :field="item.prop"
         :title="item.label"
         :type="item.type | typeF"
+        :show-overflow="item | overflowF"
         v-bind="item"
       />
     </template>
@@ -92,8 +98,15 @@ export default {
     typeF(type) {
       return type && type === 'selection' ? 'checkbox' : type
     },
+    overflowF(item) {
+      return item.showOverflowTooltip || item['show-overflow-tooltip'] ? 'tooltip' : 'ellipsis'
+    },
     colf_BD_F,
-    colft_BD_F
+    colft_BD_F,
+    colKey(item) {
+      let key = item.columnKey || item['column-key']
+      return key ? 'key@' + key : ''
+    }
   },
   props: {
     bigData: {
@@ -135,24 +148,71 @@ export default {
       colsKey: 0
     }
   },
+  provide() {
+    let bigData = this.bigData
+    return {
+      bigData
+    }
+  },
   watch: {
     columns() {
       this.colsKey = this.colsKey + 1
     }
   },
   mounted() {
-    let inTable = this.$refs['el-table']
-    if (inTable) {
-      this.$refs['table'] = inTable
-      this.clearSelection = inTable.clearSelection
-      this.toggleRowSelection = inTable.toggleRowSelection
-      this.toggleAllSelection = inTable.toggleAllSelection
-      this.toggleRowExpansion = inTable.toggleRowExpansion
-      this.setCurrentRow = inTable.setCurrentRow
-      this.clearSort = inTable.clearSort
-      this.clearFilter = inTable.clearFilter
-      this.doLayout = inTable.doLayout
-      this.sort = inTable.sort
+    if (!this.bigData) {
+      let inTable = this.$refs['el-table']
+      if (inTable) {
+        this.$refs['table'] = inTable
+        this.clearSelection = inTable.clearSelection
+        this.toggleRowSelection = inTable.toggleRowSelection
+        this.toggleAllSelection = inTable.toggleAllSelection
+        this.toggleRowExpansion = inTable.toggleRowExpansion
+        this.setCurrentRow = inTable.setCurrentRow
+        this.clearSort = inTable.clearSort
+        this.clearFilter = inTable.clearFilter
+        this.doLayout = inTable.doLayout
+        this.sort = inTable.sort
+      }
+    } else {
+      let inTable = this.$refs['ux-table']
+      if (inTable) {
+        this.$refs['table'] = inTable
+        this.clearSelection = inTable.clearSelection
+        this.toggleRowSelection = function (row, selected) {
+          inTable.toggleRowSelection([{ row, selected }])
+        }
+        this.toggleAllSelection = inTable.toggleAllSelection
+        this.toggleRowExpansion = inTable.toggleRowExpansion
+        this.setCurrentRow = inTable.setCurrentRow
+        this.clearSort = inTable.clearSort
+        this.clearFilter = inTable.clearFilter
+        //
+        this.doLayout = inTable.loadData
+        this.sort = inTable.sort
+      }
+    }
+  },
+  methods: {
+    bigFilter(arg) {
+      let filters = arg.filters || []
+      let elFilters = {}
+      filters.forEach((item) => {
+        let key = item.column.className
+        if (key && typeof key === 'string') {
+          let _key = key.split(',').find((s) => s.includes('key@'))
+
+          if (_key) _key = _key.replace('key@', '')
+
+          if (_key) key = _key
+        }
+
+        elFilters[key || item.property] = item.column.filterMultiple ? item.values : item.values[0]
+      })
+      this.$emit('filter-change', elFilters, arg)
+    },
+    bigExpand(arg) {
+      this.$emit('expand-change', arg.row, arg.expanded, arg)
     }
   }
 }

package/src/components/TableOperateColumn/index.vue

@@ -1,17 +1,21 @@
 <template>
-  <el-table-column v-bind="$attrs">
+  <el-table-column v-if="!bigData" v-bind="$attrs">
     <OperateBtns slot-scope="{ row, $index }" :btn-list="btnList" :row="row" @command="(c) => $emit(c, row, $index)" />
   </el-table-column>
+  <ux-table-column v-else :field="$attrs.prop" :title="$attrs.label" v-bind="$attrs">
+    <OperateBtns slot-scope="{ row, $index }" :btn-list="btnList" :row="row" @command="(c) => $emit(c, row, $index)" />
+  </ux-table-column>
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
+// import { $lc } from '../../utils/i18n/index'
 import OperateBtns from './OperateBtns.vue'
 export default {
   name: 'TableOperateColumn',
   components: {
     OperateBtns
   },
+  inject: ['bigData'],
   props: {
     btnList: {
       type: Array,

package/src/components/UTable/ElxTableFilter.vue

@@ -17,24 +17,42 @@
         suffix-icon="el-icon-search"
       />
       <div v-if="filterStore.multiple">
-        <el-checkbox v-model="allCheck" :label="true" :indeterminate="indeterminate">全部</el-checkbox>
+        <div>
+          <el-checkbox
+            v-model="filterStore.isAllSelected"
+            :label="true"
+            :indeterminate="indeterminate"
+            @change="allCheckFn"
+            >{{ '全部' | $lc }}{{ filters | alltextF }}</el-checkbox
+          >
+        </div>
         <div class="input-w p-b-s" style="max-height: 226px; overflow: auto">
           <template v-for="filter in filters">
             <el-checkbox
               v-if="filter.label.includes(searchVal)"
               :key="filter.value"
-              v-model="filter.checked"
+              v-model="filter._checked"
               class="m-t-s m-r-0"
               style="display: block"
+              @change="(val) => itemCheckFn(val, filter)"
             >
               <span class="align-bottom">{{ filter.label }}</span>
+              <span>{{ filter | countF }}</span>
             </el-checkbox>
           </template>
         </div>
+        <div class="flex-box flex-c m-t-s">
+          <el-button type="primary" size="mini" @click="handleConfirm">
+            {{ '确认' | $lc }}
+          </el-button>
+          <el-button plain size="mini" @click="handleReset">{{ '清空' | $lc }}</el-button>
+        </div>
       </div>
       <div v-else>
         <ul class="el-table-filter__list">
-          <li class="el-table-filter__list-item text-l" :class="{ 'is-active': !allCheck }">全部</li>
+          <li class="el-table-filter__list-item text-l" @click="allCheckFn">
+            {{ '全部' | $lc }}{{ filters | alltextF }}
+          </li>
         </ul>
         <ul class="el-table-filter__list" style="max-height: 226px; overflow: auto">
           <template v-for="filter in filters">
@@ -42,12 +60,11 @@
               v-if="filter.label.includes(searchVal)"
               :key="filter.value"
               class="el-table-filter__list-item text-l"
-              :class="{ 'is-active': filter.checked }"
-              @click="filter.checked = !filter.checked"
+              :class="{ 'is-active': filter._checked }"
+              @click="itemCheckFn(!filter._checked, filter)"
             >
-              <span class="text-ellipsis align-bottom" style="display: inline-block; max-width: 12em">{{
-                filter.label
-              }}</span>
+              <span class="text-ellipsis align-bottom">{{ filter.label }}</span>
+              <span>{{ filter | countF }}</span>
             </li>
           </template>
         </ul>
@@ -57,16 +74,40 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
+// import { $lc } from '../../utils/i18n/index'
+function getCount(item) {
+  return item.count || (item.data ? item.data.count : undefined)
+}
+
 export default {
   name: 'ElxTableFilter',
+  filters: {
+    countF(item) {
+      let N = getCount(item)
+      if (N !== undefined) {
+        return ' (' + N + ')'
+      } else {
+        return ''
+      }
+    },
+    alltextF(list = []) {
+      if (list.some((c) => getCount(c) !== undefined)) {
+        let total = 0
+        list.forEach((c) => {
+          total = total + (Number(c) || 0)
+        })
+        return ' (' + total + ')'
+      } else {
+        return ''
+      }
+    }
+  },
   props: {
     filterStore: { type: Object, default: () => ({}) }
   },
   data() {
     return {
-      searchVal: '',
-      filteredValue: []
+      searchVal: ''
     }
   },
   computed: {
@@ -75,31 +116,68 @@ export default {
     },
     filters() {
       return this.filterStore.options
-      // _checked
     },
     multiple() {
       return this.filterStore.multiple
     },
     indeterminate() {
       return this.filterStore.isIndeterminate
-    },
-    allCheck: {
-      get() {
-        return this.filterStore.isAllSelected
-      },
-      set(val) {
-        this.filterStore.isAllSelected = val
-      }
     }
   },
   watch: {
     'filterStore.visible': {
-      handler() {
-        console.log(this.filterStore, 1212)
+      handler(val) {
+        if (val) this.searchVal = ''
       }
     }
   },
   mounted() {},
-  methods: {}
+  methods: {
+    allCheckFn(t) {
+      if (this.filterStore.multiple) {
+        this.filterStore.options.forEach((e) => {
+          this.$set(e, '_checked', t)
+          this.$set(e, 'checked', t)
+        })
+        this.$set(this.filterStore, 'isAllSelected', t)
+        this.$set(this.filterStore, 'isIndeterminate', false)
+      } else {
+        this.$parent.resetFilterEvent()
+      }
+    },
+    itemCheckFn(t, i) {
+      if (this.filterStore.multiple) {
+        this.$set(i, '_checked', t)
+
+        this.$parent.checkFilterOptions()
+      } else {
+        this.filterStore.options.forEach((e) => {
+          this.$set(e, '_checked', false)
+          this.$set(e, '_checked', false)
+        })
+
+        this.$set(i, '_checked', t)
+        this.$set(i, 'checked', t)
+
+        this.$parent.checkFilterOptions()
+        this.$parent.confirmFilterEvent()
+      }
+    },
+    handleConfirm() {
+      let someC = false
+      this.filterStore.options.forEach((e) => {
+        e.checked = e._checked
+        e._checked && (someC = true)
+      })
+      if (someC) {
+        this.$parent.confirmFilterEvent()
+      } else {
+        this.$parent.resetFilterEvent()
+      }
+    },
+    handleReset() {
+      this.$parent.resetFilterEvent()
+    }
+  }
 }
 </script>

package/src/components/UTable/index.js

@@ -1,5 +1,5 @@
+import 'umy-table/lib/theme-chalk/elx-table.css'
 import { UTable, UTableColumn, UxGrid, UxTableColumn } from 'umy-table'
-
 import ElxTableFilter from './ElxTableFilter.vue'
 
 function install(Vue) {
@@ -9,6 +9,7 @@ function install(Vue) {
 
   Vue.component('UxTable', UxGrid)
 
+  setPropsDefault(UxTableColumn, { headerAlign: { default: 'center' } })
   const _created = UxTableColumn.created
   UxTableColumn.created = function () {
     _created.call(this, ...arguments)

package/src/directives/VHas/index.js

@@ -1,4 +1,5 @@
 import { getRela, getCltRela } from '../../utils/relaNo.js'
+import { getItem } from '../../utils/storageEdit'
 
 export function has(vals, clt) {
   let relaNos = []
@@ -19,7 +20,7 @@ export function hasG(vals, clt) {
   if (clt) {
     relaNos = getCltRela(clt)
   } else {
-    relaNos = getRela().relaNosGlobal
+    relaNos = getItem('relaNosGlobal')
   }
   if (typeof vals === 'string') {
     return relaNos.includes(vals)

package/src/utils/asyncGetRelaNos.js

@@ -1,5 +1,5 @@
 import axios from './axios'
-
+import { getItem, setItem } from './storageEdit'
 // 按需/按模块 加载权限
 async function asyncGetRelaNos(appNo, rns) {
   let uno = sessionStorage.getItem('userNo')
@@ -20,27 +20,34 @@ async function asyncGetRelaNos(appNo, rns) {
     { loading: false, noMsg: true }
   )
 
-  let ssRelaNos = JSON.parse(sessionStorage.getItem('relaNos'))
-  let ssCltrelaNos = JSON.parse(sessionStorage.getItem('cltrelaNos'))
+  let ssRelaNos = getItem('relaNos') // JSON.parse(sessionStorage.getItem('relaNos'))
+  let ssCltrelaNos = getItem('cltrelaNos') // JSON.parse(sessionStorage.getItem('cltrelaNos'))
 
-  let relaNos = []
+  let rnObj = ssRelaNos.find((el) => el.appNo === appNo)
+  if (!rnObj) {
+    rnObj = { appNo: appNo || 'null', relaNos: [] }
+    ssRelaNos.push(rnObj)
+  }
+  let oRelaNos = []
   data.forEach((el) => {
-    ssCltrelaNos[el.cltNo] || (ssCltrelaNos[el.cltNo] = [])
-
-    relaNos.push(...el.relaNos)
-    ssCltrelaNos[el.cltNo].push(...el.relaNos)
+    if (ssCltrelaNos[el.cltNo]) {
+      ssCltrelaNos[el.cltNo].push(...el.relaNos)
+    } else {
+      ssCltrelaNos[el.cltNo] = el.relaNos
+    }
+    oRelaNos.push(...el.relaNos)
   })
-  relaNos = Array.from(new Set(relaNos))
+  oRelaNos = [...new Set(oRelaNos)]
+  rnObj.relaNos = oRelaNos
 
-  let rnObj = ssRelaNos.find((el) => el.appNo === appNo)
-  if (rnObj) {
-    rnObj.relaNos = relaNos
-  } else {
-    ssRelaNos.push({ appNo: appNo || 'null', relaNos: relaNos })
-  }
+  // sessionStorage.setItem('relaNos', JSON.stringify(ssRelaNos))
+  setItem('relaNos', ssRelaNos)
+  // sessionStorage.setItem('cltrelaNos', JSON.stringify(ssCltrelaNos))
+  setItem('cltrelaNos', ssCltrelaNos)
 
-  sessionStorage.setItem('relaNos', JSON.stringify(ssRelaNos))
-  sessionStorage.setItem('cltrelaNos', JSON.stringify(ssCltrelaNos))
+  let ssRelaNosG = getItem('relaNosGlobal')
+  ssRelaNosG.push(...oRelaNos)
+  setItem('relaNosGlobal', ssRelaNosG)
 }
 
 export default asyncGetRelaNos

package/src/utils/axios.js

@@ -51,7 +51,7 @@ let loadingCount = 0
 function showLoading(opt) {
   let loading = opt.loading
   if (loading === true) {
-    if (loadingCount === 0 && !document.querySelector('.xhr-loading-top')) {
+    if (loadingCount === 0 && !document.querySelector('.xhr-loading-top:not(.el-loading-fade-leave-active)')) {
       loadingBox = _Loading.service({
         lock: true,
         text: $lc('加载中'),

package/src/utils/relaNo.js

@@ -1,33 +1,31 @@
 import forEachs from './forEachs'
+import { getItem } from './storageEdit'
 
 const name = process.env.VUE_APP_RelaAppNo || process.env.VUE_APP_NAME
 
-let relaObj = {
-  appNo: name,
-  relaNos: []
-}
+let relaObj = undefined
+let cltrelaNos = undefined
 
 export function getRela() {
+  if (!relaObj) setRela()
+
   return relaObj
 }
 
 export function setRela() {
-  let relaNosStr = sessionStorage.getItem('relaNos')
-  if (relaNosStr) {
-    let relaNos = JSON.parse(relaNosStr)
-    Object.assign(
-      relaObj,
-      relaNos.find((r) => r.appNo === name)
-    )
-    console.log(relaObj, 'has权限列表')
+  let _relaNos = getItem('relaNos') // sessionStorage.getItem('relaNos')
+  if (_relaNos) {
+    let relaNos = _relaNos
+    relaObj = relaNos.find((r) => r.appNo === name)
+    let relaNosG = getItem('relaNosGlobal')
 
-    relaObj.relaNosGlobal = relaNos.map((item) => item.relaNos).flat()
+    console.log({ relaObj, relaNosGlobal: relaNosG }, 'has权限列表')
     return
   }
   /* 兼容旧门户 */
-  let resourcesStr = sessionStorage.getItem('resources')
-  if (resourcesStr) {
-    let resources = JSON.parse(resourcesStr)
+  let _resources = getItem('resources') // sessionStorage.getItem('resources')
+  if (_resources) {
+    let resources = _resources
     let relaNos = []
     forEachs(resources, (item) => {
       relaNos.push(item.relaNo)
@@ -37,13 +35,12 @@ export function setRela() {
   }
 }
 
-let cltrelaNos = undefined
 export function getCltRela(clt) {
   /* 获取全部单位权限 */
   if (!cltrelaNos) {
-    let cltrelaNosStr = sessionStorage.getItem('cltrelaNos')
-    if (cltrelaNosStr) {
-      cltrelaNos = JSON.parse(cltrelaNosStr)
+    let _cltrelaNos = getItem('cltrelaNos') // sessionStorage.getItem('cltrelaNos')
+    if (_cltrelaNos) {
+      cltrelaNos = _cltrelaNos
     } else {
       cltrelaNos = {}
     }
@@ -52,14 +49,34 @@ export function getCltRela(clt) {
   if (Array.isArray(clt)) {
     let clts = clt
     let cltI = clts[0]
-    let cltRela = cltrelaNos[cltI]
+    let cltRela = []
+    for (let id in cltrelaNos) {
+      let ids = id.split(',')
+      if (ids.includes(cltI)) {
+        cltRela.push(...cltrelaNos[id])
+      }
+    }
 
     for (let i = 1; i < clt.length; i++) {
-      cltRela = aandb(cltRela, cltrelaNos[clts[i]])
+      let cltRela2 = []
+      for (let id in cltrelaNos) {
+        let ids = id.split(',')
+        if (ids.includes(clts[i])) {
+          cltRela2.push(...cltrelaNos[id])
+        }
+      }
+      cltRela = aandb(cltRela, cltRela2)
     }
     return cltRela || []
   } else {
-    return cltrelaNos[clt] || []
+    let cltRela = []
+    for (let id in cltrelaNos) {
+      let ids = id.split(',')
+      if (ids.includes(clt)) {
+        cltRela.push(...cltrelaNos[id])
+      }
+    }
+    return cltRela
   }
 }