meixioacomponent 0.3.71 → 0.3.74

package/package.json

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

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

@@ -10,13 +10,23 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :append-to-body="appendToBody"
-      :destroy-on-close="isDestroy"
+      :destroy-on-close="destroyOnClose"
       :visible.sync="centerDialogVisible"
       :modal-append-to-body="appendToBody"
     >
       <div class="dialog-title-wrap" slot="title" ref="dialogTitleWrap">
         <span>{{ title }}</span>
         <div class="title-handle-wrap">
+          <base-icon
+            :size="`d`"
+            :color="`d`"
+            v-if="isCache"
+            :event="true"
+            @iconClick="handleCache"
+            :iconClass="`element`"
+            :name="`el-icon-minus`"
+          ></base-icon>
+
           <base-icon
             :size="`d`"
             :color="`d`"
@@ -69,6 +79,10 @@ export default {
     })
   },
   beforeDestroy() {
+    const { isCache } = this.$props
+    if (isCache) {
+      this.$store.dispatch('dialogCacheStore/closeCache', this)
+    }
     this.$emit('destroy')
   },
   props: {
@@ -122,6 +136,11 @@ export default {
       type: Boolean,
       default: true,
     },
+
+    isCache: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   computed: {
@@ -130,6 +149,13 @@ export default {
         height: this.$props.contentHeight,
       }
     },
+    destroyOnClose() {
+      const { isDestroy, isCache } = this.$props
+      if (isCache) {
+        return false
+      }
+      return isDestroy
+    },
   },
   methods: {
     init() {
@@ -169,18 +195,19 @@ export default {
       })
     },
     closeDialog() {
-      if (this.$props.isDestroy) {
-        this.isShow = false
-        this.$nextTick(() => {
-          this.$destroy()
-        })
-      } else {
-        this.centerDialogVisible = false
-      }
+      this.isShow = false
+      this.$nextTick(() => {
+        this.$destroy()
+      })
     },
     iconClick() {
       this.closeDialog()
     },
+
+    handleCache() {
+      this.centerDialogVisible = false
+      this.$store.dispatch('dialogCacheStore/pushCache', this)
+    },
   },
 }
 </script>

package/packages/components/dialogCache/index.vue

@@ -0,0 +1,93 @@
+<template>
+  <div
+    tabindex="-1"
+    v-show="getRenderShow"
+    ref="dialogCacheWrapRef"
+    class="dialog-cache-wrap"
+    @blur="dialogCacheWrapOnBlue"
+  >
+    <div class="dialog-no-cache" v-if="getCacheList.length <= 0">
+      <baseDefaultSvg
+        :width="100"
+        :height="100"
+        :svgName="`404`"
+        :text="`暂无缓存表单`"
+      ></baseDefaultSvg>
+    </div>
+    <div class="dialog-cache-content" v-else>
+      <el-button
+        type="info"
+        :key="index"
+        size="medium"
+        icon="el-icon-tickets"
+        @click="openDialogCache(index)"
+        v-for="(item, index) in getCacheList"
+      >
+        {{ item.title }}
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import store from '../../../src/store'
+import baseDefaultSvg from '../base/baseDefaultSvg/baseDefaultSvg.vue'
+export default {
+  data() {
+    return {}
+  },
+  created() {},
+  mounted() {},
+  computed: {
+    getCacheList() {
+      return store.getters['dialogCacheStore/getCacheList']
+    },
+    getRenderShow() {
+      return store.getters['dialogCacheStore/getRenderShow']
+    },
+  },
+  components: { baseDefaultSvg },
+  methods: {
+    openDialogCache(index) {
+      store.commit('dialogCacheStore/OPEN_DIALOG_CACHE', index)
+    },
+    dialogCacheWrapOnBlue() {
+      this.$store.commit('dialogCacheStore/SET_RENDER_SHOW', false)
+    },
+  },
+  watch: {
+    getRenderShow(newVal, oldVal) {
+      if (newVal) {
+        this.$nextTick(() => {
+          this.$refs.dialogCacheWrapRef.focus()
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.dialog-cache-wrap {
+  top: 56px;
+  left: 0px;
+  z-index: 4;
+  width: 100vw;
+  height: auto;
+  position: fixed;
+  box-sizing: border-box;
+  background: var(--bg-white);
+  padding: calc(var(--padding-4) * 2);
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.3);
+  .dialog-no-cache {
+    width: 100%;
+    height: auto;
+    display: flex;
+    align-items: center;
+    flex-flow: row nowrap;
+    justify-content: center;
+  }
+  .dialog-cache-content {
+  }
+}
+</style>

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

@@ -6,6 +6,7 @@
     :width="width"
     :onDrag="onDrag"
     :isDestroy="true"
+    :isCache="isCache"
     :contentHeight="contentHeight"
     @destroy="destroyForDialog"
   >
@@ -27,7 +28,9 @@
             :form="true"
             :size="size"
             :footer="false"
+            ref="proFormVue"
             :formConfig="item"
+            :isDialogForm="true"
             :disables="disables"
             :rowNumber="rowNumber"
             :labelWidth="labelWidth"
@@ -35,7 +38,6 @@
             :rules="returnRules(item.key)"
             :labelPosition="setLabelPosition(item.formType)"
             :formType="item.formType ? item.formType : 'default'"
-            ref="proFormVue"
             @disableWatcherResult="disableWatcherResult"
           >
             <template v-for="slotItem in slotList">
@@ -59,20 +61,20 @@
 </template>
 
 <script>
-import pro_formVue from "../proForm/pro_form.vue";
-import baseButtonHandleVue from "../../base/baseButtonHandle/baseButtonHandle.vue";
+import pro_formVue from '../proForm/pro_form.vue'
+import baseButtonHandleVue from '../../base/baseButtonHandle/baseButtonHandle.vue'
 export default {
-  name: "baseDialogForm",
+  name: 'baseDialogForm',
   data() {
     return {
       slotList: [],
-    };
+    }
   },
   created() {
-    this.createSlots();
+    this.createSlots()
   },
   beforeDestroy() {
-    this.$parent.$destroy();
+    this.$parent.$destroy()
   },
   mounted() {},
   props: {
@@ -83,7 +85,7 @@ export default {
     top: {
       type: Number,
       default: () => {
-        return document.documentElement.clientHeight * 0.15;
+        return document.documentElement.clientHeight * 0.15
       },
     },
     // 是否开启拖拽
@@ -108,7 +110,7 @@ export default {
     // 每一个itemlabel的宽度
     labelWidth: {
       type: String,
-      default: "100px",
+      default: '100px',
     },
     // 弹框尾部
     footerHandleConfig: {
@@ -121,7 +123,7 @@ export default {
     },
     size: {
       type: String,
-      default: "small",
+      default: 'small',
     },
     rowNumber: {
       type: Number,
@@ -130,17 +132,22 @@ export default {
 
     footerButtonSize: {
       type: String,
-      default: "small",
+      default: 'small',
     },
 
     contentHeight: {
       type: String,
-      default: "50vh",
+      default: '50vh',
     },
     labelPosition: {
       type: String,
       default: `right`,
     },
+
+    isCache: {
+      type: Boolean,
+      default: true,
+    },
   },
   components: {
     pro_formVue,
@@ -149,102 +156,102 @@ export default {
   computed: {
     module: {
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
     },
   },
   methods: {
     createSlots() {
       for (let i = 0; i < this.module.length; i++) {
-        let item = this.module[i];
+        let item = this.module[i]
         for (let j = 0; j < item.formList.length; j++) {
-          let citem = item.formList[j];
-          if (citem.type == "template") {
-            this.slotList.push(citem.key);
+          let citem = item.formList[j]
+          if (citem.type == 'template') {
+            this.slotList.push(citem.key)
           }
         }
       }
     },
     disableWatcherResult(params) {
-      const { result, type, key } = params;
-      let index = 0;
-      let cindex = -1;
+      const { result, type, key } = params
+      let index = 0
+      let cindex = -1
 
       for (let i = 0; i < this.module.length; i++) {
-        let item = this.module[i];
+        let item = this.module[i]
         for (let j = 0; j < item.formList.length; j++) {
-          let citem = item.formList[j];
+          let citem = item.formList[j]
           if (citem.key == key) {
-            index = i;
-            cindex = j;
-            break;
+            index = i
+            cindex = j
+            break
           }
         }
       }
 
       if (cindex > -1) {
-        let formItem = this.module[index].formList[cindex];
-        if (type == "hide") {
-          this.$set(formItem, "renderHide", result);
-        } else if (type == "disable") {
-          this.$set(formItem, "disabled", result);
+        let formItem = this.module[index].formList[cindex]
+        if (type == 'hide') {
+          this.$set(formItem, 'renderHide', result)
+        } else if (type == 'disable') {
+          this.$set(formItem, 'disabled', result)
         }
       }
     },
     setLabelPosition(type) {
       if (!type) {
-        return this.$props.labelPosition;
-      } else if (type == "upload") {
-        return "top";
+        return this.$props.labelPosition
+      } else if (type == 'upload') {
+        return 'top'
       }
     },
     returnRules(key) {
-      let rulesList = this.$props.rulesList;
-      if (!rulesList) return null;
-      let listItem = rulesList[`${key}`] ? rulesList[`${key}`] : null;
+      let rulesList = this.$props.rulesList
+      if (!rulesList) return null
+      let listItem = rulesList[`${key}`] ? rulesList[`${key}`] : null
       if (listItem) {
-        return listItem;
+        return listItem
       }
-      return null;
+      return null
     },
     showDialog() {
-      this.$refs.dialog.showDialog();
+      this.$refs.dialog.showDialog()
     },
     closeDialog() {
-      this.$refs.dialog.closeDialog();
+      this.$refs.dialog.closeDialog()
     },
 
     getFormValue() {
-      let obj = {};
+      let obj = {}
       for (let i = 0; i < this.module.length; i++) {
-        let result = this.$refs.proFormVue[i].returnFormValue();
+        let result = this.$refs.proFormVue[i].returnFormValue()
         // obj[`${this.module[i].key}`] = result;
-        obj = { ...obj, ...result };
+        obj = { ...obj, ...result }
       }
-      return obj;
+      return obj
     },
     async checkValidate() {
-      let refs = this.$refs.proFormVue;
-      let validateResult = true;
+      let refs = this.$refs.proFormVue
+      let validateResult = true
       for (let i = 0; i < refs.length; i++) {
-        let validate = await refs[i].checkValidate();
-        validateResult = validate.result;
+        let validate = await refs[i].checkValidate()
+        validateResult = validate.result
         //console.log(result);
         if (!validateResult) {
-          return validateResult;
+          return validateResult
         }
       }
-      return validateResult;
+      return validateResult
     },
     destroyForDialog() {
-      this.$destroy();
+      this.$destroy()
     },
   },
   watch: {},
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -265,7 +272,7 @@ export default {
       justify-content: flex-start;
       margin-bottom: var(--margin-4);
       &::before {
-        content: "";
+        content: '';
         top: 0px;
         width: 4px;
         height: 100%;

package/packages/components/proForm/proForm/pro_form.vue

@@ -173,6 +173,11 @@ export default {
       default: 'small',
     },
 
+    isDialogForm: {
+      type: Boolean,
+      default: false,
+    },
+
     footButtonText: { type: Array, default: () => ['取消', '确定'] },
   },
   components: {
@@ -370,8 +375,8 @@ export default {
     },
 
     disableWatcherResult(params) {
-      const isBaseDialogForm = this.$parent.$options.name == 'baseDialogForm'
-      if (isBaseDialogForm) {
+      const { isDialogForm } = this.$props
+      if (isDialogForm) {
         this.$emit('disableWatcherResult', params)
       } else {
         const { result, type, key } = params

package/packages/components/proForm/proForm/pro_form_item.vue

@@ -584,6 +584,16 @@ export default {
     }
   }
 }
+
+.item-content {
+  /deep/ textarea {
+    border: 0px !important;
+    line-height: 1.9 !important;
+    &:hover {
+      border-color: transparent !important ;
+    }
+  }
+}
 .disabled {
   cursor: not-allowed !important;
 

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

@@ -23,7 +23,11 @@
         {{ handleScreenText }}
         <i :class="handleScreenIcon"></i>
       </el-button>
-      <el-button size="small" @click="handleOpenProScreen">
+      <el-button
+        size="small"
+        @click="handleOpenProScreen"
+        :disabled="proScreenConfig.length <= 0"
+      >
         <i class="meixicomponenticonfont meixicomponenticon-shaixuan"></i>
         高级筛选
       </el-button>

package/packages/components/proPageTable/oa_pro_screen_item.vue

@@ -20,11 +20,11 @@
           :label="item.label"
           :disabled="item.isCheck"
         >
-          <template
-            ><div @click="typeChange(index)">
+          <template>
+            <div @click="typeChange(index)">
               {{ item.label }}
-            </div></template
-          >
+            </div>
+          </template>
         </el-option>
       </el-select>
     </div>
@@ -63,8 +63,7 @@
           :key="item.value"
           :value="item.value"
           :label="item.label"
-        >
-        </el-option>
+        ></el-option>
       </el-select>
     </div>
     <div class="item-wrap-handle" v-if="!disable">
@@ -74,9 +73,9 @@
         @iconClick="deleteProscreen"
         :name="`meixicomponenticon-close`"
       ></base-icon>
-      <el-checkbox v-model="item.exposed" :disabled="!item.key"
-        >外露</el-checkbox
-      >
+      <el-checkbox v-model="item.exposed" :disabled="!item.key">
+        外露
+      </el-checkbox>
     </div>
   </div>
 </template>
@@ -86,13 +85,13 @@ export default {
   data() {
     return {
       privateConfigIndex: null,
-    };
+    }
   },
   created() {
-    this.privateConfigIndex = this.$props.configIndex;
+    this.privateConfigIndex = this.$props.configIndex
   },
   mounted() {
-    console.log(this.config);
+    console.log(this.config)
   },
   props: {
     item: {},
@@ -106,51 +105,53 @@ export default {
   },
   computed: {
     screenItem() {
-      return this.$props.item;
+      return this.$props.item
     },
   },
   methods: {
     typeChange(index) {
-      if (this.$props.config[index].isCheck == true) return;
-      this.privateConfigIndex = index;
-      this.$props.item.key = this.$props.config[this.privateConfigIndex].key;
-      this.trigerCheck(this.privateConfigIndex, true);
+      if (this.$props.config[index].isCheck == true) return
+      this.privateConfigIndex = index
+      this.$props.item.key = this.$props.config[this.privateConfigIndex].key
+      this.trigerCheck(this.privateConfigIndex, true)
     },
 
     deleteProscreen() {
-      const { config } = this.$props;
+      const { config } = this.$props
       if (config) {
         let index = config.findIndex((configItem) => {
-          return configItem.key == this.item.key;
-        });
-        config[index].isCheck = false;
+          return configItem.key == this.item.key
+        })
+        if (index >= 0) {
+          config[index].isCheck = false
+        }
       }
 
-      this.$emit("deleteProscreenItem");
+      this.$emit('deleteProscreenItem')
     },
     trigerCheck(index, params) {
       setTimeout(() => {
-        this.$props.config[index].isCheck = params;
-      }, 120);
+        this.$props.config[index].isCheck = params
+      }, 120)
     },
 
     findProselectList(item) {
-      const { config } = this.$props;
+      const { config } = this.$props
       let index = config.findIndex((configItem) => {
-        return configItem.key == item.key;
-      });
-      return index;
+        return configItem.key == item.key
+      })
+      return index
     },
   },
 
   watch: {
     privateConfigIndex(newVal, oldVal) {
       if (oldVal != null) {
-        this.trigerCheck(oldVal, false);
+        this.trigerCheck(oldVal, false)
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>