meixioacomponent 1.1.42 → 1.1.44

package/package.json

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

package/packages/components/index.js

@@ -70,6 +70,7 @@ var UseGuide_1 = require("../config/use/UseGuide");
 var LinkViewClass_1 = require("../config/LinkViewClass");
 //组件库type类型
 var useType_1 = require("../useType/useType");
+var ProTableLocalConfigManage_1 = require("../config/ProTableLocalConfigManage/ProTableLocalConfigManage");
 var meixicomponents = [
     baseAnchor_1["default"],
     baseAppendix_1["default"],
@@ -138,6 +139,7 @@ var install = function (Vue) {
     window["meixiComponentConfig"] = componentConfig_1["default"];
     componentConfig_1["default"].createDialogCacheWrap();
     componentConfig_1["default"].eventBus = new componentConfig_1["default"].Vue();
+    ProTableLocalConfigManage_1["default"].initByProTableLocalConfigManage();
 };
 //
 if (typeof window !== "undefined" && window["Vue"]) {

package/packages/components/index.ts

@@ -69,159 +69,159 @@ import useGuide from "../config/use/UseGuide";
 import LinkViewClass from "../config/LinkViewClass";
 
 //组件库type类型
-import {
-  useFormItemParamsType,
-  useTableColumnParamsType,
-  useProScreenParamsItem,
-} from "../useType/useType";
+import {useFormItemParamsType, useProScreenParamsItem, useTableColumnParamsType,} from "../useType/useType";
+import proTableLocalConfigManage from "../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
 
 
 const meixicomponents: any[] = [
-  baseAnchor,
-  baseAppendix,
-  baseArea,
-  baseAvatar,
-  baseButtonHandle,
-  baseDefaultSvg,
-  baseDialog,
-  baseDialogTable,
-  baseDrawer,
-  baseEdito,
-  baseFixedHeader,
-  Icon,
-  baseImageViewer,
-  baseImg,
-  baseInforWrap,
-  baseLineInfoGroup,
-  baseLineInfoItem,
-  basePageHeader,
-  basePagination,
-  basePlainTable,
-  baseSection,
-  baseSkeleton,
-  baseSvg,
-  baseTimeTypeSelect,
-  baseToggle,
-  baseUploadItem,
-  baseUpload,
-  upload,
-  baseDialogForm,
-  baseForm,
-  baseFormWrap,
-  baseProTable,
-  baseMoverVerifiBar,
-  baseTimeLine,
-  basePopoverButton,
-  baseTreeSelect,
-  baseUploadTemplate,
-  baseList,
-  baseNumberInput,
-  baseStoreSelect,
-  baseFormItem,
-  baseSingleImgUpload,
-  baseGuide,
-  baseText,
-  baseTag,
-  oaProTableSearch,
-  baseWait,
-  draggable,
-  baseUploadImgAndName,
-  elDatePicker
+    baseAnchor,
+    baseAppendix,
+    baseArea,
+    baseAvatar,
+    baseButtonHandle,
+    baseDefaultSvg,
+    baseDialog,
+    baseDialogTable,
+    baseDrawer,
+    baseEdito,
+    baseFixedHeader,
+    Icon,
+    baseImageViewer,
+    baseImg,
+    baseInforWrap,
+    baseLineInfoGroup,
+    baseLineInfoItem,
+    basePageHeader,
+    basePagination,
+    basePlainTable,
+    baseSection,
+    baseSkeleton,
+    baseSvg,
+    baseTimeTypeSelect,
+    baseToggle,
+    baseUploadItem,
+    baseUpload,
+    upload,
+    baseDialogForm,
+    baseForm,
+    baseFormWrap,
+    baseProTable,
+    baseMoverVerifiBar,
+    baseTimeLine,
+    basePopoverButton,
+    baseTreeSelect,
+    baseUploadTemplate,
+    baseList,
+    baseNumberInput,
+    baseStoreSelect,
+    baseFormItem,
+    baseSingleImgUpload,
+    baseGuide,
+    baseText,
+    baseTag,
+    oaProTableSearch,
+    baseWait,
+    draggable,
+    baseUploadImgAndName,
+    elDatePicker
 ];
 
 const install = (Vue) => {
-  componentConfig.Vue = Vue;
-  meixicomponents.forEach((baseComponent) => {
-    Vue.component(baseComponent.name, baseComponent);
-  });
+    componentConfig.Vue = Vue;
+    meixicomponents.forEach((baseComponent) => {
+        Vue.component(baseComponent.name, baseComponent);
+    });
+
+    Vue.use(DynamicMount);
+    Vue.use(VueCropper);
+    window[`meixiComponentPlugin`] = {
+        SelectStore: SelectStore,
+        UseDrag: UseDrag,
+        UseResize: UseResize,
+        DynamicMountClass: DynamicMountClass,
+    };
+    window[`meixiComponentConfig`] = componentConfig;
+    componentConfig.createDialogCacheWrap();
+    componentConfig.eventBus = new componentConfig.Vue();
+    proTableLocalConfigManage.initByProTableLocalConfigManage();
+
 
-  Vue.use(DynamicMount);
-  Vue.use(VueCropper);
-  window[`meixiComponentPlugin`] = {
-    SelectStore: SelectStore,
-    UseDrag: UseDrag,
-    UseResize: UseResize,
-    DynamicMountClass: DynamicMountClass,
-  };
-  window[`meixiComponentConfig`] = componentConfig;
-  componentConfig.createDialogCacheWrap();
-  componentConfig.eventBus = new componentConfig.Vue();
 };
 //
 if (typeof window !== "undefined" && window[`Vue`]) {
-  install(window[`Vue`]);
+    install(window[`Vue`]);
 }
 
 // @ts-ignore
 const meixioacomponent = {
-  install,
-  componentConfig,
-  meixicomponents,
-  baseAnchor,
-  baseAppendix,
-  baseArea,
-  baseAvatar,
-  baseButtonHandle,
-  baseDefaultSvg,
-  baseDialog,
-  baseDialogTable,
-  baseDrawer,
-  baseEdito,
-  baseFixedHeader,
-  Icon,
-  baseImageViewer,
-  baseImg,
-  baseInforWrap,
-  baseLineInfoGroup,
-  baseLineInfoItem,
-  basePageHeader,
-  basePagination,
-  basePlainTable,
-  baseSection,
-  baseSkeleton,
-  baseSvg,
-  baseTimeTypeSelect,
-  baseToggle,
-  baseUploadItem,
-  baseUpload,
-  upload,
-  baseDialogForm,
-  baseForm,
-  baseFormWrap,
-  baseProTable,
-  baseMoverVerifiBar,
-  baseTimeLine,
-  baseUploadImgAndName,
-  basePopoverButton,
-  baseTreeSelect,
-  baseUploadTemplate,
-  baseNumberInput,
-  baseStoreSelect,
-  baseFormItem,
-  baseSingleImgUpload,
-  baseGuide,
-  baseText,
-  baseTag,
-  elDatePicker,
-  oaProTableSearch,
-  baseWait,
-  Theme,
-  SelectStore,
-  useImg,
-  UseDrag,
-  UseResize,
-  useUpload,
-  useFixedHeader,
-  useCropper,
-  useViewVideo,
-  useGuide,
-  DynamicMountClass,
-  useWait,
-  LinkViewClass,
-  //type 类型
-  useTableColumnParamsType,
-  useFormItemParamsType,
-  useProScreenParamsItem,
+    install,
+    componentConfig,
+    meixicomponents,
+    baseAnchor,
+    baseAppendix,
+    baseArea,
+    baseAvatar,
+    baseButtonHandle,
+    baseDefaultSvg,
+    baseDialog,
+    baseDialogTable,
+    baseDrawer,
+    baseEdito,
+    baseFixedHeader,
+    Icon,
+    baseImageViewer,
+    baseImg,
+    baseInforWrap,
+    baseLineInfoGroup,
+    baseLineInfoItem,
+    basePageHeader,
+    basePagination,
+    basePlainTable,
+    baseSection,
+    baseSkeleton,
+    baseSvg,
+    baseTimeTypeSelect,
+    baseToggle,
+    baseUploadItem,
+    baseUpload,
+    upload,
+    baseDialogForm,
+    baseForm,
+    baseFormWrap,
+    baseProTable,
+    baseMoverVerifiBar,
+    baseTimeLine,
+    baseUploadImgAndName,
+    basePopoverButton,
+    baseTreeSelect,
+    baseUploadTemplate,
+    baseNumberInput,
+    baseStoreSelect,
+    baseFormItem,
+    baseSingleImgUpload,
+    baseGuide,
+    baseText,
+    baseTag,
+    elDatePicker,
+    oaProTableSearch,
+    baseWait,
+    Theme,
+    SelectStore,
+    useImg,
+    UseDrag,
+    UseResize,
+    useUpload,
+    useFixedHeader,
+    useCropper,
+    useViewVideo,
+    useGuide,
+    DynamicMountClass,
+    useWait,
+    LinkViewClass,
+    //type 类型
+    useTableColumnParamsType,
+    useFormItemParamsType,
+    useProScreenParamsItem,
 };
 
 window[`meixioacomponent`] = meixioacomponent;

package/packages/components/proPageTable/oaProTableSearch/oa_pro-table-search.vue

@@ -1,47 +1,48 @@
 <template>
   <div ref="oaProTableSearchContent" class="oa-pro-table-search-content">
     <searchHeaderVue
-      v-model="module"
-      :input="useSearch"
-      :placeholder="placeholder"
-      :searchList="screenList"
-      @handleScreen="handleScreen"
-      @handleSearch="handleSearch"
+        v-model="module"
+        :input="useSearch"
+        :placeholder="placeholder"
+        :searchList="screenList"
+        @handleScreen="handleScreen"
+        @handleSearch="handleSearch"
     >
       <template slot="search-hearch-extend">
         <slot name="table-search-extend"></slot>
       </template>
 
-<!--      <el-button-->
-<!--        :class="{-->
-<!--          'is-plain': !proScreenCardShow,-->
-<!--        }"-->
-<!--        :disabled="_proScreenList.length <= 0 && !proScreenCardShow"-->
-<!--        :type="proScreenCardShow ? 'selected' : 'info'"-->
-<!--        size="small"-->
-<!--        @click="handleProScreenList(false)"-->
-<!--      >-->
-<!--        {{ handleScreenText }}-->
-<!--        <i :class="handleScreenIcon"></i>-->
-<!--      </el-button>-->
+      <!--      <el-button-->
+      <!--        :class="{-->
+      <!--          'is-plain': !proScreenCardShow,-->
+      <!--        }"-->
+      <!--        :disabled="_proScreenList.length <= 0 && !proScreenCardShow"-->
+      <!--        :type="proScreenCardShow ? 'selected' : 'info'"-->
+      <!--        size="small"-->
+      <!--        @click="handleProScreenList(false)"-->
+      <!--      >-->
+      <!--        {{ handleScreenText }}-->
+      <!--        <i :class="handleScreenIcon"></i>-->
+      <!--      </el-button>-->
 
       <oa-pro-colum-config
-        :config="tableConfig"
-        @setTableHeaderConfig="setTableHeaderConfig"
+          :use-local-table-config="useLocalTableConfig"
+          :config="tableConfig"
+          @setTableHeaderConfig="setTableHeaderConfig"
       ></oa-pro-colum-config>
 
-<!--      <el-button-->
-<!--        :id="screenList.id ? screenList.id : 'pro-screen-button'"-->
-<!--        :disabled="proScreenConfig.length <= 0 || !useProScreenList"-->
-<!--        size="small"-->
-<!--        @click="handleOpenProScreen"-->
-<!--      >-->
-<!--        <i-->
-<!--          class="meixicomponenticonfont meixicomponenticon-shaixuan"-->
-<!--          style="font-size: 14px !important"-->
-<!--        ></i>-->
-<!--        高级筛选-->
-<!--      </el-button>-->
+      <!--      <el-button-->
+      <!--        :id="screenList.id ? screenList.id : 'pro-screen-button'"-->
+      <!--        :disabled="proScreenConfig.length <= 0 || !useProScreenList"-->
+      <!--        size="small"-->
+      <!--        @click="handleOpenProScreen"-->
+      <!--      >-->
+      <!--        <i-->
+      <!--          class="meixicomponenticonfont meixicomponenticon-shaixuan"-->
+      <!--          style="font-size: 14px !important"-->
+      <!--        ></i>-->
+      <!--        高级筛选-->
+      <!--      </el-button>-->
     </searchHeaderVue>
     <div v-show="proScreenCardShow" class="search-mid-content">
       <el-card class="box-card">
@@ -49,61 +50,61 @@
           <span class="tips-text">筛选条件</span>
 
           <base-line-info-item
-            :event="false"
-            :icon="false"
-            :label="`排列方式：`"
-            :useSlot="true"
-            :valueAlign="`left`"
-            style="width: auto"
+              :event="false"
+              :icon="false"
+              :label="`排列方式：`"
+              :useSlot="true"
+              :valueAlign="`left`"
+              style="width: auto"
           >
             <base-toggle
-              slot="lineInforSlot"
-              v-model="toggle.index"
-              :toggleList="toggle.list"
+                slot="lineInforSlot"
+                v-model="toggle.index"
+                :toggleList="toggle.list"
             ></base-toggle>
           </base-line-info-item>
         </div>
         <div class="screen-item-wrap">
           <oa_pro_screen_itemVue
-            v-for="(item, index) in _proScreenList"
-            :key="index"
-            :config="proScreenConfig"
-            :configIndex="index"
-            :disable="true"
-            :item="item"
-            :style="screenStyle"
+              v-for="(item, index) in _proScreenList"
+              :key="index"
+              :config="proScreenConfig"
+              :configIndex="index"
+              :disable="true"
+              :item="item"
+              :style="screenStyle"
           ></oa_pro_screen_itemVue>
         </div>
         <baseButtonHandle
-          :align="`end`"
-          :config="footerHandleConfig"
-          :size="`mini`"
+            :align="`end`"
+            :config="footerHandleConfig"
+            :size="`mini`"
         ></baseButtonHandle>
       </el-card>
     </div>
 
     <!-- 高级筛选的弹框 -->
     <base-dialog
-      ref="dialog"
-      :close-notice="false"
-      :modal="proScreenModel"
-      :modallAppendToBody="false"
-      :title="`高级筛选`"
-      :width="`1000px`"
+        ref="dialog"
+        :close-notice="false"
+        :modal="proScreenModel"
+        :modallAppendToBody="false"
+        :title="`高级筛选`"
+        :width="`1000px`"
     >
       <template #dialog-content>
         <oa_pro_screen
-          :proScreenConfig="proScreenConfig"
-          :proScreenList="proScreenList"
-          @deleteProscreenItem="deleteProscreenItem"
-          @insertDefaultItem="insertDefaultItem"
+            :proScreenConfig="proScreenConfig"
+            :proScreenList="proScreenList"
+            @deleteProscreenItem="deleteProscreenItem"
+            @insertDefaultItem="insertDefaultItem"
         ></oa_pro_screen>
       </template>
 
       <template #dialog-footer>
         <baseButtonHandle
-          :config="footerHandleConfig"
-          :size="`small`"
+            :config="footerHandleConfig"
+            :size="`small`"
         ></baseButtonHandle>
       </template>
     </base-dialog>
@@ -116,6 +117,7 @@ import oa_pro_screen_itemVue from "./oa_pro_screen_item.vue";
 import searchHeaderVue from "../../searchHeader/searchHeader.vue";
 import baseButtonHandle from "../../base/baseButtonHandle/baseButtonHandle.vue";
 import OaProColumConfig from "../oa_pro_colum_config";
+import proTableLocalConfigManage from "../../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
 
 export default {
   name: "oaProTableSearch",
@@ -128,8 +130,8 @@ export default {
       toggle: {
         index: 1,
         list: [
-          { label: "三列", value: 1 },
-          { label: "四列", value: 2 },
+          {label: "三列", value: 1},
+          {label: "四列", value: 2},
         ],
       },
     };
@@ -169,6 +171,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    useLocalTableConfig: {
+      type: String,
+      default: ''
+    }
   },
   components: {
     OaProColumConfig,
@@ -247,9 +253,9 @@ export default {
     setTableHeaderConfig(configList) {
       let leftFixedList = [];
       let rightFixedList = [];
-      const { tableConfig } = this.$props;
+      const {tableConfig} = this.$props;
       tableConfig.forEach((item) => {
-        const { lock } = item;
+        const {lock} = item;
         if (lock && lock !== "right") {
           leftFixedList.push(item);
         } else if (lock && lock === "right") {
@@ -258,8 +264,8 @@ export default {
       });
 
       tableConfig.splice(
-        leftFixedList.length,
-        configList.length - rightFixedList.length + 1
+          leftFixedList.length,
+          configList.length - rightFixedList.length + 1
       );
 
       configList.forEach((item, index) => {
@@ -271,13 +277,16 @@ export default {
           tableConfig.push(item);
         });
       }
-      if (canPush) {
-        this.tableConfigPushEmpty();
+      // if (canPush) {
+      //   this.tableConfigPushEmpty();
+      // }
+      if (this.$props.useLocalTableConfig) {
+        proTableLocalConfigManage.setProTableLocalConfigByTableKey(this.$props.useLocalTableConfig, tableConfig);
       }
     },
 
     tableConfigPushEmpty() {
-      const { tableConfig } = this.$props;
+      const {tableConfig} = this.$props;
       tableConfig.push({
         label: "",
         key: "noData",
@@ -324,8 +333,8 @@ export default {
     computedHeight() {
       this.$nextTick(() => {
         this.$emit(
-          "searchContentHeightChange",
-          this.$refs.oaProTableSearchContent.clientHeight
+            "searchContentHeightChange",
+            this.$refs.oaProTableSearchContent.clientHeight
         );
       });
     },
@@ -349,8 +358,8 @@ export default {
       local[`${routerName}`] = this.proScreenList;
 
       window.localStorage.setItem(
-        "proTableScreenConfig",
-        JSON.stringify(local)
+          "proTableScreenConfig",
+          JSON.stringify(local)
       );
     },
 

package/packages/components/proPageTable/oa_pro_colum_config.vue

@@ -68,6 +68,7 @@
 
 <script>
 import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue'
+import proTableLocalConfigManage from "../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
 
 export default {
   name: 'oaProColumConfig',
@@ -112,6 +113,11 @@ export default {
       type: Array,
       require: true,
     },
+
+    useLocalTableConfig: {
+      type: String,
+      default: ''
+    }
   },
   computed: {
     lockConfigList() {