meixioacomponent 0.3.73 → 0.3.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.73",
+  "version": "0.3.76",
   "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: false,
+    },
   },
 
   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"
   >
@@ -142,6 +143,11 @@ export default {
       type: String,
       default: `right`,
     },
+
+    isCache: {
+      type: Boolean,
+      default: false,
+    },
   },
   components: {
     pro_formVue,

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>
@@ -92,6 +96,7 @@ export default {
   },
   created() {
     this.initFooterHandleList()
+    // console.log(this.proScreenConfig)
   },
   props: {
     value: {},

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>

package/packages/components/proPageTable/oa_pro_table.vue

@@ -538,22 +538,20 @@ export default {
     // 初始化高级筛选
     initProScreenConfig() {
       let proScreenConfig = this.$props.proScreenConfig
-      if (proScreenConfig.length > 0) {
-        this._proScreenConfig = proScreenConfig.map((item) => {
-          let index = this.$props.tableConfig.findIndex((citem) => {
-            //console.log(citem);
-            return citem.key == item.key
-          })
 
-          if (index > -1) {
-            this.$set(item, 'label', this.$props.tableConfig[index].label)
-            this.$set(item, 'isCheck', false)
-            return item
-          }
+      this._proScreenConfig = proScreenConfig.map((item) => {
+        let index = this.$props.tableConfig.findIndex((citem) => {
+          //console.log(citem);
+          return citem.key == item.key
         })
 
-        //console.log(this._proScreenConfig);
-      }
+        if (index > -1) {
+          this.$set(item, 'label', this.$props.tableConfig[index].label)
+          this.$set(item, 'isCheck', false)
+          return item
+        }
+      })
+
     },
     // 打开高级筛选
     handleOpenProScreen() {

package/packages/config/componentConfig.js

@@ -1,6 +1,8 @@
-import Vue from "vue";
-import { useElementComponent } from "./useElement";
-import selectStore from "./storeModule/selectStore";
+import Vue from 'vue'
+import { useElementComponent } from './useElement'
+import selectStore from './storeModule/selectStore'
+import dialogCacheStore from './storeModule/dialogCacheStore'
+import dialogCacheWrap from '../components/dialogCache/index.vue'
 const componentConfig = {
   store: null,
   router: null,
@@ -9,31 +11,56 @@ const componentConfig = {
   uploadPrefix: null,
   eventBus: new Vue(),
   selectStore: null,
-  uploadStoreList: ["meixidev"],
+  dialogCacheComponent: null,
+  uploadStoreList: ['meixidev'],
   setDynamicId: () => {
-    componentConfig.dynamicId += 1;
+    componentConfig.dynamicId += 1
   },
 
   setUploadPrefix: (url) => {
-    componentConfig.uploadPrefix = url;
+    componentConfig.uploadPrefix = url
   },
 
   setUploadUrl: (storeType, uploadType) => {
-    componentConfig.uploadUrl = `${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`;
+    componentConfig.uploadUrl = `${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`
   },
 
   initConfig: (_store, _router) => {
     // 注册element 组件
-    useElementComponent();
+    useElementComponent()
     // 动态注册vuex modules
-    _store.registerModule("selectStore", selectStore);
+    _store.registerModule('selectStore', selectStore)
     // 注册vuex里面selectStore管理类
-    _store.commit("selectStore/CREATE_SELECTSTORE");
-    componentConfig.store = _store;
-    componentConfig.router = _router;
+    _store.commit('selectStore/CREATE_SELECTSTORE')
+    componentConfig.store = _store
+    componentConfig.router = _router
     componentConfig.selectStore =
-      componentConfig.store.getters["selectStore/getSelectStore"];
+      componentConfig.store.getters['selectStore/getSelectStore']
+
+    componentConfig.registerModuleOfCacheDialog(_store)
+    componentConfig.createDialogCacheWrap()
+  },
+
+  registerModuleOfCacheDialog: (_store) => {
+    _store.registerModule('dialogCacheStore', dialogCacheStore)
+  },
+
+  // 生成隐藏dialog的容器
+  createDialogCacheWrap: () => {
+    const component = Vue.extend(dialogCacheWrap)
+
+    componentConfig.dialogCacheComponent = new component({
+      store: componentConfig.store,
+      router: componentConfig.router,
+    })
+
+    Vue.nextTick(() => {
+      const cacheWrap = document.createElement('div')
+      cacheWrap.setAttribute('class', 'cacheWrap')
+      document.body.appendChild(cacheWrap)
+      componentConfig.dialogCacheComponent.$mount(cacheWrap)
+    })
   },
-};
+}
 
-export default componentConfig;
+export default componentConfig

package/packages/config/storeModule/dialogCacheStore.js

@@ -0,0 +1,64 @@
+const dialogCacheStore = {
+  namespaced: true,
+  state: {
+    cacheList: [],
+    renderShow: false,
+  },
+
+  getters: {
+    getCacheList(state) {
+      return state.cacheList
+    },
+
+    getRenderShow(state) {
+      return state.renderShow
+    },
+  },
+
+  mutations: {
+    PUSH_DIALOG_CACHE: (state, dialog) => {
+      state.cacheList.push(dialog)
+    },
+
+    CLOSE_DIALOG_CACHE: (state, index) => {
+      state.cacheList.splice(index, 1)
+    },
+
+    OPEN_DIALOG_CACHE: (state, index) => {
+      state.cacheList[index].showDialog()
+    },
+
+    SET_RENDER_SHOW: (state, flag) => {
+      state.renderShow = flag
+    },
+  },
+  actions: {
+    hasDialogCache({ commit, state }, dialog) {
+      return new Promise((resolve, reject) => {
+        resolve(
+          state.cacheList.findIndex((item) => {
+            return item == dialog
+          }),
+        )
+      })
+    },
+
+    pushCache({ commit, state, dispatch }, dialog) {
+      dispatch('hasDialogCache', dialog).then((res) => {
+        if (res <= -1) {
+          commit('PUSH_DIALOG_CACHE', dialog)
+        }
+      })
+    },
+
+    closeCache({ commit, state, dispatch }, dialog) {
+      dispatch('hasDialogCache', dialog).then((res) => {
+        if (res >= 0) {
+          commit('CLOSE_DIALOG_CACHE', res)
+        }
+      })
+    },
+  },
+}
+
+export default dialogCacheStore

package/packages/config/storeModule/selectStore.js

@@ -15,7 +15,6 @@ const selectStore = {
   mutations: {
     CREATE_SELECTSTORE: (state) => {
       state.selectStore = new UseSelectStoreClass();
-      //console.log("注册成功");
     },
   },
   actions: {},

package/src/App.vue

@@ -2,7 +2,6 @@
   <div id="app">
     <div style="height: 100vh;">
       <test></test>
-
       <!-- <base-upload-item
         :fileType="`img`"
         :cropper="true"
@@ -59,7 +58,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.$refs.baseUploadItem.clickFile()
+      // this.$refs.baseUploadItem.clickFile()
     })
   },
   methods: {

package/src/component/test.vue

@@ -311,7 +311,7 @@ export default {
 }
 </style> -->
 
-<!-- <template>
+<template>
   <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
       :align="`left`"
@@ -326,6 +326,7 @@ export default {
       :headerConfig="headerConfig"
       :totalPropsList="totalPropsList"
       :proScreenConfig="proScreenConfig"
+
     >
       <template>
         <base-icon
@@ -364,9 +365,9 @@ export default {
       <template v-slot:address="data">template-{{ data.scope }}</template>
     </base-pro-table>
   </div>
-</template> -->
+</template>
 
-<!-- <script>
+<script>
 import tableTable from '../test'
 import companyInfoConfig from '../config/CompanyInfoConfig'
 import componentConfig from '../../packages/config/componentConfig'
@@ -555,7 +556,7 @@ export default {
   height: 100%;
   background: inherit;
 }
-</style> -->
+</style>
 
 <!-- 普通表单 -->
 
@@ -816,7 +817,7 @@ export default {
 
 <style></style> -->
 
-<template>
+<!-- <template>
   <base-form-wrap
     :rowNumber="2"
     :disables="disables"
@@ -876,4 +877,4 @@ export default {
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style> -->