meixioacomponent 0.3.42 → 0.3.46

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

@@ -26,9 +26,9 @@
         v-if="config.type == 'radio'"
       >
         <el-radio-button
-          :key="index"
+          :key="item.value"
           :label="item.value"
-          v-for="(item, index) in config.list"
+          v-for="item in config.list"
         >
           {{ item.label }}
         </el-radio-button>
@@ -556,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_table.vue

@@ -142,11 +142,12 @@
 
             <span
               v-else
-              :class="
-                item.click
-                  ? 'cell-content-text active'
-                  : `cell-content-text ${item.color}`
-              "
+              class="cell-content-text"
+              :class="[
+                item.fun ? 'fun' : '',
+                item.click ? 'primary' : '',
+                item.color ? item.color : '',
+              ]"
               @click="rowClick(item, scope.row)"
             >
               {{ scope.row[`${item.key}`] }}
@@ -243,6 +244,9 @@ export default {
       borderRow: true,
       // 倒计时
       triggerDown: null,
+
+      // 组件销毁时重置的class 配合 LinkViewClass使用
+      _linkViewClassSubs: null,
     }
   },
   created() {
@@ -255,6 +259,9 @@ export default {
   beforeDestroy() {
     componentConfig.eventBus.$off('handleTableBorder', this.handleTableBorder)
     clearTimeout(this.triggerDown)
+    if (this._linkViewClassSubs) {
+      this._linkViewClassSubs.init()
+    }
   },
   computed: {
     config() {
@@ -637,7 +644,22 @@ export default {
 
       let screenResult = this.returnProScreenResult()
       this.$props.httpRequire(screenResult).then((res) => {
-        this.setTableData(res)
+        let isArray = res instanceof Array
+        if (isArray) {
+          this.setTableData(res)
+        } else {
+          const tableData = res.tableData
+          if (
+            res._class.__proto__.__proto__.constructor.name ==
+              'LinkViewClass' &&
+            !this._linkViewClassSubs
+          ) {
+            this._linkViewClassSubs = res._class
+          }
+          if (tableData) {
+            this.setTableData(tableData)
+          }
+        }
       })
     },
     // 设置表格数据
@@ -786,7 +808,6 @@ export default {
       })
     },
     sortChange(column) {
-      console.log('sort')
       this.tableData = this.tableData.sort(
         this.sortFun(
           column.prop,
@@ -822,7 +843,6 @@ export default {
       return index == tableConfig.length - 1
     },
   },
-  watch: {},
 }
 </script>
 

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

@@ -11513,7 +11513,7 @@
   resize: vertical;
   padding: var(--padding-2) var(--padding-3);
   line-height: 1.5;
-  border: 0px !important;
+  border: 2px solid var(--color-gray-d) !important;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
@@ -11527,6 +11527,10 @@
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
 
+.el-textarea__inner:hover {
+  border-color: var(--color-primary) !important;
+}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }

package/src/App.vue

@@ -2,6 +2,7 @@
   <div id="app">
     <div style="height: 100vh;">
       <test></test>
+      <!-- <base-upload v-model="test"></base-upload> -->
     </div>
   </div>
 </template>
@@ -11,8 +12,9 @@ import test from './component/test.vue'
 
 import BaseArea from '../packages/components/base/baseArea/baseArea.vue'
 import BaseTimeLine from '../packages/components/base/baseTimeLine/baseTimeLine.vue'
+import BaseUpload from '../packages/components/base/baseUpload/baseUpload.vue'
 export default {
-  components: { test, BaseArea, BaseTimeLine },
+  components: { test, BaseArea, BaseTimeLine, BaseUpload },
   data() {
     return {
       test: [],
@@ -28,6 +30,23 @@ export default {
       value3: [],
 
       flag: false,
+      infoList: [
+        {
+          label: '手机号（登录名）',
+          value: '18626860059',
+          key: 'phone',
+        },
+        {
+          label: '姓名',
+          value: '余群',
+          key: 'accountname',
+        },
+        {
+          label: '部门',
+          value: '技术部',
+          key: 'deptName',
+        },
+      ],
     }
   },
   mounted() {},