meixioacomponent 1.1.43 → 1.1.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "1.1.43",
+  "version": "1.1.44",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/proPageTable/oa_pro_colum_config.vue

@@ -145,10 +145,7 @@ export default {
     },
     setTableHeaderConfig() {
       if (this.isDrag) {
-        const {useLocalTableConfig} = this.$props;
         this.$emit('setTableHeaderConfig', this.dragConfigList)
-        console.log(useLocalTableConfig);
-
       }
       this.popoverFlag = false
     },

package/packages/components/proPageTable/oa_pro_table.vue

@@ -35,7 +35,7 @@
           :proScreenConfig="privateProScreenConfig"
           :proScreenList="proScreenList"
           :screenList="screenList"
-          :table-config="tableConfig"
+          :table-config="tableConfigColumnList"
           :use-pro-screen-list="useProScreenList"
           :use-search="useSearch"
           :use-local-table-config="useLocalTableConfig"
@@ -146,6 +146,9 @@
               <slot :scope="props.row" name="tableExpand"></slot>
             </template>
           </el-table-column>
+          <!--序号-->
+          <el-table-column type="index" width="50" v-if="useIndex"></el-table-column>
+
           <el-table-column
               v-for="(item, index) in showTableHeader"
               :key="index"
@@ -303,11 +306,14 @@ export default {
 
       //  表格勾选的控制
       tableCheckControl: null,
+
+
+      tableConfigColumnList: []
+
     };
   },
   created() {
     this.init();
-
     componentConfig.eventBus.$on("handleTableBorder", this.handleTableBorder);
   },
   mounted() {
@@ -509,6 +515,10 @@ export default {
     useLocalTableConfig: {
       type: String,
       default: ''
+    },
+    useIndex: {
+      type: Boolean,
+      default: false
     }
 
   },
@@ -537,7 +547,7 @@ export default {
       );
     },
     fixedList() {
-      return this.$props.tableConfig.filter((item) => {
+      return this.tableConfigColumnList.filter((item) => {
         const {lock} = item;
         return lock && lock !== "right";
       });
@@ -553,38 +563,21 @@ export default {
     },
 
     showTableHeader() {
-      if (this.$props.tableConfig) {
-
 
-        const useLocalTableConfig = this.$props.useLocalTableConfig;
+      return this.tableConfigColumnList.filter((item) => {
 
-        if (useLocalTableConfig) {
-
-
-          const checkAccordFlag = proTableLocalConfigManage.checkRenderTableConfigAccordLocal(useLocalTableConfig, this.$props.tableConfig);
-
-          if (checkAccordFlag) {
-            return proTableLocalConfigManage.hasConfigByTableKey(useLocalTableConfig);
+        if (item.hasOwnProperty('disabledSortable')) {
+          if (!item.disabledSortable) {
+            item.disabledSortable = false;
           }
-
+        } else {
+          item.disabledSortable = false;
         }
 
 
-        return this.$props.tableConfig.filter((item) => {
-
-          if (item.hasOwnProperty('disabledSortable')) {
-            if (!item.disabledSortable) {
-              item.disabledSortable = false;
-            }
-          } else {
-            item.disabledSortable = false;
-          }
-
+        return item.show;
+      });
 
-          return item.show;
-        });
-      }
-      return [];
     },
 
     isCheckTableRow() {
@@ -644,6 +637,7 @@ export default {
       return value.toString().length > 10;
     },
     init() {
+      this.setTableConfigColumList();
       const {rowKey} = this.$props;
       if (rowKey) {
         this.initTableControl();
@@ -651,15 +645,15 @@ export default {
       // canPush = !this.isAverageWidth;
       this.initProScreenConfig();
       this.initFooterHandleConfig();
-      this.$props.tableConfig.forEach((item, index) => {
+      this.tableConfigColumnList.forEach((item, index) => {
         item.preIndex = index;
-        this.$set(item, "show", true);
+
+        if (!item.hasOwnProperty('show')) {
+          this.$set(item, "show", true);
+        }
         if (!item.width || item.width <= 80) {
           item.width = 80;
         }
-        // if (item.lock === "right") {
-        //   canPush = false;
-        // }
       });
 
       // if (canPush) {
@@ -669,16 +663,44 @@ export default {
       this.refreshData();
     },
 
+    setTableConfigColumList() {
+      if (this.$props.tableConfig) {
+
+
+        const useLocalTableConfig = this.$props.useLocalTableConfig;
+
+        if (useLocalTableConfig) {
+
+
+          const checkAccordFlag = proTableLocalConfigManage.checkRenderTableConfigAccordLocal(useLocalTableConfig, this.$props.tableConfig);
+
+          if (checkAccordFlag) {
+            proTableLocalConfigManage.hasConfigByTableKey(useLocalTableConfig).forEach(item => {
+              this.tableConfigColumnList.push(item);
+            })
+            return;
+          }
+
+        }
+
+
+        this.tableConfigColumnList = JSON.parse(JSON.stringify(this.$props.tableConfig));
+
+        console.log(this.tableConfigColumnList);
+      }
+    },
+
+
     tableConfigPushEmpty() {
-      const {tableConfig} = this.$props;
-      tableConfig.push({
-        label: "",
-        key: "noData",
-        lock: false,
-        width: 40,
-        show: true,
-        template: false,
-      });
+      //
+      // this.tableConfigColumnList.push({
+      //   label: "",
+      //   key: "noData",
+      //   lock: false,
+      //   width: 40,
+      //   show: true,
+      //   template: false,
+      // });
     },
 
     initTableControl() {
@@ -699,7 +721,7 @@ export default {
           const tableWidth = this.$refs.elTable.$el.offsetWidth;
           let totalWidth = 0;
           let staticLength = 0;
-          const {tableConfig} = this.$props;
+          const tableConfig = this.tableConfigColumnList;
           tableConfig.forEach((item) => {
             if (item.lock || item.staticWidth) {
               staticLength += 1;
@@ -728,7 +750,7 @@ export default {
 
     headerItemLock(params) {
       let {preIndex, index} = {...params};
-      let tableConfig = this.$props.tableConfig;
+      let tableConfig = this.tableConfigColumnList;
       tableConfig[index].lock = true;
       if (tableConfig[index].preIndex === undefined) {
         tableConfig[index].preIndex = preIndex;
@@ -751,7 +773,7 @@ export default {
     },
     headerItemUnlock(params) {
       let {preIndex, index} = {...params};
-      let tableConfig = this.$props.tableConfig;
+      let tableConfig = this.tableConfigColumnList;
       tableConfig[index].lock = false;
 
       tableConfig.splice(
@@ -792,7 +814,7 @@ export default {
     // 初始化高级筛选
     initProScreenConfig() {
       this.privateProScreenConfig = [];
-      this.$props.tableConfig.forEach((item) => {
+      this.tableConfigColumnList.forEach((item) => {
         if (item.proScreenItem) {
           this.$set(item.proScreenItem, "label", item.label);
           this.$set(item.proScreenItem, "isCheck", false);
@@ -1129,6 +1151,11 @@ export default {
 
 
   },
+  watch: {
+    tableConfig() {
+      this.setTableConfigColumList();
+    }
+  }
 };
 </script>