xianniu-ui 0.8.6 → 0.8.8

package/package.json

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

package/packages/table/main.vue

@@ -2,8 +2,8 @@
   <div class="xn-table-box">
     <div class="xn-table-box-tools" :class="{ 'is-border': !border }">
       <div class="flex justify-content-between align-items-center">
-        <div class="fz-12" :class="{ 'pb-10': selection }">
-          <template v-if="selection">
+        <div class="fz-12" :class="{ 'pb-10': isSelection }">
+          <template v-if="isSelection">
             <span>已选择 {{ selectedData.length }} 项</span>
             <el-button
               type="text"
@@ -71,16 +71,17 @@
       @row-click="singleElection"
       @selection-change="selectionChange"
       :row-class-name="tableRowClassName"
-      :class="{ 'disabled-all-selection': radio }"
+      :class="{ 'disabled-all-selection': isRadio }"
     >
       <el-table-column
-        v-if="selection && data.length"
+        v-if="isSelection && data.length"
         v-bind="$attrs"
         type="selection"
         width="50px"
         align="center"
+        :selectable="handleSelectable"
       ></el-table-column>
-      <el-table-column v-bind="$attrs" v-if="radio" width="40px" align="center">
+      <el-table-column v-bind="$attrs" v-if="isRadio" width="40px" align="center">
         <template slot-scope="{ row }">
           <el-radio v-model="radioSelected" :label="row[idKey]"
             >&nbsp;</el-radio
@@ -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>
 
@@ -141,6 +142,13 @@ export default {
       type: Array,
       default: () => [],
     },
+    type:{
+      type: String,
+      default:'',
+      validator: (val) => {
+        return ["selection", "radio"].indexOf(val) !== -1;
+      },
+    },
     stripe: Boolean,
     selection: Boolean,
     radio: Boolean,
@@ -162,6 +170,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 {
@@ -170,16 +198,19 @@ export default {
     };
   },
   computed: {
-    
-  },
-  created() {
-
+    isSelection(){
+      return this.type === 'selection' || this.selection
+    },
+    isRadio(){
+      return this.type === 'radio' || this.radio
+    }
   },
+  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: {
@@ -187,7 +218,7 @@ export default {
       this.$emit("on-page", val);
     },
     singleElection(val, column) {
-      if (!this.radio) return;
+      if (!this.isRadio) return;
       const { idKey } = this;
       this.radioSelected = val[idKey];
       const res = this.data.find(
@@ -210,7 +241,7 @@ export default {
       this.$refs.table.toggleRowSelection(row, status);
     },
     clearSelection() {
-      if (this.radio) {
+      if (this.isRadio) {
         this.radioSelected = "";
         return;
       }
@@ -222,9 +253,46 @@ export default {
     tableRowClassName({ row, rowIndex }) {
       row.rowIndex = rowIndex;
     },
-    headerRowClassName(){
-      return 'cus-table-header'
-    }
+    headerRowClassName() {
+      return "cus-table-header";
+    },
+    handleSelectable(row, idx) {
+      if (
+        this.isSelection &&
+        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)
                 })