lshcom 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lshcom",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "files": [
     "src/assets/*",
     "src/common/common.js",

package/src/common/common.js

@@ -530,6 +530,7 @@ Date.prototype.Format = function (fmt = 'yyyy-MM-dd hh:mm:ss') {
     var o = {
         "M+": this.getMonth() + 1,
         "d+": this.getDate(),
+        "H+": this.getHours(),
         "h+": this.getHours(),
         "m+": this.getMinutes(),
         "s+": this.getSeconds(),

package/src/common/global.js

@@ -41,9 +41,28 @@ const global = {
     number(val = '') {return val.replace(/[^\d]/g,'')}, // 只保留数字
     decimals2(val = '') {return val.replace(/[^\d.]/g,'').replace(/\.{2,}/g,'.').replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')}, // 保留两位小数
   },
-  format(date, fmt = 'yyyy-MM-dd hh:mm:ss') {
+  format(date, fmt = 'yyyy-MM-dd HH:mm:ss') {
     if(!date) return ''
-    return new Date(date).Format(fmt)
+    const newDate = new Date(date)
+    var o = {
+      "M+": newDate.getMonth() + 1,
+      "d+": newDate.getDate(),
+      "H+": newDate.getHours(),
+      "h+": newDate.getHours(),
+      "m+": newDate.getMinutes(),
+      "s+": newDate.getSeconds(),
+      "q+": Math.floor((newDate.getMonth() + 3) / 3),
+      "S": newDate.getMilliseconds()
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (newDate.getFullYear() + "").substr(4 - RegExp.$1.length))
+    for (var k in o) {
+      if (new RegExp("(" + k + ")").test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1)
+          ? (o[ k ])
+          : (("00" + o[ k ]).substr(("" + o[ k ]).length)))
+      }
+    }
+    return fmt
   },
   open(url){window.open(origin + url, "_blank")},
   uploadUrl: cxb + '/v1/fileSys/file/upload',

package/src/components/el/DatePicker.vue

@@ -14,6 +14,7 @@
     :picker-options="pickerOptions"
     :range-separator="rangeSeparator"
     :default-value="defaultValue"
+    :default-time="defaultTime"
     @change="change">
   </el-date-picker>
 </template>
@@ -33,6 +34,7 @@
       align: {type: String, default: 'left'}, // 对齐方式 left/center/right
       rangeSeparator: {type: String, default: ' - '}, // 选择范围时的分隔符
       defaultValue: [String, Number, Array, Date], // 可选，DatePicker打开时默认显示的时间，可被new Date()解析
+      defaultTime: {type: Array, default: () => (['00:00:00', '23:59:59'])}, // 选中日期后的默认具体时刻，非范围选择时：形如12:00:00的字符串；范围选择时：数组，长度为 2，每项值为字符串，形如12:00:00，第一项指定开始日期的时刻，第二项指定结束日期的时刻。不指定会使用时刻 00:00:00
       maxDate: {type: Number, default: 0}, // 可选，设置最大可选时间（天数）
       valueFormat: {type: String, default: ''}, // 可选，绑定值的格式。不指定则绑定值为 Date 对象
     },
@@ -65,43 +67,47 @@
       };
     },
     watch: {
-      value: function (val, oldVal) {
-        if(['daterange'].includes(this.type)){
-          if (!val || !val.length) {
-            this.change()
-          } else if(val[0] !== this.date[0] || val[1] !== this.date[1]){
-            this.change(val[0] + this.rangeSeparator + val[1])
+      value: {
+        handler (val, oldVal) {
+          if(['daterange','datetimerange'].includes(this.type)){
+            if (!val || !val.length) {
+              this.change()
+            } else if(val[0] !== this.date[0] || val[1] !== this.date[1]){
+              this.change(val[0] + this.rangeSeparator + val[1])
+            }
+          } else {
+            this.date = val
           }
-        } else {
-          this.date = val
-        }
+        },
+        immediate: true,
+        deep: true,
       },
     },
     mounted() {
-      this.date = this.value
+      
     },
     methods: {
       change(value){
-        if(['daterange'].includes(this.type)){
+        if(['daterange','datetimerange'].includes(this.type)){
           if (!value) {
             value = [undefined, undefined]
           } else {
-            let valueArr = value.split(this.rangeSeparator)
+            let valueArr = this.global.getType(value) == 'string' ? value.split(this.rangeSeparator) : value
             if(this.valueFormat){
               value = [
-                valueArr[0] ? new Date(valueArr[0]).Format(this.valueFormat) : undefined,
-                valueArr[1] ? new Date(valueArr[1]).Format(this.valueFormat) : undefined,
+                valueArr[0] ? this.global.format(valueArr[0],this.valueFormat) : undefined,
+                valueArr[1] ? this.global.format(valueArr[1],this.valueFormat) : undefined,
               ]
             }else{
               value = [
-                valueArr[0] ? new Date(valueArr[0]).Format('yyyy-MM-dd') + ' 00:00:00' : undefined,
-                valueArr[1] ? new Date(valueArr[1]).Format('yyyy-MM-dd') + ' 23:59:59' : undefined,
+                valueArr[0] ? this.global.format(valueArr[0],'yyyy-MM-dd') + ' 00:00:00' : undefined,
+                valueArr[1] ? this.global.format(valueArr[1],'yyyy-MM-dd') + ' 23:59:59' : undefined,
               ]
             }
           }
         } else if(['date'].includes(this.type)){
           if(this.valueFormat && value){
-            value = new Date(value).Format(this.valueFormat)
+            value = this.global.format(value,this.valueFormat)
           }
         }
         this.date = value
@@ -110,4 +116,8 @@
       },
     }
   };
-</script>
+</script>
+
+<style lang="scss" scoped>
+.el-range-editor.el-input__inner{max-width: 100%;}
+</style>

package/src/components/el/Page.vue

@@ -43,22 +43,19 @@
         this.currentPage = val
         this.change()
       },
-      change(){
+      change(pageStart, pageNums){
+        if(pageStart || pageNums){
+          this.reset(pageStart, pageNums)
+        }
         this.$emit('change', {
           pageStart: this.currentPage,
           pageNums: this.pageSize
         })
       },
-      reset(){
-        this.currentPage = this.pageStart
-        this.pageSize = this.pageNums
-      },
-      resetCurrent(currentPage){
-        if (this.currentPage != currentPage) {
-          this.currentPage = currentPage
-        } else {
-          this.change()
-        }
+      // 重置页数和个数，但不触发change
+      reset(pageStart, pageNums){
+        this.currentPage = pageStart ? pageStart : this.pageStart
+        this.pageSize = pageNums ? pageNums : this.pageNums
       },
     }
   };

package/src/components/el/Table.vue

@@ -67,9 +67,9 @@
         });
       },
       // 从默认第一页开始获取数据
-      resetData(currentPage = 1){
+      resetData(pageStart = 1, pageNums){
         if(this.ifPage) {
-          this.$refs.ElePage.resetCurrent(currentPage)
+          this.$refs.ElePage.change(pageStart, pageNums)
         } else {
           this.getData({})
         }