meixioacomponent 0.4.78 → 0.4.80

package/package.json

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

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

@@ -135,11 +135,11 @@
         placeholder="选择日期"
         :disabled="isDisabled"
         v-else-if="isDatePick"
+        value-format="timestamp"
         :prefix-icon="`el-icon-time`"
         :rangeSeparator="datePickPlace[1]"
         :endPlaceholder="datePickPlace[2]"
         :startPlaceholder="datePickPlace[0]"
-        value-format="yyyy-MM-dd HH:mm:ss"
         style="width: 100%; height: 100%;"
         :picker-options="config.pickerOptions"
       ></el-date-picker>
@@ -229,6 +229,8 @@
 <script>
 import BaseNumberInput from '../../base/baseNumberInput/index.vue'
 import baseStoreSelect from '../../base/baseStoreSelect/index.vue'
+//
+import { FilterTime } from '../../../utils/utils'
 export default {
   data() {
     return {
@@ -340,15 +342,15 @@ export default {
             this.$refs.target.loadSelectData()
             return this.$props.config.value
           }
-        // case "time":
-        //   if (this.module) {
-        //     let config = this.$props.config;
-        //     let format = config.format ? config.format : "YYYY-MM-DD";
-        //     return FilterTime(this.module, format);
-        //   } else {
-        //     return "暂无时间";
-        //   }
+
         default:
+          if (this.isDatePick) {
+            if (this.module) {
+              return this.filterTimestamp()
+            } else {
+              return '暂无时间'
+            }
+          }
           return this.module
       }
     },
@@ -390,7 +392,17 @@ export default {
 
     module: {
       get() {
-        return this.$props.value
+        const value = this.$props.value
+        if (this.isDatePick) {
+          const type = this.type
+          if (type == 'time' || type == 'datetime') {
+            return this.returnTimestamp(value)
+          } else if (type == 'daterange') {
+            const _value = this.returnDaterangeTimestamp(value)
+            return _value
+          }
+        }
+        return value
       },
       set(val) {
         this.$emit('input', val)
@@ -466,6 +478,35 @@ export default {
         this.$emit('disableWatcherResult', obj)
       })
     },
+
+    // 返回 *1000的时间戳
+    returnTimestamp(value) {
+      if (value.toString().length <= 10) {
+        return value * 1000
+      }
+      return value
+    },
+
+    // 返回daterange的时间戳
+    returnDaterangeTimestamp(timestampArray) {
+      return timestampArray.map((item) => {
+        return this.returnTimestamp(item)
+      })
+    },
+
+    // 转换时间戳
+    filterTimestamp() {
+      const config = this.$props.config
+      const type = this.type
+      let format = config.format ? config.format : 'YYYY-MM-DD'
+      if (type != 'daterange') {
+        return FilterTime(this.module, format)
+      } else {
+        let timeStr = FilterTime(this.module[0], format)
+        timeStr += ` - ${this.datePickPlace[1]} - `
+        timeStr += FilterTime(this.module[1], format)
+      }
+    },
   },
   watch: {
     form(newVal, oldVal) {

package/packages/components/proPageTable/oa_pro_table.vue

@@ -144,28 +144,20 @@
             >
               <span
                 class="cell-content-text"
-                :class="[
-                  item.fun ? 'fun' : '',
-                  item.click ? 'primary' : '',
-                  item.color ? item.color : '',
-                ]"
+                :class="nomalStyle"
                 @click="rowClick(item, scope.row)"
               >
-                {{ scope.row[`${item.key}`] }}
+                {{ nomalRowValue(scope.row, item) }}
               </span>
             </el-tooltip>
 
             <span
               v-else
               class="cell-content-text"
-              :class="[
-                item.fun ? 'fun' : '',
-                item.click ? 'primary' : '',
-                item.color ? item.color : '',
-              ]"
+              :class="nomalStyle"
               @click="rowClick(item, scope.row)"
             >
-              {{ scope.row[`${item.key}`] }}
+              {{ nomalRowValue(scope.row, item) }}
             </span>
           </template>
         </el-table-column>
@@ -233,9 +225,11 @@ import oa_pro_table_skeletonVue from './oa_pro_table_skeleton.vue' //表格骨
 import baseDefaultSvgVue from '../base/baseDefaultSvg/baseDefaultSvg.vue' //缺省页组件
 import baseButtonHandle from '../base/baseButtonHandle/baseButtonHandle.vue' //通用组件 排列尾部按钮的组件
 import oa_pro_table_check_handle_barVue from './oa_pro_table_check_handle_bar.vue' //  当表格有行被选中的时候
+//
 
 //
 import componentConfig from '../../config/componentConfig'
+import { FilterTime } from '../../utils/utils'
 let canPush = true
 export default {
   name: 'baseProTable',
@@ -961,6 +955,25 @@ export default {
         this.cleanProscreenCondition(true)
       })
     },
+
+    // 返回普通格式的样式
+    nomalStyle(item) {
+      return [
+        item.fun ? 'fun' : '',
+        item.click ? 'primary' : '',
+        item.color ? item.color : '',
+      ]
+    },
+
+    // 返回普通格式的字段
+    nomalRowValue(row, item) {
+      const value = row[item.key]
+      if (item.type == 'time') {
+        return FilterTime(value, 'YYYY-MM-DD HH:mm:ss')
+      } else {
+        return value
+      }
+    },
   },
 }
 </script>

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,169 @@ 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
+  let _time = time
+    ? time.length <= 10
+      ? (time *= 1000)
+      : time
+    : new Date().valueOf() / 1000
   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(_time).format(`${format}`)
+      break
+    case 'YYYY-MM-DD':
+      filterTime = dayjs(_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/component/test.vue

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
   <base-dialog
     ref="dialog"
     :modal="true"
@@ -166,7 +166,7 @@ export default {
     transform: translateY(-50%);
   }
 }
-</style>
+</style> -->
 
 <!-- <template>
   <base-drawer
@@ -311,7 +311,7 @@ export default {
   box-sizing: border-box;
 }
 </style> -->
-<!-- 
+
 <template>
   <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
@@ -362,7 +362,6 @@ export default {
         </el-dropdown>
       </template>
 
-
       <template v-slot:gmtCreate="data">
         <el-button type="text" :disabled="false">222</el-button>
       </template>
@@ -480,6 +479,7 @@ export default {
         lock: false,
         width: 10,
         template: false,
+        type:'time'
       },
       {
         label: '创建时间',
@@ -526,7 +526,7 @@ export default {
         })
       }
       return new Promise((resolve, reject) => {
-        resolve([{}])
+        resolve(companyInfoConfig.getTableData())
       })
     },
     rowClick(row) {
@@ -545,7 +545,7 @@ export default {
   height: 100%;
   background: inherit;
 }
-</style> -->
+</style>
 
 <!-- 普通表单 -->
 
@@ -606,15 +606,15 @@ export default {
         },
         {
           key: 'sendTime',
-          type: 'datetime',
-          value: '',
+          type: 'daterange',
+          value: [1663424003, 1663424003],
           label: '发送时间',
         },
 
         {
           key: 'popupEndTime',
           type: 'datetime',
-          value: null,
+          value: 1663424003,
           label: '弹窗失效时间',
         },
       ],

package/src/config/CompanyInfoConfig.js

@@ -19,7 +19,7 @@ class CompanyInfoConfig extends LinkViewClass {
       params: params,
     })
 
-    // this.tableData = res.data.data.records
+    this.tableData = res.data.data.records
   }
 }