meixioacomponent 0.2.61 → 0.2.64

package/lib/style/element/index.css

@@ -2328,10 +2328,10 @@
   color: #1f2329;
 }
 .el-dialog__body {
-  padding: var(--padding-5) calc(var(--padding-5) * 2);
-  color: var(--font-color-d);
   font-size: 14px;
+  color: var(--font-color-d);
   word-break: break-all;
+  padding: 0px calc(var(--padding-5) * 2);
 }
 .el-dialog__footer {
   padding: 20px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.2.61",
+  "version": "0.2.64",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/base/basePopoverButton/index.vue

@@ -138,5 +138,7 @@ export default {
 }
 .is-single {
   padding: 7px !important;
+  background: transparent;
+  border: none;
 }
 </style>

package/packages/components/proForm/dialogForm/baseDialogForm.vue

@@ -51,8 +51,8 @@
       </div>
     </div>
     <baseButtonHandleVue
-      :size="`small`"
       slot="dialog-footer"
+      :size="footerButtonSize"
       :config="footerHandleConfig"
     ></baseButtonHandleVue>
   </base-dialog>
@@ -128,6 +128,11 @@ export default {
       default: null,
     },
 
+    footerButtonSize: {
+      type: String,
+      default: "small",
+    },
+
     contentHeight: {
       type: String,
       default: "50vh",

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

@@ -14,30 +14,49 @@
         }"
         :disabled="_proScreenList.length <= 0"
         @click="handleProScreenList"
-        :type="showProScreenList ? 'primary' : 'info'"
+        :type="showProScreenList ? 'selected' : 'info'"
         >{{ handleScreenText }} <i :class="handleScreenIcon"></i>
       </el-button>
       <el-button size="medium" plain type="info" @click="handleOpenProScreen">
-        <i class="meixicomponenticonfont meixicomponenticon-shaixuan"></i>高级筛选
+        <i class="meixicomponenticonfont meixicomponenticon-shaixuan"></i
+        >高级筛选
       </el-button>
     </searchHeaderVue>
 
     <div class="search-mid-content" v-show="showProScreenList">
       <el-card class="box-card">
-        <span class="tips-text">筛选条件</span>
+        <div class="box-card-title">
+          <span class="tips-text">筛选条件</span>
+
+          <base-line-info-item
+            :event="false"
+            :icon="false"
+            :useSlot="true"
+            style="width: auto"
+            :valueAlign="`left`"
+            :label="`排列方式：`"
+          >
+            <base-toggle
+              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
             :key="index"
             :item="item"
             :disable="true"
+            :style="screenStyle"
+            :configIndex="index"
             :config="proScreenConfig"
-            style="width: 50%"
             v-for="(item, index) in _proScreenList"
           ></oa_pro_screen_itemVue>
         </div>
         <baseButtonHandle
           :size="`mini`"
-          :align="`start`"
+          :align="`end`"
           :config="footerHandleConfig"
         ></baseButtonHandle>
       </el-card>
@@ -55,6 +74,14 @@ export default {
       showProScreen: false,
       showProScreenList: false,
       footerHandleConfig: [],
+
+      toggle: {
+        index: 1,
+        list: [
+          { label: "三列", value: 1 },
+          { label: "四列", value: 2 },
+        ],
+      },
     };
   },
   created() {
@@ -91,6 +118,15 @@ export default {
         return item.exposed;
       });
     },
+    rowWidth() {
+      return this.toggle.index == 1 ? 33 : 25;
+    },
+
+    screenStyle() {
+      return {
+        width: `${this.rowWidth}%`,
+      };
+    },
 
     module: {
       get() {
@@ -103,7 +139,7 @@ export default {
   },
   methods: {
     handleSearch() {
-      this.$parent.startHttp();
+      this.$parent.refreshData();
     },
     handleProScreenList() {
       this.showProScreenList = !this.showProScreenList;
@@ -132,7 +168,7 @@ export default {
           type: "primary",
           plain: false,
           click: () => {
-            this.$parent.startHttp();
+            this.$parent.refreshData();
           },
         },
         {
@@ -142,7 +178,7 @@ export default {
           click: () => {
             this.$parent.cleanProscreenCondition();
             this.$nextTick(() => {
-              this.$parent.startHttp();
+              this.$parent.refreshData();
             });
           },
         },
@@ -166,10 +202,18 @@ export default {
     .box-card {
       width: 100%;
       height: 100%;
-      .tips-text {
-        display: block;
-        color: var(--font-color-d);
-        font-size: var(--font-size-base);
+
+      .box-card-title {
+        display: flex;
+        align-items: center;
+        flex-flow: row nowrap;
+        justify-content: space-between;
+        .tips-text {
+          display: block;
+          color: var(--font-color-d);
+          font-size: var(--font-size-l);
+          font-weight: var(--font-weight-kg);
+        }
       }
       .screen-item-wrap {
         width: 100%;

package/packages/components/proPageTable/oa_pro_footer.vue

@@ -55,11 +55,11 @@ export default {
   methods: {
     sizeChange(e) {
       this.$emit("pageSizeChange");
-      this.$parent.startHttp();
+      this.$parent.refreshData();
     },
     currentChange() {
       this.$emit("pageCurrentChange");
-      this.$parent.startHttp(false);
+      this.$parent.refreshData(false);
     },
   },
 };

package/packages/components/proPageTable/oa_pro_screen.vue

@@ -7,13 +7,13 @@
         :key="index"
         ref="oaProScreenItemVue"
         :config="proScreenConfig"
-        :configIndex="item.configIndex < 0 ? null : item.configIndex"
         v-for="(item, index) in proScreenList"
         @deleteProscreenItem="deleteProscreenItem(index)"
+        :configIndex="item.configIndex < 0 ? null : item.configIndex"
       ></oa_pro_screen_itemVue>
     </div>
     <div class="screen-handle-wrap">
-      <el-button type="text" @click="insertDefaultItem">
+      <el-button type="info" size="small" @click="insertDefaultItem">
         <i class="el-icon-plus"></i>
         添加筛选条件</el-button
       >

package/packages/components/proPageTable/oa_pro_screen_item.vue

@@ -59,7 +59,7 @@
         v-if="item.type == 'select'"
       >
         <el-option
-          v-for="item in config[privateConfigIndex].selectList"
+          v-for="item in config[findProselectList(item)].selectList"
           :key="item.value"
           :value="item.value"
           :label="item.label"
@@ -71,8 +71,8 @@
       <base-icon
         :color="`m`"
         :event="true"
-        :name="`meixicomponenticon-close`"
         @iconClick="deleteProscreen"
+        :name="`meixicomponenticon-close`"
       ></base-icon>
       <el-checkbox v-model="item.exposed" :disabled="!item.key"
         >外露</el-checkbox
@@ -91,7 +91,9 @@ export default {
   created() {
     this.privateConfigIndex = this.$props.configIndex;
   },
-  mounted() {},
+  mounted() {
+    console.log(this.config);
+  },
   props: {
     item: {},
     config: {},
@@ -116,6 +118,11 @@ export default {
     },
 
     deleteProscreen() {
+      const { config } = this.$props;
+      let index = config.findIndex((configItem) => {
+        return configItem.key == this.item.key;
+      });
+      config[index].isCheck = false;
       this.$emit("deleteProscreenItem");
     },
     trigerCheck(index, params) {
@@ -123,6 +130,14 @@ export default {
         this.$props.config[index].isCheck = params;
       }, 120);
     },
+
+    findProselectList(item) {
+      const { config } = this.$props;
+      let index = config.findIndex((configItem) => {
+        return configItem.key == item.key;
+      });
+      return index;
+    },
   },
 
   watch: {
@@ -168,7 +183,7 @@ export default {
   // justify-content: space-between !important;
   .item-wrap-left,
   .item-wrap-right {
-    width: 40% !important;
+    width: 45% !important;
   }
 }
 </style>

package/packages/components/proPageTable/oa_pro_table.vue

@@ -157,9 +157,9 @@
 
     <!-- 高级筛选的弹框 -->
     <base-dialog
-      :title="`高级筛选`"
       ref="dialog"
       :width="`1000px`"
+      :title="`高级筛选`"
       :modal="proScreenModel"
       :modallAppendToBody="false"
     >
@@ -172,6 +172,7 @@
       ></oa_pro_screenVue>
 
       <baseButtonHandle
+        :size="`medium`"
         slot="dialog-footer"
         :config="footerHandleConfig"
       ></baseButtonHandle>
@@ -421,8 +422,8 @@ export default {
       this.$props.tableConfig.forEach((item, index) => {
         item.preIndex = index;
         this.$set(item, "show", true);
-        if (!item.width || item.width < 150) {
-          item.width = 150;
+        if (!item.width || item.width < 100) {
+          item.width = 100;
         }
       });
 
@@ -430,12 +431,12 @@ export default {
         label: "",
         key: "noData",
         lock: false,
-        width: 80,
+        width: 30,
         show: true,
         template: false,
       });
 
-      this.startHttp();
+      this.refreshData();
     },
     searchContentHeightChange(height) {
       this.searchContentHeight = height;
@@ -445,16 +446,17 @@ export default {
       let content = row[`${column.property}`];
       this.tooltip.show = false;
       if (!content) return;
+      const { tooltip } = this;
       let style = event.target;
       let position = style.getBoundingClientRect();
-      this.tooltip.width = style.clientWidth;
-      this.tooltip.height = style.clientHeight;
-      this.tooltip.top = position.top;
-      this.tooltip.left = position.left;
-      this.tooltip.content = content;
+      tooltip.width = style.clientWidth;
+      tooltip.height = style.clientHeight;
+      tooltip.top = position.top;
+      tooltip.left = position.left;
+      tooltip.content = content;
 
       this.$nextTick(() => {
-        this.tooltip.show = true;
+        tooltip.show = true;
       });
     },
 
@@ -522,7 +524,7 @@ export default {
     /* 当快捷筛选的按钮被点击后 */
     handleScreen(index) {
       this.$props.screenList.index = index;
-      this.startHttp();
+      this.refreshData();
     },
     // 初始化高级筛选
     initProScreenConfig() {
@@ -589,12 +591,13 @@ export default {
     },
     // 删除高级筛选的item
     deleteProscreenItem(index) {
+      this.proScreenList[index].isCheck = false;
       this.proScreenList.splice(index, 1);
     },
     // 弹框确定的按钮
     dialogProscreenConfirm(type) {
       if (type) {
-        this.startHttp();
+        this.refreshData();
       }
       this.$refs.dialog.closeDialog();
     },
@@ -636,7 +639,7 @@ export default {
       return result;
     },
     // 开始调用http请求
-    async startHttp(init = true) {
+    async refreshData(init = true) {
       this.loading = true;
       this.defaultSvg = false;
       this.cleanCheckValue();

package/packages/components/searchHeader/searchHeader.vue

@@ -22,7 +22,7 @@
           }"
           @click="handleScreen(index)"
           v-for="(item, index) in searchList.list"
-          :type="index == searchList.index ? 'primary' : 'info'"
+          :type="index == searchList.index ? 'selected' : 'info'"
           >{{ item.label }}</el-button
         >
       </div>

package/packages/components/style/element/index.css

@@ -2328,10 +2328,10 @@
   color: #1f2329;
 }
 .el-dialog__body {
-  padding: var(--padding-5) calc(var(--padding-5) * 2);
-  color: var(--font-color-d);
   font-size: 14px;
+  color: var(--font-color-d);
   word-break: break-all;
+  padding: 0px calc(var(--padding-5) * 2);
 }
 .el-dialog__footer {
   padding: 20px;