meixioacomponent 0.3.40 → 0.3.44

package/packages/components/base/baseUpload/baseUploadItem.vue

@@ -10,7 +10,7 @@
         ref="inputFile"
         :accept="accept"
         @change="valueChange"
-        style="display: none"
+        style="display: none;"
         v-if="type == 'upload'"
         :multiple="uploadType == 'single' ? false : true"
       />
@@ -31,10 +31,11 @@
           :name="`el-icon-upload`"
         ></base-icon>
         <div class="upload-notic-wrap" :class="{ disabled: disabled }">
-          <span @click="clickFile">点击上传<br /></span
-          ><span class="primary-color"
-            >或点击该处后Ctrl+V 黏贴QQ或微信截图</span
-          >
+          <span @click="clickFile">
+            点击上传
+            <br />
+          </span>
+          <span class="primary-color">或点击该处后Ctrl+V 黏贴QQ或微信截图</span>
         </div>
       </div>
     </div>
@@ -59,15 +60,16 @@
 </template>
 
 <script>
-import baseImgVue from "../baseImg/baseImg.vue";
+import baseImgVue from '../baseImg/baseImg.vue'
 
-import { baseUploadMixins } from "./mixins";
+import { baseUploadMixins } from './mixins'
 export default {
-  name: "baseUploadItem",
+  name: 'baseUploadItem',
   data() {
-    return {};
+    return {}
   },
-  created() {},
+
+  mounted() {},
   mixins: [baseUploadMixins],
   components: {
     baseImgVue,
@@ -75,17 +77,17 @@ export default {
   props: {
     type: {
       type: String,
-      default: "upload",
+      default: 'upload',
     },
 
     uploadType: {
       type: String,
-      default: "single",
+      default: 'single',
     },
 
     fileType: {
       type: String,
-      default: "other",
+      default: 'other',
     },
 
     uploadItem: {},
@@ -93,7 +95,7 @@ export default {
     shape: {
       // square rect cir
       type: String,
-      default: "rect",
+      default: 'rect',
     },
 
     value: {
@@ -108,124 +110,120 @@ export default {
       type: Boolean,
       default: false,
     },
+    isGroup: {
+      default: false,
+    },
   },
   computed: {
     module: {
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
     },
 
     imgSrc() {
-      if (this.isGroup) {
-        if (!this.uploadItem?.url) {
-          return "";
-        }
-        return this.uploadItem.url;
+      if (this.module) {
+        return this.module[0]?.url
       } else {
-        return this.module[0]?.url;
+        return this.uploadItem.url
       }
     },
 
     accept() {
-      let accept = "";
-      let fileType = this.$props.fileType;
+      let accept = ''
+      let fileType = this.$props.fileType
       switch (fileType) {
-        case "img":
-          accept = "image/*";
-          break;
-        case "other":
-          accept = "";
-          break;
+        case 'img':
+          accept = 'image/*'
+          break
+        case 'other':
+          accept = ''
+          break
         default:
-          break;
+          break
       }
-      return accept;
+      return accept
     },
 
     isUploadProImg() {
-      let props = this.$props;
+      let props = this.$props
       return (
-        props.shape == "pro" &&
-        props.fileType == "img" &&
-        props.uploadType == "single"
-      );
-    },
-
-    isGroup() {
-      return this.$parent.$options.name == "baseUpload";
+        props.shape == 'pro' &&
+        props.fileType == 'img' &&
+        props.uploadType == 'single'
+      )
     },
   },
   methods: {
     clickFile() {
-      const { disabled } = this.$props;
-      if (disabled) return;
-      this.$refs.inputFile.click();
+      const { disabled } = this.$props
+      if (disabled) return
+      this.$refs.inputFile.click()
     },
 
     async returnFiles(files) {
-      let list = [];
+      let list = []
       for (let i = 0; i < files.length; i++) {
         let obj = {
           url: null,
           process: 0,
           file: files[i],
-        };
-        list.push(obj);
+        }
+        list.push(obj)
       }
-      return list;
+      return list
     },
 
     async valueChange(e) {
-      let files = e.target.files;
-      let list = await this.returnFiles(files);
-      this.emitEvent(list);
-      this.$refs.inputFile.value = "";
+      let files = e.target.files
+      let list = await this.returnFiles(files)
+      this.emitEvent(list)
+      this.$refs.inputFile.value = ''
     },
 
     emitEvent(list) {
       if (this.isGroup) {
-        this.$emit("inputChange", list);
+        this.$emit('inputChange', list)
       } else {
-        this.inputChange(list);
+        this.inputChange(list)
       }
     },
 
     handleDeleteUploadItem() {
       if (this.isGroup) {
-        this.$emit("handleDeleteUploadItem");
+        this.$emit('handleDeleteUploadItem')
       } else {
-        this.module = [];
+        this.module = []
       }
     },
 
     async onPasteFile() {
-      const { disabled } = this.$props;
-      if (this.uploadLoading || disabled) return;
-      const items = (event.clipboardData || window.clipboardData).items;
-      const rowList = [];
-      if (this.fileType == "img") {
+      const { disabled } = this.$props
+      if (this.uploadLoading || disabled) return
+      const items = (event.clipboardData || window.clipboardData).items
+      const rowList = []
+      if (this.fileType == 'img') {
         for (var i = 0; i < items.length; i++) {
-          if (items[i].type.indexOf("image") !== -1) {
-            let file = items[i].getAsFile(); // getAsFile 如果拖拽项的对象是一个文件, 则返回 File 对象; 否则返回 null
-            rowList.push(file);
+          if (items[i].type.indexOf('image') !== -1) {
+            let file = items[i].getAsFile() // getAsFile 如果拖拽项的对象是一个文件, 则返回 File 对象; 否则返回 null
+            rowList.push(file)
           }
         }
       } else {
         for (var i = 0; i < items.length; i++) {
-          let file = items[i].getAsFile(); // getAsFile 如果拖拽项的对象是一个文件, 则返回 File 对象; 否则返回 null
-          rowList.push(file);
+          let file = items[i].getAsFile() // getAsFile 如果拖拽项的对象是一个文件, 则返回 File 对象; 否则返回 null
+          rowList.push(file)
         }
       }
-      if (rowList.length <= 0) return;
-      let list = await this.returnFiles(rowList);
-      this.emitEvent(list);
+      if (rowList.length <= 0) return
+      let list = await this.returnFiles(rowList)
+      this.emitEvent(list)
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -309,6 +307,11 @@ export default {
       height: auto;
       display: none;
       position: absolute;
+      border-radius: var(--radius);
+      background: rgba(0, 0, 0, 0.3);
+      /deep/ i {
+        color: var(--text-white) !important;
+      }
     }
   }
 }

package/packages/components/base/baseUpload/mixins.js

@@ -6,8 +6,12 @@ export const baseUploadMixins = {
       dynamicmount: null,
     };
   },
-  mounted() {},
-  beforeDestroy() {},
+  created() {
+  },
+  mounted() {
+
+  },
+  beforeDestroy() { },
 
   props: {
     uploadPath: {
@@ -15,6 +19,7 @@ export const baseUploadMixins = {
         return [0, 1];
       },
     },
+
   },
   computed: {
     isMax() {
@@ -52,7 +57,9 @@ export const baseUploadMixins = {
     },
 
     uploadEd(list) {
-      this.module = list;
+      if (!this.isGroup) {
+        this.module = list;
+      }
       this.uploadLoading = false;
       this.$emit("uploadEd", list);
     },

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

@@ -185,7 +185,9 @@
         type="textarea"
         v-model="module"
         :disabled="isDisabled"
+        :maxlength="config.maxlength"
         v-if="config.type == 'textarea'"
+        :show-word-limit="config.maxlength ? true : false"
       ></el-input>
       <!-- 插槽 -->
       <slot name="template" v-else-if="config.type == 'template'"></slot>
@@ -554,7 +556,11 @@ export default {
     }
   }
   .textarea {
-    border: 2px solid var(--color-gray-d);
+    border: 0px;
+    padding: 0px;
+    &:hover {
+      border-color: transparent !important ;
+    }
   }
 
   .bottom-handle-wrap {

package/packages/components/proPageTable/oa_pro_colum_config.vue

@@ -1,112 +1,103 @@
 <template>
-  <el-dropdown
-    slot="suffix"
-    trigger="click"
-    ref="dropdown"
-    @visible-change="setDragConfigList"
+  <base-popover-button
+    iconClass="element"
+    v-model="popoverFlag"
+    @popoverShow="setDragConfigList"
+    buttonIcon="el-icon-s-operation"
   >
-    <el-button
-      type="info"
-      size="small"
-      class="dropdown-button"
-      icon="el-icon-s-operation"
-      plain
-    ></el-button>
-    <el-dropdown-menu slot="dropdown">
-      <div class="config-wrap">
-        <span class="tips-text">显示列表项</span>
-        <div class="config-content">
-          <!-- 显示被固定在头部的列表 -->
-          <div class="fixed">
+    <div class="config-wrap" slot="popoverContent">
+      <span class="tips-text">显示列表项</span>
+      <div class="config-content">
+        <!-- 显示被固定在头部的列表 -->
+        <div class="fixed">
+          <div
+            class="config-item-wrap"
+            :key="index"
+            v-for="(item, index) in lockConfigList"
+          >
+            <div class="item-left" @click="showTableColum(item)">
+              <el-checkbox
+                v-model="item.show"
+                :disabled="item.lock ? true : false"
+              ></el-checkbox>
+              <span class="item-text">{{ item.label }}</span>
+            </div>
+          </div>
+        </div>
+        <!-- 可以拖拽的列表 -->
+
+        <div class="drag">
+          <draggable
+            element="div"
+            v-model="dragConfigList"
+            animation="500"
+            @start="onStart"
+            @end="onEnd"
+          >
             <div
               class="config-item-wrap"
               :key="index"
-              v-for="(item, index) in lockConfigList"
+              v-for="(item, index) in dragConfigList"
             >
-              <div class="item-left" @click="showTableColum(item)">
+              <div class="item-left" @click.self="showTableColum(item)">
                 <el-checkbox
                   v-model="item.show"
-                  :disabled="item.lock?true:false"
+                  :disabled="item.lock"
                 ></el-checkbox>
                 <span class="item-text">{{ item.label }}</span>
               </div>
-            </div>
-          </div>
-          <!-- 可以拖拽的列表 -->
-
-          <div class="drag">
-            <draggable
-              element="div"
-              v-model="dragConfigList"
-              animation="500"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <div
-                class="config-item-wrap"
-                :key="index"
-                v-for="(item, index) in dragConfigList"
-              >
-                <div class="item-left" @click.self="showTableColum(item)">
-                  <el-checkbox
-                    v-model="item.show"
-                    :disabled="item.lock"
-                  ></el-checkbox>
-                  <span class="item-text">{{ item.label }}</span>
-                </div>
-                <div class="item-right">
-                  <base-icon
-                    :name="`meixicomponenticon-tuozhuai`"
-                    :size="`s`"
-                    :color="`m`"
-                  ></base-icon>
-                </div>
+              <div class="item-right">
+                <base-icon
+                  :name="`meixicomponenticon-tuozhuai`"
+                  :size="`s`"
+                  :color="`m`"
+                ></base-icon>
               </div>
-            </draggable>
-          </div>
+            </div>
+          </draggable>
         </div>
-        <baseButtonHandle
-          :align="`end`"
-          :size="`mini`"
-          class="config-footer"
-          :config="handleConfig"
-        ></baseButtonHandle>
       </div>
-    </el-dropdown-menu>
-  </el-dropdown>
+      <baseButtonHandle
+        :align="`end`"
+        :size="`mini`"
+        class="config-footer"
+        :config="handleConfig"
+      ></baseButtonHandle>
+    </div>
+  </base-popover-button>
 </template>
 
 <script>
-import draggable from "vuedraggable";
-
-import baseButtonHandle from "../base/baseButtonHandle/baseButtonHandle.vue";
+import draggable from 'vuedraggable'
+import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue'
 export default {
   data() {
     return {
+      isDrag: false,
       handleConfig: [],
       dragConfigList: [],
-      isDrag: false,
-    };
+      popoverFlag: false,
+    }
   },
   created() {
     this.handleConfig = [
       {
-        text: "取消",
-        type: "info",
+        text: '取消',
+        type: 'info',
         plain: true,
         click: () => {
-          this.$refs.dropdown.hide();
+          this.popoverFlag = false
         },
       },
       {
-        text: "确定",
-        type: "primary",
+        text: '确定',
+        type: 'primary',
         plain: false,
         click: () => {
-          this.setTableHeaderConfig();
+          this.setTableHeaderConfig()
         },
       },
-    ];
+    ]
   },
   components: {
     draggable,
@@ -121,42 +112,40 @@ export default {
   computed: {
     lockConfigList() {
       return this.$props.config.filter((item) => {
-        return item.lock;
-      });
+        return item.lock
+      })
     },
   },
   methods: {
     onEnd() {
-      this.isDrag = true;
+      this.isDrag = true
     },
     onStart() {},
-    setDragConfigList(event) {
-      if (event) {
-        this.isDrag = false;
-        this.dragConfigList = [];
-        this.dragConfigList = this.$props.config.filter((item) => {
-          return item.key != "noData" && !item.lock;
-        });
-      }
+    setDragConfigList() {
+      this.isDrag = false
+      this.dragConfigList = []
+      this.dragConfigList = this.$props.config.filter((item) => {
+        return item.key != 'noData' && !item.lock
+      })
     },
     showTableColum(item) {
-      if (item.lock) return;
-      item.show = !item.show;
+      if (item.lock) return
+      item.show = !item.show
     },
     setTableHeaderConfig() {
       if (this.isDrag) {
-        this.$emit("setTableHeaderConfig", this.dragConfigList);
+        this.$emit('setTableHeaderConfig', this.dragConfigList)
       }
-      this.$refs.dropdown.hide();
+      this.popoverFlag = false
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
 .config-wrap {
   width: 240px;
-  height: auto;
+  min-height: 66px;
   max-height: 370px;
   background: inherit;
   box-sizing: border-box;
@@ -170,7 +159,7 @@ export default {
   .config-content {
     width: 100%;
     overflow-y: auto;
-    max-height: calc(100% - 46px);
+    max-height: calc(370px - 56px);
     .config-item-wrap {
       width: 100%;
       height: 34px;