n20-common-lib 2.7.0-beta.2 → 2.7.0-beta.21

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

@@ -7,7 +7,12 @@
       :data="data"
       :height="height"
       :class="{ 'cell-default-set--': cellDefault }"
-      :checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
+      :checkbox-config="{
+        checkField: 'checked',
+        checkMethod: forbidSelect,
+        ...$attrs.checkboxConfig,
+        ...$attrs['checkbox-config']
+      }"
       show-header-overflow
       show-overflow
       :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig, ...$attrs['row-config'] }"
@@ -175,10 +180,10 @@ export default {
     },
     data() {
       // 翻页清除选中
-      if (this.clearSelect) {
-        this.$refs.vxeTable.clearCheckboxRow()
-        this.$emit('selection-change-method', [])
-      }
+      // if (this.clearSelect) {
+      //   this.$refs.vxeTable.clearCheckboxRow()
+      //   this.$emit('selection-change-method', [])
+      // }
     }
   },
   activated() {
@@ -222,7 +227,7 @@ export default {
       }
       $table.toggleCheckboxRow(row)
       this.key++
-      this.handleSelectionChange()
+      this.handleSelectionChange(row)
     },
     customSortMethod({ sortList }) {
       const orders = sortList.map((item) => {
@@ -264,9 +269,11 @@ 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)
+      const val1 = this.$refs.vxeTable.getCheckboxReserveRecords() || []
+      this.$emit('selection-change-method', [...val, ...val1], 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,11 @@ directive.install = (Vue) => {
       _this.$on('blur', () => {
         setTimeout(() => el[VALIDATE]('blur'))
       })
+
+      // 监听值变化
+      _this.$watch(binding.value, () => {
+        setTimeout(() => el[VALIDATE]('change'))
+      })
     }
   })
   // 添加规则验证表单方法
@@ -187,7 +191,4 @@ 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'
@@ -68,6 +64,7 @@ import Upload from './components/Upload/index.vue'
 import WornPagination from './components/WornPagination/index.vue'
 
 import AdvancedFilter from './components/AdvancedFilter/index.vue'
+import DateChoose from './components/DateChoose/index.vue'
 import ElectronicArchive from './components/ElectronicArchive/index.vue'
 import SelectTreePro from './components/SelectTree/pro.vue'
 import Tree from './components/Tree/index.vue'
@@ -207,6 +204,7 @@ const components = [
   WorkCard,
   UploadMsg,
   Tree,
+  DateChoose,
   SelectTreePro,
   AdvancedFilter,
   ElectronicArchive,
@@ -282,6 +280,7 @@ export {
   // 组件
   ContentLoading,
   ContentNull,
+  DateChoose,
   DatePicker,
   DatePickerPor,
   Descriptions,