meixioacomponent 0.4.2 → 0.4.6

package/packages/components/style/theme/light.less

@@ -12,7 +12,8 @@
   //滚动条样式
   --scrollbar-color: #1f23392d;
   // 灰色类型
-  --color-gray-d: #dfe1e6;
+  // --color-gray-d: #dfe1e6;
+  --color-gray-d: #ebecf0;
   --color-gray-m: #f4f5f7;
   --color-gray-s: #fafbfc;
 
@@ -20,10 +21,10 @@
   --font-color-d: #172b4d;
   --font-color-m: #344563;
   --font-color-s: #5e6c84;
-  --font-color-ds: #8f959e;   
+  --font-color-ds: #8f959e;
   // 字体颜色 按钮等primary 里面文字的白色非必要不要改
   --text-white: white;
-  --form-label-color: #42526e;
+  --form-label-color: #42526E;
   // 下拉 使用的组件包括：下拉菜单 / 气泡确认框 / 选择器 /
   --shadow-down: 0px 4px 10px rgba(0, 0, 0, 0.05);
   // fixed 使用的组件包括：全局提示 / 消息通知
@@ -35,4 +36,4 @@
   --color-table-header: #ebecf0;
   // tooltip 背景颜色
   --color-tooltip: #242424;
-}
+}

package/packages/config/selectStore/SelectStore.js

@@ -1,36 +1,45 @@
 class SelectStore {
   constructor(params) {
-    this.data = [];
-    this.loading = false;
-    this.name = params.name;
-    this.request = params.request;
+    this.data = null
+    this.loading = false
+    this.name = params.name
+    this.request = params.request
     this.config = {
-      label: "label",
-      value: "value",
-    };
+      label: 'label',
+      value: 'value',
+    }
   }
 
-  async loadData() {
+  async loadData(params) {
     if (this.loading) {
-      return;
+      return
     }
-    this.loading = true;
-    let result = await this.request();
+    this.loading = true
+    let result = []
 
-    this.loading = false;
-    this.data = result;
+    try {
+      result = await this.request(params)
+    } catch (error) {
+    } finally {
+      this.loading = false
+      this.data = result
+    }
   }
 
   getData() {
-    return this.data;
+    return this.data
   }
 
   getConfig() {
-    return this.config;
+    return this.config
   }
   getLoading() {
-    return this.loading;
+    return this.loading
+  }
+  cancelLoad() {
+
+    this.loading = false
   }
 }
 
-export default SelectStore;
+export default SelectStore

package/packages/config/uploadRequest.js

@@ -62,6 +62,7 @@ export default (file, uploadProgressFn, sourceToken) => {
     )
       .then((res) => {
         const { status } = res
+        console.log(status);
         if (status == 200) {
           const { data } = res
           resolve(data.data.original)

package/packages/utils/upload.js

@@ -1,35 +1,36 @@
-import axios from "axios";
-import uploadRequest from "../config/uploadRequest";
+import axios from 'axios'
+import uploadRequest from '../config/uploadRequest'
 // state  0是未开始  1是已完成 2是以失败
 class Upload {
   constructor(config) {
-    this.file = config.file;
-    this.state = 0;
-    this.cancelToken = axios.CancelToken.source();
+    this.file = config.file
+    this.state = 0
+    this.cancelToken = axios.CancelToken.source()
     this.uploadProgressFn = config.uploadProgressFn
       ? config.uploadProgressFn
-      : () => {};
+      : () => {}
   }
 
   async start() {
     return new Promise(async (resolve, reject) => {
-      let uploadEdUrl = await uploadRequest(
-        this.file,
-        this.uploadProgressFn,
-        this.cancelToken
-      ).catch((error) => {
-        this.state = 2;
-        reject(error);
-        return;
-      });
-      this.state = 1;
-      //console.log(uploadEdUrl);
-      resolve(uploadEdUrl);
-    });
+      try {
+        let uploadEdUrl = await uploadRequest(
+          this.file,
+          this.uploadProgressFn,
+          this.cancelToken,
+        )
+        this.state = 1
+        resolve(uploadEdUrl)
+      } catch (error) {
+        this.state = 2
+        reject(error)
+      } finally {
+      }
+    })
   }
   cancel() {
-    this.cancelToken.cancel("取消接口");
+    this.cancelToken.cancel('取消接口')
   }
 }
 
-export default Upload;
+export default Upload

package/packages/utils/utils.js

@@ -1,31 +1,31 @@
-import dayjs from "dayjs";
+import dayjs from 'dayjs'
 
-export const formatDate = (dateObj, fmt = "YYYY-MM-DD hh:mm:ss") => {
-  const date = new Date(dateObj);
+export const formatDate = (dateObj, fmt = 'YYYY-MM-DD hh:mm:ss') => {
+  const date = new Date(dateObj)
   if (/(Y+)/.test(fmt)) {
     fmt = fmt.replace(
       RegExp.$1,
-      (date.getFullYear() + "").substr(4 - RegExp.$1.length)
-    );
+      (date.getFullYear() + '').substr(4 - RegExp.$1.length),
+    )
   }
   const o = {
-    "M+": date.getMonth() + 1,
-    "D+": date.getDate(),
-    "h+": date.getHours(),
-    "m+": date.getMinutes(),
-    "s+": date.getSeconds(),
-  };
+    'M+': date.getMonth() + 1,
+    'D+': date.getDate(),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds(),
+  }
   for (let k in o) {
-    if (new RegExp("(" + k + ")").test(fmt)) {
-      const str = o[k] + "";
+    if (new RegExp('(' + k + ')').test(fmt)) {
+      const str = o[k] + ''
       fmt = fmt.replace(
         RegExp.$1,
-        RegExp.$1.length === 1 ? str : ("00" + str).substr(str.length)
-      );
+        RegExp.$1.length === 1 ? str : ('00' + str).substr(str.length),
+      )
     }
   }
-  return fmt;
-};
+  return fmt
+}
 
 /**
  * @title 获取文件后缀名
@@ -33,165 +33,164 @@ export const formatDate = (dateObj, fmt = "YYYY-MM-DD hh:mm:ss") => {
  * @returns {String} 文件后缀名
  */
 export const fileSuffix = (fileName) => {
-  return fileName.split(".").pop();
-};
+  return fileName.split('.').pop()
+}
 
 export const setLocalToken = (token) => {
-  window.localStorage.setItem("token", token);
-};
+  window.localStorage.setItem('token', token)
+}
 
 // 过滤时间
 export const FilterTime = (time = null, format) => {
-  let filterTime = null;
-  let _time = time ? time : new Date().valueOf() / 1000;
+  let filterTime = null
   switch (format) {
-    case "YYYY-MM-DD HH:mm:ss":
-      filterTime = dayjs(_time).format(`${format}`);
-      break;
-    case "YYYY-MM-DD":
-      filterTime = dayjs(_time).format(`${format}`);
-      break;
+    case 'YYYY-MM-DD HH:mm:ss':
+      filterTime = dayjs(parseInt(time)).format(`${format}`)
+      break
+    case 'YYYY-MM-DD':
+      filterTime = dayjs(parseInt(time)).format(`${format}`)
+      break
     default:
-      break;
+      break
   }
 
-  return filterTime;
-};
+  return filterTime
+}
 
 export const GetToken = (tokenName) => {
-  return window.localStorage.getItem(`${tokenName}`);
-};
+  return window.localStorage.getItem(`${tokenName}`)
+}
 export const SetToken = (tokenName, value) => {
-  window.localStorage.setItem(`${tokenName}`, value);
-};
+  window.localStorage.setItem(`${tokenName}`, value)
+}
 export const RemoveToken = (tokenName) => {
-  window.localStorage.removeItem(`${tokenName}`);
-};
+  window.localStorage.removeItem(`${tokenName}`)
+}
 
 export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path);
+  return /^(https?:|mailto:|tel:)/.test(path)
 }
 
 // array chunk方法1
 export const ArrayChunk = (arr, size) => {
-  let _size = size || 1;
-  let result = [];
-  let l = arr.length;
-  let s = Math.ceil(l / _size);
+  let _size = size || 1
+  let result = []
+  let l = arr.length
+  let s = Math.ceil(l / _size)
   for (let i = 0; i < s; i++) {
-    result[i] = arr.slice(_size * i, _size * (i + 1));
+    result[i] = arr.slice(_size * i, _size * (i + 1))
   }
-  return result;
-};
+  return result
+}
 
 // 文件大小
 export const filterFileSize = (fileSize) => {
   //console.log(fileSize);
-  let fileSizeByte = fileSize;
-  let fileSizeMsg = "";
+  let fileSizeByte = fileSize
+  let fileSizeMsg = ''
   if (fileSizeByte < 1048576)
-    fileSizeMsg = (fileSizeByte / 1024).toFixed(1) + "K";
-  else if (fileSizeByte == 1048576) fileSizeMsg = "1M";
+    fileSizeMsg = (fileSizeByte / 1024).toFixed(1) + 'K'
+  else if (fileSizeByte == 1048576) fileSizeMsg = '1M'
   else if (fileSizeByte > 1048576 && fileSizeByte < 1073741824)
-    fileSizeMsg = (fileSizeByte / (1024 * 1024)).toFixed(1) + "M";
+    fileSizeMsg = (fileSizeByte / (1024 * 1024)).toFixed(1) + 'M'
   else if (fileSizeByte > 1048576 && fileSizeByte == 1073741824)
-    fileSizeMsg = "1G";
+    fileSizeMsg = '1G'
   else if (fileSizeByte > 1073741824 && fileSizeByte < 1099511627776)
-    fileSizeMsg = (fileSizeByte / (1024 * 1024 * 1024)).toFixed(1) + "G";
-  else fileSizeMsg = "文件超过1T";
-  return fileSizeMsg;
-};
+    fileSizeMsg = (fileSizeByte / (1024 * 1024 * 1024)).toFixed(1) + 'G'
+  else fileSizeMsg = '文件超过1T'
+  return fileSizeMsg
+}
 
 export const jugeFileTypeKey = (suffix) => {
-  let key = null;
+  let key = null
   const jugeArray = [
     {
-      list: ["jpg", "png"],
-      key: "img",
+      list: ['jpg', 'png'],
+      key: 'img',
     },
     {
-      list: ["csv", "xlsx", "xls"],
-      key: "Excel",
+      list: ['csv', 'xlsx', 'xls'],
+      key: 'Excel',
     },
     {
       list: [
-        "wav",
-        "aif",
-        "au",
-        "mp3",
-        "ram",
-        "wma",
-        "mmf",
-        "amr",
-        "aac",
-        "flac",
+        'wav',
+        'aif',
+        'au',
+        'mp3',
+        'ram',
+        'wma',
+        'mmf',
+        'amr',
+        'aac',
+        'flac',
       ],
-      key: "music",
+      key: 'music',
     },
 
     {
-      list: ["pdf"],
-      key: "Pdf",
+      list: ['pdf'],
+      key: 'Pdf',
     },
     {
-      list: ["ppt", "pptx"],
-      key: "PPT",
+      list: ['ppt', 'pptx'],
+      key: 'PPT',
     },
     {
       list: [
-        "mp4",
-        "wmv",
-        "3gp",
-        "m4v",
-        "mov",
-        "avi",
-        "dat",
-        "mkv",
-        "flv",
-        "vob",
+        'mp4',
+        'wmv',
+        '3gp',
+        'm4v',
+        'mov',
+        'avi',
+        'dat',
+        'mkv',
+        'flv',
+        'vob',
       ],
-      key: "shipin",
+      key: 'shipin',
     },
     {
-      list: ["txt"],
-      key: "txt",
+      list: ['txt'],
+      key: 'txt',
     },
     {
-      list: ["doc", "docx"],
-      key: "Word",
+      list: ['doc', 'docx'],
+      key: 'Word',
     },
     {
-      list: ["rar", "zip", "arj", "z"],
-      key: "yasuobao",
+      list: ['rar', 'zip', 'arj', 'z'],
+      key: 'yasuobao',
     },
     {
-      list: ["exe"],
-      key: "Exe",
+      list: ['exe'],
+      key: 'Exe',
     },
-  ];
+  ]
   for (let i = 0; i < jugeArray.length; i++) {
-    const is = jugeArray[i].list.includes(suffix);
+    const is = jugeArray[i].list.includes(suffix)
     if (is) {
-      key = jugeArray[i].key;
-      break;
+      key = jugeArray[i].key
+      break
     }
   }
   if (!key) {
-    key = "weizhiwenjian";
+    key = 'weizhiwenjian'
   }
 
-  return key;
-};
+  return key
+}
 
 export const vhToNumber = (type, value) => {
-  if (type == "height") {
-    let heightValue = window.innerHeight;
-    console.log(heightValue);
-    return heightValue * (value / 100);
-  } else if (type == "width") {
-    let widthValue = window.innerWidth;
-    return widthValue * (value / 100);
+  if (type == 'height') {
+    let heightValue = window.innerHeight
+    console.log(heightValue)
+    return heightValue * (value / 100)
+  } else if (type == 'width') {
+    let widthValue = window.innerWidth
+    return widthValue * (value / 100)
   } else {
-    return value;
+    return value
   }
-};
+}

package/src/App.vue

@@ -2,29 +2,24 @@
   <div id="app">
     <div style="height: 100vh;">
       <testVue></testVue>
+      <!-- <base-upload-template></base-upload-template> -->
+      <!-- <base-popover-button
+        v-model="flag"
+        :buttonIcon="`el-icon-s-tools`"
+        :iconClass="`element`"
+      ></base-popover-button> -->
     </div>
   </div>
 </template>
 
 <script>
 import testVue from './component/test.vue'
-import baseUploadTemplate from '../packages/components/base/baseUploadTemplate/index.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'
-import BaseUploadItem from '../packages/components/base/baseUpload/baseUploadItem.vue'
 export default {
-  components: {
-    testVue,
-    BaseArea,
-    BaseTimeLine,
-    BaseUpload,
-    BaseUploadItem,
-    baseUploadTemplate,
-  },
+  components: { testVue },
   data() {
     return {
-      test: false,
+      flag: false,
+      test: 5,
       toggleList: [
         { label: '开启', value: true },
         { label: '关闭', value: false },