meixioacomponent 0.2.87 → 0.2.90

package/package.json

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

package/packages/components/base/baseMoverVerifiBar/baseMoverVerifiBar.vue

@@ -89,7 +89,7 @@ export default {
 
     iconClass() {
       if (this.statusComplate) {
-        return "icon-zhengque";
+        return "meixicomponenticon-zhengque";
       } else {
         return "meixicomponenticon-icon-arrow-right";
       }
@@ -161,9 +161,12 @@ export default {
   overflow: hidden;
   user-select: none;
   position: relative;
-  border-radius: var(--radius);
   background: var(--color-gray-m);
-  border: 1px solid var(--color-gray-d);
+  border: 2px solid var(--color-gray-d);
+  border-radius: calc(var(--radius) * 2);
+  &:hover {
+    border-color: var(--color-primary);
+  }
   .mover-box {
     z-index: 3;
     width: 40px;

package/packages/components/base/baseTimeLine/baseTimeLine.vue

@@ -61,6 +61,11 @@ export default {
     height: auto;
     display: flex;
     min-height: 50px;
+    &:last-of-type {
+      /deep/ .point-line {
+        display: none;
+      }
+    }
   }
   .base-time-line-right {
     width: 100%;

package/packages/components/base/baseTimeLine/baseTimeLineLeft.vue

@@ -18,6 +18,7 @@
           :size="`s`"
           :plain="true"
           :event="false"
+          :iconClass="`element`"
           v-if="timeLineItem.icon"
           :name="timeLineItem.icon"
         ></base-icon>
@@ -80,12 +81,15 @@ export default {
 
 <style lang="less" scoped>
 .base-time-line-left-wrap {
-  width: 50px;
+  width: auto;
   height: 100%;
   display: flex;
   flex-flow: row nowrap;
   align-items: flex-start;
   justify-content: flex-end;
+  .hasTimeWeek {
+    width: 50px;
+  }
   .time-week-wrap {
     padding: 0px var(--padding-5);
     span {

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

@@ -1,3 +1,4 @@
+import componentConfig from "../../../config/componentConfig";
 import useUpload from "../../../config/use/UseUpload";
 export const baseUploadMixins = {
   data() {
@@ -8,6 +9,13 @@ export const baseUploadMixins = {
   mounted() {},
   beforeDestroy() {},
 
+  props: {
+    uploadPath: {
+      default: () => {
+        return [0, 1];
+      },
+    },
+  },
   computed: {
     isMax() {
       if (this.module.length >= this.$props.max) {
@@ -28,6 +36,8 @@ export const baseUploadMixins = {
           this.module.push(list[i]);
         }
       }
+      const { uploadPath } = this.$props;
+      componentConfig.setUploadUrl(uploadPath[0], uploadPath[1]);
       if (!this.uploadLoading) {
         useUpload.toUpload(this.module ? this.module : list, this.uploadEd);
       }

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

@@ -52,9 +52,10 @@
             "
           ></baseAreaVue>
           <baseUploadVue
+            v-model="item.value"
             :max="formConfig.max"
             v-if="formType == `upload`"
-            v-model="item.value"
+            :uploadPath="item.uploadPath"
             :class="[`form-item-${item.key}`]"
           ></baseUploadVue>
         </el-form-item>
@@ -188,9 +189,13 @@ export default {
 
     formdata() {
       let obj = {};
+
       this.module.forEach((item) => {
-        obj[`${item.key}`] = item.value;
+        if (!item.renderHide) {
+          obj[`${item.key}`] = item.value;
+        }
       });
+
       return obj;
     },
 
@@ -272,10 +277,7 @@ export default {
         let confrim = true;
         const rulesItem = this.$props.rules[params.config.key];
         if (rulesItem) {
-          console.log(rulesItem);
-          console.log(this.$refs.form);
           this.$refs.form.validateField(`${params.config.key}`, (errorMsg) => {
-            console.log(errorMsg);
             if (errorMsg) {
               confrim = false;
             }
@@ -359,7 +361,7 @@ export default {
       if (this.loading) {
         setTimeout(() => {
           this.loading = false;
-        }, 1500);
+        }, 750);
       }
     },
   },

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

@@ -130,7 +130,7 @@
         :size="size"
         ref="target"
         placeholder="选择日期"
-        value-format="timestamp"
+        value-format="yyyy-MM-dd HH:mm:ss"
         :disabled="config.disabled"
         :prefix-icon="`el-icon-time`"
         style="width: 100%; height: 100%"
@@ -224,7 +224,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       if (this.$props.disableWatcher) {
-        // this.triggerDisable();
+        this.triggerDisable(this.$props.value);
       }
     });
   },
@@ -351,9 +351,7 @@ export default {
         return this.$props.value;
       },
       set(val) {
-        console.log(val);
         this.$emit("input", val);
-        console.log(this.$props.disableWatcher);
         if (this.$props.disableWatcher) {
           this.triggerDisable(val);
         }
@@ -424,8 +422,8 @@ export default {
           type: item.type,
           result: item.fn(val),
         };
-        console.log(obj);
 
+        console.log(val);
         this.$emit("disableWatcherResult", obj);
       });
     },

package/packages/config/componentConfig.js

@@ -6,15 +6,20 @@ const componentConfig = {
   router: null,
   dynamicId: 0,
   uploadUrl: null,
+  uploadPrefix: null,
   eventBus: new Vue(),
   selectStore: null,
-
+  uploadStoreList: ["meixidev"],
   setDynamicId: () => {
     componentConfig.dynamicId += 1;
   },
 
-  setUploadUrl: (url) => {
-    componentConfig.uploadUrl = url;
+  setUploadPrefix: (url) => {
+    componentConfig.uploadPrefix = url;
+  },
+
+  setUploadUrl: (storeType, uploadType) => {
+    componentConfig.uploadUrl = `${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`;
   },
 
   initConfig: (_store, _router) => {

package/packages/config/uploadRequest.js

@@ -6,7 +6,7 @@ const ossInstance = (params, uploadProgressFn) => {
   // 创建 axios 实例
   const instance = axios.create({
     // API 请求的默认前缀
-    baseURL: componentConfig.uploadUrl,
+    baseURL: `${componentConfig.uploadPrefix}/${componentConfig.uploadUrl}`,
   });
 
   // 异常拦截处理器
@@ -23,7 +23,7 @@ const ossInstance = (params, uploadProgressFn) => {
   // request 拦截器
   instance.interceptors.request.use((config) => {
     config.headers["Content-Type"] = "multipart/form-data";
-    config.Authorization = GetToken("token");
+    config.headers["authorization"] = `Bearer ${GetToken("token")}`;
     config.onUploadProgress = (progressEvent) => {
       if (uploadProgressFn) {
         const percent = (progressEvent.loaded / progressEvent.total) * 100 || 0;
@@ -55,6 +55,7 @@ export default (file, uploadProgressFn, sourceToken) => {
       uploadProgressFn
     )
       .then((res) => {
+        console.log(res);
         const result = res.data;
         if (result.code == 200) {
           resolve(result.data);