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

package/src/components/Pagination/staticPagination.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="n20-pagination-1">
+    <el-pagination
+      layout="prev,next,slot"
+      :current-page.sync="pageObj[pageKey.no]"
+      :page-size="pageObj[pageKey.size]"
+      :total="pageObj[pageKey.total]"
+      :size="size"
+      @current-change="setnoOrsize"
+    />
+    <span class="m-r-ss"
+      ><span class="color-primary">{{ pageObj[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="pageObj[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(pageObj[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 { $lc } from '../../utils/i18n/index'
+export default {
+  name: 'StaticPagination',
+  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
+    }
+  },
+  data() {
+    return {
+      settingV: false,
+      noOrsize: ''
+    }
+  },
+  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.pageObj[this.pageKey.no]
+      },
+      set(val) {
+        if (val) {
+          this.pageObj[this.pageKey.no] = Math.ceil(val)
+        } else {
+          this.pageObj[this.pageKey.no] = 1
+        }
+      }
+    },
+    userSize: {
+      get() {
+        return this.pageObj[this.pageKey.size]
+      },
+      set(val) {
+        if (val) {
+          this.pageObj[this.pageKey.size] = Math.ceil(val)
+        } else {
+          this.pageObj[this.pageKey.size] = this.pageSizes[0]
+        }
+        this.pageObj[this.pageKey.no] = 1
+      }
+    }
+  },
+  watch: {
+    noOrsize() {
+      this.$emit('change', this.pageObj)
+    }
+  },
+  methods: {
+    setnoOrsize() {
+      let no = this.pageObj[this.pageKey.no]
+      let size = this.pageObj[this.pageKey.size]
+      this.noOrsize = no + ',' + size + Date.now()
+    }
+  }
+}
+</script>

package/src/components/SecondaryTab/index.vue

@@ -9,7 +9,7 @@
       {{ data[0].name }}
     </div>
   </div>
-  <el-tabs v-else :value="init" class="n20-secondary-tab m-b-s" :before-leave="beforeFn" @tab-click="clickFn">
+  <el-tabs v-else :value="init" :class="classes" :tabPosition="tabPosition" :before-leave="beforeFn" @tab-click="clickFn">
     <el-tab-pane
       v-for="item of data"
       :key="item.name"
@@ -44,6 +44,19 @@ export default {
     stop: {
       type: Boolean,
       default: false
+    },
+    tabPosition: {
+      type: String,
+      default: 'top'
+    }
+  },
+  computed: {
+    classes(){
+      return {
+        'n20-secondary-tab': true,
+        'm-b-s': this.tabPosition == 'top',
+        'left-css': this.tabPosition == 'left'
+      }
     }
   },
   methods: {
@@ -93,4 +106,17 @@ export default {
 .tooltip.show {
   opacity: 1;
 }
+.left-css .el-tabs__item.is-active:after{
+  width: 2px;
+  height: 20px!important;
+  margin-top: -22px!important;
+  margin-left: -10px;
+}
+.left-css .el-tabs__item.is-left {
+  text-align: left!important;
+}
+.left-css .el-tabs__header.is-left{
+  margin-right: 0!important;
+  margin-left: 10px!important;
+}
 </style>

package/src/components/TablePro/index.vue

@@ -222,7 +222,7 @@ export default {
       }
       $table.toggleCheckboxRow(row)
       this.key++
-      this.handleSelectionChange()
+      this.handleSelectionChange(row)
     },
     customSortMethod({ sortList }) {
       const orders = sortList.map((item) => {
@@ -264,9 +264,10 @@ export default {
         this.$emit('filter-change-method', obj)
       }
     },
-    handleSelectionChange() {
+    // row当前单次勾选的哪一行数据 包含checked字段
+    handleSelectionChange(row = '') {
       const val = this.$refs.vxeTable.getCheckboxRecords()
-      this.$emit('selection-change-method', val)
+      this.$emit('selection-change-method', val, row)
     },
     sizeUp(size) {
       this.sizeC = size

package/src/directives/VRuleKey/index.js

@@ -119,7 +119,6 @@ directive.install = (Vue) => {
       // 表单验证
       el[VALIDATE] = async (type) => {
         let _value = _this[binding.value || 'value']
-
         let _rules = getRules(_this.$attrs['rules'], type)
 
         if (_rules.length > 0) {
@@ -146,6 +145,12 @@ directive.install = (Vue) => {
       _this.$on('blur', () => {
         setTimeout(() => el[VALIDATE]('blur'))
       })
+
+
+      // 监听值变化
+      _this.$watch(binding.value, () => {
+        setTimeout(() => el[VALIDATE]('change'))
+      })
     }
   })
   // 添加规则验证表单方法
@@ -187,7 +192,5 @@ function rulesValidateFormClear(query) {
   })
 }
 
-window.rulesValidateForm = rulesValidateForm
-window.rulesValidateFormClear = rulesValidateFormClear
-
 export default directive
+

package/src/index.js

@@ -1,8 +1,4 @@
 import './assets/iconFont/iconfont.js' // iconfont导入
-import './assets/iconFont2/iconfont.js' // iconfont导入
-import './assets/iconFont3/iconfont.js' // iconfont导入
-import './assets/iconFont4/iconfont.js' // iconfont导入
-import './assets/iconFont5/iconfont.js' // iconfont导入
 import './utils/storagePro.js' // 扩展Storage
 /** 提供组件给外部使用的入口 */
 import AnchorItem from './components/Anchor/AnchorItem.vue'
@@ -71,6 +67,7 @@ import AdvancedFilter from './components/AdvancedFilter/index.vue'
 import ElectronicArchive from './components/ElectronicArchive/index.vue'
 import SelectTreePro from './components/SelectTree/pro.vue'
 import Tree from './components/Tree/index.vue'
+// import DateChoose from './components/DateChoose/index.vue'
 
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
@@ -207,6 +204,7 @@ const components = [
   WorkCard,
   UploadMsg,
   Tree,
+  // DateChoose,
   SelectTreePro,
   AdvancedFilter,
   ElectronicArchive,
@@ -336,6 +334,7 @@ export {
   TertiaryTab,
   TimePicker,
   Tree,
+  // DateChoose,
   Upload,
   UploadMsg,
   WorkCard,