meixioacomponent 2.0.49 → 2.0.50

package/lib/plugin/PluginByReferenceByOss.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginByReferenceByOss = void 0;
 const PluginByReferenceByOss = (Vue) => {
-    const metaTag = document.querySelector('meta[name="referrer"][content="no-referrer"]');
-    if (metaTag) {
-        metaTag.remove();
-    }
-    // 创建 meta 元素
-    const metaTagByStrict = document.createElement('meta');
-    metaTagByStrict.name = 'referrer';
-    metaTagByStrict.content = 'strict-origin-when-cross-origin';
-    // 添加到 head
-    document.getElementsByTagName('head')[0].appendChild(metaTagByStrict);
+    // const metaTag = document.querySelector('meta[name="referrer"][content="no-referrer"]');
+    // if (metaTag) {
+    //     metaTag.remove();
+    // }
+    // // 创建 meta 元素
+    // const metaTagByStrict = document.createElement('meta');
+    // metaTagByStrict.name = 'referrer';
+    // metaTagByStrict.content = 'strict-origin-when-cross-origin';
+    // // 添加到 head
+    // document.getElementsByTagName('head')[0].appendChild(metaTagByStrict);
 };
 exports.PluginByReferenceByOss = PluginByReferenceByOss;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.49",
+  "version": "2.0.50",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/base/tDateRangePicker/tDateRangePicker.vue

@@ -7,6 +7,7 @@
                      @focus="onFocus"
                      @input="onInput"
                      @pick="onPick"
+                     enableTimePicker
                      @preset-click="onPresetClick"
                      :presets="computedPresets"/>
 </template>
@@ -15,6 +16,8 @@
 <script>
 
 
+import {getEndOfDayTimestamp, getStartOfDayTimestamp} from "../../../utils/utils";
+
 export default {
   name: "tDateRangePicker",
   data() {
@@ -26,6 +29,10 @@ export default {
       default: () => {
         return []
       }
+    },
+    enableTimePicker:{
+      type:Boolean,
+      default:true
     }
   },
   components: {},
@@ -44,7 +51,7 @@ export default {
       const now = {
         '此刻': () => {
           if (this.$attrs['valueType'] === 'time-stamp') {
-            return [new Date().valueOf(), new Date().valueOf()]
+            return [getStartOfDayTimestamp(), getEndOfDayTimestamp()]
           }
           return [new Date(), new Date()];
         }

package/packages/components/proPageTable/oa_pro_table.vue

@@ -234,7 +234,7 @@ import TableCheckControl from "./TableCheckControl";
 import proTableLocalConfigManage from "../../config/ProTableLocalConfigManage/ProTableLocalConfigManage";
 import {TransomTableCheckConfig, TransomTableConfig} from "../../utils/utils";
 
-
+const ColIndexStr = 'colIndex'
 const tableContentClassName = 't-table__content';
 export default {
   name: "baseProTable",
@@ -509,7 +509,7 @@ export default {
     // 使用序号下标
     useIndex: {
       type: Boolean,
-      default: false
+      default: true
     },
 
     expandId: {
@@ -636,6 +636,19 @@ export default {
   },
   mixins: [tableSectionMixins],
   methods: {
+      /**
+       * 初始化表格下标
+       */
+      initTableIndex() {
+        if (this.$props.useIndex) {
+          this.tableConfigColumnList.unshift({
+            key: ColIndexStr,
+            colKey: ColIndexStr,
+            label: '序号',
+            title: '序号',
+          })
+        }
+      },
     rehandleExpandChange(value, params) {
       this.$emit('rehandleExpandChange', value)
     },
@@ -648,6 +661,7 @@ export default {
     init() {
       this.setTableConfigColumList();
       const {rowKey} = this.$props;
+      this.initTableIndex();
       if (rowKey) {
         this.initTableControl();
       }
@@ -991,9 +1005,14 @@ export default {
         this.refreshData(false);
       } else {
         const {refreshLayout} = this.$props;
+        if (this.$props.useIndex) {
+          const size = this.$props.pageProps[this.$props.pageConfig.size];
+          data.forEach((item, index) => {
+            item[`${ColIndexStr}`] = (((pageNum - 1) * size) + (index+1))
+          })
+        }
         this.tableData = [];
         this.tableData = data;
-
         if (this.tableCheckControl) {
           this.tableCheckControl.onTableChange(
               `${this.rowKey}`,

package/packages/plugin/PluginByReferenceByOss.js

@@ -2,15 +2,15 @@
 exports.__esModule = true;
 exports.PluginByReferenceByOss = void 0;
 var PluginByReferenceByOss = function (Vue) {
-    var metaTag = document.querySelector('meta[name="referrer"][content="no-referrer"]');
-    if (metaTag) {
-        metaTag.remove();
-    }
-    // 创建 meta 元素
-    var metaTagByStrict = document.createElement('meta');
-    metaTagByStrict.name = 'referrer';
-    metaTagByStrict.content = 'strict-origin-when-cross-origin';
-    // 添加到 head
-    document.getElementsByTagName('head')[0].appendChild(metaTagByStrict);
+    // const metaTag = document.querySelector('meta[name="referrer"][content="no-referrer"]');
+    // if (metaTag) {
+    //     metaTag.remove();
+    // }
+    // // 创建 meta 元素
+    // const metaTagByStrict = document.createElement('meta');
+    // metaTagByStrict.name = 'referrer';
+    // metaTagByStrict.content = 'strict-origin-when-cross-origin';
+    // // 添加到 head
+    // document.getElementsByTagName('head')[0].appendChild(metaTagByStrict);
 };
 exports.PluginByReferenceByOss = PluginByReferenceByOss;

package/packages/plugin/PluginByReferenceByOss.ts

@@ -1,13 +1,13 @@
 export const PluginByReferenceByOss = (Vue) => {
-    const metaTag = document.querySelector('meta[name="referrer"][content="no-referrer"]');
-    if (metaTag) {
-        metaTag.remove();
-    }
-    // 创建 meta 元素
-    const metaTagByStrict = document.createElement('meta');
-    metaTagByStrict.name = 'referrer';
-    metaTagByStrict.content = 'strict-origin-when-cross-origin';
-    // 添加到 head
-    document.getElementsByTagName('head')[0].appendChild(metaTagByStrict);
+    // const metaTag = document.querySelector('meta[name="referrer"][content="no-referrer"]');
+    // if (metaTag) {
+    //     metaTag.remove();
+    // }
+    // // 创建 meta 元素
+    // const metaTagByStrict = document.createElement('meta');
+    // metaTagByStrict.name = 'referrer';
+    // metaTagByStrict.content = 'strict-origin-when-cross-origin';
+    // // 添加到 head
+    // document.getElementsByTagName('head')[0].appendChild(metaTagByStrict);
 
 }

package/packages/utils/utils.js

@@ -96,10 +96,7 @@ export const formatHtml = (strHtml) => {
 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)
-        );
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
     }
     const o = {
         "M+": date.getMonth() + 1,
@@ -111,10 +108,7 @@ export const formatDate = (dateObj, fmt = "YYYY-MM-DD hh:mm:ss") => {
     for (let k in o) {
         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)
-            );
+            fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : ("00" + str).substr(str.length));
         }
     }
     return fmt;
@@ -184,86 +178,35 @@ export const filterFileSize = (fileSize) => {
     //console.log(fileSize);
     let fileSizeByte = fileSize;
     let fileSizeMsg = "";
-    if (fileSizeByte < 1048576)
-        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";
-    else if (fileSizeByte > 1048576 && fileSizeByte == 1073741824)
-        fileSizeMsg = "1G";
-    else if (fileSizeByte > 1073741824 && fileSizeByte < 1099511627776)
-        fileSizeMsg = (fileSizeByte / (1024 * 1024 * 1024)).toFixed(1) + "G";
-    else fileSizeMsg = "文件超过1T";
+    if (fileSizeByte < 1048576) 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"; else if (fileSizeByte > 1048576 && fileSizeByte == 1073741824) fileSizeMsg = "1G"; else if (fileSizeByte > 1073741824 && fileSizeByte < 1099511627776) fileSizeMsg = (fileSizeByte / (1024 * 1024 * 1024)).toFixed(1) + "G"; else fileSizeMsg = "文件超过1T";
     return fileSizeMsg;
 };
 
 export const jugeFileTypeKey = (suffix) => {
     let key = null;
-    const jugeArray = [
-        {
-            list: ["jpg", "png"],
-            key: "img",
-        },
-        {
-            list: ["csv", "xlsx", "xls"],
-            key: "Excel",
-        },
-        {
-            list: [
-                "wav",
-                "aif",
-                "au",
-                "mp3",
-                "ram",
-                "wma",
-                "mmf",
-                "amr",
-                "aac",
-                "flac",
-            ],
-            key: "music",
-        },
+    const jugeArray = [{
+        list: ["jpg", "png"], key: "img",
+    }, {
+        list: ["csv", "xlsx", "xls"], key: "Excel",
+    }, {
+        list: ["wav", "aif", "au", "mp3", "ram", "wma", "mmf", "amr", "aac", "flac",], key: "music",
+    },
 
         {
-            list: ["pdf"],
-            key: "Pdf",
-        },
-        {
-            list: ["ppt", "pptx"],
-            key: "PPT",
-        },
-        {
-            list: [
-                "mp4",
-                "wmv",
-                "3gp",
-                "m4v",
-                "mov",
-                "avi",
-                "dat",
-                "mkv",
-                "flv",
-                "vob",
-            ],
-            key: "shipin",
-        },
-        {
-            list: ["txt"],
-            key: "txt",
-        },
-        {
-            list: ["doc", "docx"],
-            key: "Word",
-        },
-        {
-            list: ["rar", "zip", "arj", "z"],
-            key: "yasuobao",
-        },
-        {
-            list: ["exe"],
-            key: "Exe",
-        },
-    ];
+            list: ["pdf"], key: "Pdf",
+        }, {
+            list: ["ppt", "pptx"], key: "PPT",
+        }, {
+            list: ["mp4", "wmv", "3gp", "m4v", "mov", "avi", "dat", "mkv", "flv", "vob",], key: "shipin",
+        }, {
+            list: ["txt"], key: "txt",
+        }, {
+            list: ["doc", "docx"], key: "Word",
+        }, {
+            list: ["rar", "zip", "arj", "z"], key: "yasuobao",
+        }, {
+            list: ["exe"], key: "Exe",
+        },];
     for (let i = 0; i < jugeArray.length; i++) {
         const is = jugeArray[i].list.includes(suffix);
         if (is) {
@@ -323,19 +266,11 @@ export const judgeButtonPermission = (permissionList, params) => {
     return flag;
 };
 
-export const isDOM =
-    typeof HTMLElement === "object"
-        ? function (obj) {
-            return obj instanceof HTMLElement;
-        }
-        : function (obj) {
-            return (
-                obj &&
-                typeof obj === "object" &&
-                obj.nodeType === 1 &&
-                typeof obj.nodeName === "string"
-            );
-        };
+export const isDOM = typeof HTMLElement === "object" ? function (obj) {
+    return obj instanceof HTMLElement;
+} : function (obj) {
+    return (obj && typeof obj === "object" && obj.nodeType === 1 && typeof obj.nodeName === "string");
+};
 
 export const fromUrlToDownFile = (url) => {
     let a = document.createElement("a");
@@ -394,4 +329,16 @@ export const TableFooterSummary = (tableData, key) => {
         }, 0);
     }
     return 0;
+}
+
+export const getStartOfDayTimestamp = () => {
+    const now = new Date();
+    const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    return startOfDay.getTime();
+}
+
+export const getEndOfDayTimestamp = () => {
+    const now = new Date();
+    const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
+    return endOfDay.getTime();
 }