xianniu-ui 0.8.5 → 0.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/table/main.vue

@@ -79,6 +79,7 @@
         type="selection"
         width="50px"
         align="center"
+        :selectable="handleSelectable"
       ></el-table-column>
       <el-table-column v-bind="$attrs" v-if="radio" width="40px" align="center">
         <template slot-scope="{ row }">
@@ -94,15 +95,15 @@
         type="index"
       ></el-table-column>
       <slot>
-          <column
-            v-for="(item, idx) in columns"
-            :key="idx"
-            v-show="item.checked === true"
-            v-bind="item"
-          ></column>
+        <column
+          v-for="(item, idx) in columns"
+          :key="idx"
+          v-show="item.checked === true"
+          v-bind="item"
+        ></column>
       </slot>
       <template #append v-if="$slots.append">
-          <slot name="append"></slot>
+        <slot name="append"></slot>
       </template>
     </el-table>
 
@@ -162,6 +163,26 @@ export default {
       type: String,
       default: "id",
     },
+    disabledList: {
+      type: Array,
+      require: false,
+      default: () => {
+        return [];
+      },
+    },
+    disabledKey: {
+      type: String,
+      require: false,
+      default: "",
+    },
+    /* 筛选条件,正则 */
+    filterQuery: {
+      type: Object,
+      require: false,
+      default: () => {
+        return {};
+      },
+    },
   },
   data() {
     return {
@@ -169,17 +190,13 @@ export default {
       selectedData: [],
     };
   },
-  computed: {
-    
-  },
-  created() {
-
-  },
+  computed: {},
+  created() {},
   updated() {
     !this.$slots.default &&
       this.columns.length &&
       this.columns.forEach((item) => {
-        if(item.checked !== true) this.$set(item, "checked", true);
+        if (item.checked !== true) this.$set(item, "checked", true);
       });
   },
   methods: {
@@ -194,6 +211,7 @@ export default {
         (item, idx) => item[idKey] === val[idKey] && idx === val.rowIndex
       );
       this.$emit("on-single", res, column);
+      this.$emit("on-radio", res, column);
     },
     handleToolsItem(row, index) {
       this.$emit("on-tools", { row, index });
@@ -202,6 +220,7 @@ export default {
     selectionChange(val) {
       this.selectedData = val;
       this.$emit("selection-change", val);
+      this.$emit("on-selection", val);
       // this.$refs.table.get
     },
     toggleRowSelection(row, status) {
@@ -220,10 +239,46 @@ export default {
     tableRowClassName({ row, rowIndex }) {
       row.rowIndex = rowIndex;
     },
-    headerRowClassName(row, rowIndex){
-      console.log('row, rowIndex: ', row, rowIndex);
-      return 'cus-table-header'
-    }
+    headerRowClassName() {
+      return "cus-table-header";
+    },
+    handleSelectable(row, idx) {
+      if (
+        this.selection &&
+        this.$attrs.selectable &&
+        typeof this.$attrs.selectable === "function"
+      ) {
+        return this.$attrs.selectable(row, idx);
+      } 
+      const list = this.disabledList;
+        const filter = this.filterQuery;
+        if (
+          list &&
+          list.length &&
+          this.disabledKey &&
+          list.includes(row[this.disabledKey])
+        ) {
+          return 0;
+        } else if (Object.keys(filter).length) {
+          let step = 0;
+          Object.keys(filter).forEach((key) => {
+            if (filter[key].test(row[key])) {
+              step = step + 1;
+            }
+          });
+
+          if (step >= Object.keys(filter).length) {
+            /* if (isChange) {
+              this.key = Date.parse(new Date());
+            } */
+            return 1;
+          } else {
+            return 0;
+          }
+        } else {
+          return 1;
+        }
+    },
   },
 };
 </script>

package/src/oss/index.js

@@ -110,7 +110,6 @@ class Client {
                 this.setFileId(obj).then((res) => {
                     resolve({ ...obj, fileId: res.fileId })
                 }).catch((err) => {
-                    console.log('err: ', err);
                     file.onError();
                     reject(err)
                 })

package/src/utils/dayjs.js

@@ -1,2 +1,3 @@
 import dayjs from 'dayjs'
+require('dayjs/locale/zh-cn')
 export default dayjs

package/src/utils/reg.js

@@ -9,7 +9,10 @@ const Reg = {
     positiveInteger: /^[1-9]\d*$/, // 正整数
     twoDecimal: /(^[0-9]{1,20}$)|(^[0-9]{1,20}[.][0-9]{1,2}$)/, // 2位小数
     text: /^[a-z\d\u4E00-\u9FA5]+$/i, // 不含特殊字符和标点
-    getCity: /.+?(省|市|自治区|自治州|县|区)/g //获取地址中的省市区[省,市,区]
+    getCity: /.+?(省|市|自治区|自治州|县|区)/g, //获取地址中的省市区[省,市,区]
+    Tel: /^[0-9-]{7,18}$/, // 座机号
+    telAndPhone: /^[0-9-]{7,18}$/ || /^[0-9]{7,18}$/ || /^1\d{10}$/, // 校验手机号、座机号 010-88888888 01088888888
+    oneDecimal: /(^[0-9]{1,20}$)|(^[0-9]{1,20}[.][0-9]{1}$)/ // 1位小数
 }
 
 export default Reg