n20-common-lib 1.3.35 → 1.3.38

package/src/components/LoginTemporary/index.vue

@@ -52,6 +52,7 @@
 <script>
 import getJsonc from '../../assets/getJsonc'
 import realUrl from '../../assets/realUrl'
+import axios from '../../utils/axios'
 
 import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
@@ -84,46 +85,56 @@ export default {
       operateType: 'login'
     }
   },
-  async created() {
+  created() {
     this.removeStorage()
-    await this.init()
-    this.setConfig()
+    this.init()
   },
   methods: {
-    async init() {
-      const { data } = await this.$axios.get(`/bems/1.0/sysSetting/list`)
-      if (data) {
-        this.getdata(data)
-        this.getLogoImag()
-      }
+    init() {
+      axios
+        .get(`/bems/1.0/sysSetting/list`, null, {
+          loading: false,
+          noMsg: true
+        })
+        .then(({ data }) => {
+          this.getdata(data)
+        })
+        .finally(() => {
+          this.setConfig()
+        })
+
+      this.getLogoImag()
     },
     async getLogoImag() {
-      const login = await this.$axios.get(
-        `/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE`,
-        {},
-        { config: { responseType: 'arraybuffer' } }
-      )
-      this.BgImage = window.URL.createObjectURL(new Blob([login]))
-      const company = await this.$axios.get(
-        `/bems/1.0/attach/COMPANY_LOGOE`,
-        {},
-        {
-          config: { responseType: 'arraybuffer' }
-        }
-      )
-      this.LogoImage = window.URL.createObjectURL(new Blob([company]))
+      axios
+        .get(`/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE`, null, {
+          responseType: 'blob',
+          loading: false,
+          noMsg: true
+        })
+        .then((blob) => {
+          this.BgImage = window.URL.createObjectURL(blob)
+        })
+      axios
+        .get(`/bems/1.0/attach/COMPANY_LOGOE`, null, {
+          responseType: 'blob',
+          loading: false,
+          noMsg: true
+        })
+        .then((blob) => {
+          this.LogoImage = window.URL.createObjectURL(blob)
+        })
     },
     getdata(list) {
-      for (const i of list) {
-        if (i.pmName == 'LOGIN_MODE') {
-          this.LOGIN_MODE = i.pmValue.split(',')
-          console.log(this.LOGIN_MODE)
-        } else if (i.pmName == 'MAIN_PAGE_TEXT') {
-          this.MAIN_PAGE_TEXT = i.pmValue
-        } else if (i.pmName == 'SYSTEM_NAME') {
-          this.SYSTEM_NAME = i.pmValue
+      list.forEach((item) => {
+        if (item.pmName === 'LOGIN_MODE') {
+          this.LOGIN_MODE = item.pmValue.split(',')
+        } else if (item.pmName === 'MAIN_PAGE_TEXT') {
+          this.MAIN_PAGE_TEXT = item.pmValue
+        } else if (item.pmName === 'SYSTEM_NAME') {
+          this.SYSTEM_NAME = item.pmValue
         }
-      }
+      })
     },
     setConfig() {
       getJsonc('/server-config.jsonc').then(({ _layoutData = {} }) => {

package/src/components/MoreTab/index.vue

@@ -1,7 +1,4 @@
-/**
- * author: zhengwei
- * tiem: 2021-8-31
- */
+/** * author: zhengwei * tiem: 2021-8-31 */
 <template>
   <div class="__common-layout-pageTabs">
     <el-scrollbar>

package/src/components/PageHeader/index.vue

@@ -33,4 +33,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/SecondaryTab/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-tabs
     :value="init"

package/src/components/SelectLazy/index.vue

@@ -63,6 +63,7 @@ export default {
   methods: {
     change(val) {
       this.$emit('input', val)
+      this.$emit('change', val)
     },
     lazyGet() {
       this.$emit('scroll-bottom')
@@ -71,5 +72,4 @@ export default {
 }
 </script>
 
-<style>
-</style>
+<style></style>

package/src/components/Sifting/index.vue

@@ -95,5 +95,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

package/src/components/Step/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-steps
     :direction="direction"

package/src/components/TertiaryTab/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-tabs
     :value="init"

package/src/directives/VClickOutside/index.js

@@ -5,13 +5,13 @@ directive.install = (Vue) => {
     bind: function (el, binding, node) {
       el.clickOutsideEvent = function (event) {
         if (!(el === event.target || el.contains(event.target))) {
-          node.context[binding.expression](event)
+          binding.value(event)
         }
       }
-      document.body.addEventListener('click', el.clickOutsideEvent)
+      document.body.addEventListener('click', el.clickOutsideEvent, binding.arg === 'capture')
     },
-    unbind: function (el) {
-      document.body.removeEventListener('click', el.clickOutsideEvent)
+    unbind: function (el, binding) {
+      document.body.removeEventListener('click', el.clickOutsideEvent, binding.arg === 'capture')
     }
   })
 }

package/src/directives/VRuleKey/index.js

@@ -0,0 +1,194 @@
+const VD = '_v-rule-key_validate_'
+
+function getRules(rules, evType) {
+  if (rules) {
+    let _rules = []
+    if (Array.isArray(rules)) {
+      _rules = rules
+    } else if (typeof rules === 'object') {
+      _rules.push(rules)
+    }
+    if (evType === 'submit') {
+      return _rules
+    } else {
+      return _rules.filter((r) => r.trigger.includes(evType))
+    }
+  } else {
+    return []
+  }
+}
+
+function validateRoule(rule, value) {
+  return new Promise(function (resolve, reject) {
+    if (rule.required) {
+      if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) {
+        reject(rule.message)
+        return
+      }
+    }
+    if (rule.type === 'string') {
+      if (typeof value !== 'string') {
+        reject(rule.message)
+        return
+      }
+    }
+    if (rule.type === 'number') {
+      if (typeof value !== 'number') {
+        reject(rule.message)
+        return
+      }
+    }
+    if (rule.type === 'boolean') {
+      if (typeof value !== 'boolean') {
+        reject(rule.message)
+        return
+      }
+    }
+    if (rule.type === 'array') {
+      if (!(Array.isArray(value) && value.length > 0)) {
+        reject(rule.message)
+        return
+      }
+    }
+    if (rule.type === 'date') {
+      if (new Date(value).toString() === 'Invalid Date') {
+        reject(rule.message)
+        return
+      }
+    }
+    if (rule.min !== undefined || rule.max !== undefined) {
+      if (value === undefined || value === null) {
+        reject(rule.message)
+        return
+      } else {
+        let _v = value.toString()
+        if (_v.length < rule.min || _v.length > rule.max) {
+          reject(rule.message)
+          return
+        }
+      }
+    }
+    if (rule.regexp) {
+      if (new RegExp(rule.regexp).test(value)) {
+        reject(rule.message)
+        return
+      }
+    }
+    if (!rule.validator) {
+      resolve()
+      return
+    }
+    if (rule.validator) {
+      rule.validator(rule, value, (err) => {
+        if (err === undefined || err === false) {
+          resolve()
+          return
+        } else {
+          reject(err === true ? rule.message : err)
+        }
+      })
+    }
+  })
+}
+
+function showErr(el, err = '', rErr) {
+  el.classList.add('rule-key__is-error')
+
+  if (rErr) {
+    let msgEl = el.querySelector('.rule-key__error_msg')
+    if (!msgEl) {
+      let msgEl = document.createElement('div')
+      msgEl.classList.add('rule-key__error_msg')
+      msgEl.innerText = err.toString()
+      el.appendChild(msgEl)
+    } else if (msgEl) {
+      msgEl.innerText = err.toString()
+    }
+  }
+}
+function hideErr(el, rErr) {
+  el.classList.remove('rule-key__is-error')
+
+  if (rErr) {
+    let msgEl = el.querySelector('.rule-key__error_msg')
+    if (msgEl) {
+      el.removeChild(msgEl)
+    }
+  }
+}
+
+const directive = {}
+directive.install = (Vue) => {
+  Vue.directive('rule-key', {
+    bind(el, binding, node) {
+      let _this = node.child
+
+      let ruleForm = _this.$attrs['rule-form'] || _this.$attrs['ruleForm']
+      ruleForm && el.classList.add(ruleForm)
+
+      let rErr = _this.$attrs['rule-error-hide'] || _this.$attrs['ruleErrorHide']
+      rErr = rErr !== 'true' && rErr !== true
+
+      el[VD] = (val, type) => {
+        let _val = _this[binding.value || 'value']
+        let _rules = getRules(_this.$attrs['rules'], type)
+        if (_rules.length > 0) {
+          return Promise.all(_rules.map((rule) => validateRoule(rule, _val)))
+            .then(() => {
+              hideErr(el, rErr)
+            })
+            .catch((err) => {
+              showErr(el, err, rErr)
+            })
+        } else {
+          return Promise.resolve()
+        }
+      }
+
+      _this.$on('change', () => {
+        setTimeout(() => el[VD](undefined, 'change'))
+      })
+      // el.addEventListener('change', () => {
+      //   el[VD](undefined, 'change')
+      // })
+
+      _this.$on('blur', () => {
+        setTimeout(() => el[VD](undefined, 'blur'))
+      })
+      // el.addEventListener('blur', () => {
+      //   el[VD](undefined, 'blur')
+      // })
+    }
+  })
+}
+
+function rulesValidateForm(query, fn) {
+  let nodeList = document.querySelectorAll('.' + query)
+  if (nodeList.length) {
+    let validateList = []
+    nodeList.forEach((el) => {
+      typeof el[VD] === 'function' && validateList.push(el[VD](undefined, 'submit'))
+    })
+    return Promise.all(validateList)
+      .then(() => {
+        fn && fn(true)
+      })
+      .catch(() => {
+        fn && fn(false)
+      })
+  } else {
+    fn && fn(true)
+    return Promise.resolve()
+  }
+}
+function rulesValidateFormClear(query) {
+  let nodeList = document.querySelectorAll('.' + query)
+  nodeList.forEach((el) => {
+    hideErr(el, true)
+  })
+}
+
+window.rulesValidateForm = rulesValidateForm
+window.rulesValidateFormClear = rulesValidateFormClear
+
+export default directive

package/src/index.js

@@ -67,6 +67,7 @@ import DialogO from './components/Dialog/indexO.vue'
 import VTitle from './directives/VTitle/index.js'
 import VDrag from './directives/VDrag/index.js'
 import VMove from './directives/VMove/index.js'
+import VRuleKey from './directives/VRuleKey/index.js'
 import VClickOutside from './directives/VClickOutside/index.js'
 import VHas from './directives/VHas/index.js'
 
@@ -165,6 +166,7 @@ const install = function (Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
   Vue.use(VTitle)
   Vue.use(VDrag)
   Vue.use(VMove)
+  Vue.use(VRuleKey)
   Vue.use(VClickOutside)
   Vue.use(VHas)
 

package/src/utils/repairElementUI.js

@@ -1,6 +1,19 @@
 /* 对ElementUI硬优化 */
 import Popper from 'element-ui/lib/utils/popper.js'
 
+import Vue from 'vue'
+import FilterPanel from './tableheaderFilterpanel.vue'
+
+function hasClass(el, cls) {
+  if (!el || !cls) return false
+  if (cls.indexOf(' ') !== -1) throw new Error('className should not contain space.')
+  if (el.classList) {
+    return el.classList.contains(cls)
+  } else {
+    return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1
+  }
+}
+
 function setPropsDefault(component, props) {
   let c_props = component.props
   Object.keys(props).forEach((key) => {
@@ -69,7 +82,7 @@ export default function (ElementUI) {
       default: true
     }
   })
-
+  // 设置表头最小宽度,保证表头不换行
   setMethodsDefault(ElementUI.TableColumn, {
     setColumnWidth(column) {
       if (this.realWidth) {
@@ -92,4 +105,41 @@ export default function (ElementUI) {
       return column
     }
   })
+
+  // 美化表头搜索
+  if (ElementUI.Table.components.TableHeader) {
+    setMethodsDefault(ElementUI.Table.components.TableHeader, {
+      handleFilterClick(event, column) {
+        event.stopPropagation()
+        const target = event.target
+        let cell = target.tagName === 'TH' ? target : target.parentNode
+        if (hasClass(cell, 'noclick')) return
+        cell = cell.querySelector('.el-table__column-filter-trigger') || cell
+        const table = this.$parent
+
+        let filterPanel = this.filterPanels[column.id]
+
+        if (filterPanel && column.filterOpened) {
+          filterPanel.showPopper = false
+          return
+        }
+
+        if (!filterPanel) {
+          filterPanel = new Vue(FilterPanel)
+          this.filterPanels[column.id] = filterPanel
+          if (column.filterPlacement) {
+            filterPanel.placement = column.filterPlacement
+          }
+          filterPanel.table = table
+          filterPanel.cell = cell
+          filterPanel.column = column
+          !this.$isServer && filterPanel.$mount(document.createElement('div'))
+        }
+
+        setTimeout(() => {
+          filterPanel.showPopper = true
+        }, 16)
+      }
+    })
+  }
 }