shijiplus-web-plugin 0.1.54 → 0.1.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shijiplus-web-plugin",
-  "version": "0.1.54",
+  "version": "0.1.56",
   "files": [
     "src"
   ],

package/src/components/begin-end-date-picker/begin-end-date-picker.vue

@@ -78,6 +78,16 @@ export default {
       // 结束日期的占位符
       default: '结束时间'
     },
+    initialDate: {
+      // 初始时间
+      type: [Object],
+      default() {
+        return {
+          begin: null,
+          end: null
+        }
+      }
+    },
     min: {
       // 允许的最小日期，可以是对象或字符串
       default() {
@@ -150,6 +160,19 @@ export default {
       deep: true,
       immediate: true
     },
+    initialDate: {
+      // 监听format属性变化
+      handler(val) {
+        if (val.begin) {
+          this.beginChange(this.$formatDate(val.begin, this.beginFormat))
+        }
+        if (val.end) {
+          this.endChange(this.$formatDate(val.end, this.endFormat))
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     begin: {
       // 监听begin属性变化
       handler(val) {

package/src/components/plus-comp/plus-table/plus-table.vue

@@ -325,63 +325,70 @@ export default {
     }
   },
   methods: {
-    calcTableHeight(count) {
-      this.$nextTick(() => {
-        let tHeight = this.$refs.plusTableInnerRef.clientHeight
-        if (!tHeight && count < 3) {
+    getClientHeight(count) {
+      let clientHeight = this.$refs.plusTableInnerRef.clientHeight
+      if (!clientHeight && count < 3) {
+        return new Promise((resolve) => {
           setTimeout(() => {
-            this.calcTableHeight(count + 1)
+            resolve(this.getClientHeight(count + 1))
           }, 100)
-          return
-        }
+        })
+      }
+      return Promise.resolve(clientHeight)
+    },
+    calcTableHeight() {
+      this.$nextTick(() => {
         let tableWidth = this.$refs.plusTableInnerRef.clientWidth
+        this.getClientHeight(0).then((tHeight) => {
+          // 获取元素的所有计算样式
+          var styles = window.getComputedStyle(this.$refs.plusTableInnerRef)
 
-        // 获取元素的所有计算样式
-        var styles = window.getComputedStyle(this.$refs.plusTableInnerRef)
-
-        var styleHeight = parseFloat(styles.getPropertyValue('height'))
-        // 如果您只想获取特定方向的padding值，例如padding-top
-        var paddingLeft = parseFloat(styles.getPropertyValue('padding-left'))
-        var paddingRight = parseFloat(styles.getPropertyValue('padding-right'))
-        var paddingTop = parseFloat(styles.getPropertyValue('padding-top'))
-        var paddingBottom = parseFloat(
-          styles.getPropertyValue('padding-bottom')
-        )
-        if (paddingLeft) {
-          tableWidth -= paddingLeft
-        }
-        if (paddingRight) {
-          tableWidth -= paddingRight
-        }
-        if (paddingTop) {
-          tHeight -= paddingTop
-        }
-        if (paddingBottom) {
-          tHeight -= paddingBottom
-        }
-        this.tableWidth = tableWidth
-        if (this.$refs.searchAreaRef) {
-          tHeight -= this.$refs.searchAreaRef.clientHeight
-        }
-        if (this.$refs.headerRef) {
-          tHeight -= this.$refs.headerRef.clientHeight
-        }
-        if (this.$refs.footerRef) {
-          tHeight -= this.$refs.footerRef.clientHeight
-        }
-        if (this.fixedHeader) {
-          this.height = tHeight
-        } else {
-          let tableWrap =
-            this.$refs.plusTableInnerRef.getElementsByClassName(
-              'ivu-table-wrapper'
-            )[0]
-          if (tableWrap) {
-            if (!this.data.data || !this.data.data.length) {
-              tableWrap.style.minHeight = tHeight + 'px'
+          var styleHeight = parseFloat(styles.getPropertyValue('height'))
+          // 如果您只想获取特定方向的padding值，例如padding-top
+          var paddingLeft = parseFloat(styles.getPropertyValue('padding-left'))
+          var paddingRight = parseFloat(
+            styles.getPropertyValue('padding-right')
+          )
+          var paddingTop = parseFloat(styles.getPropertyValue('padding-top'))
+          var paddingBottom = parseFloat(
+            styles.getPropertyValue('padding-bottom')
+          )
+          if (paddingLeft) {
+            tableWidth -= paddingLeft
+          }
+          if (paddingRight) {
+            tableWidth -= paddingRight
+          }
+          if (paddingTop) {
+            tHeight -= paddingTop
+          }
+          if (paddingBottom) {
+            tHeight -= paddingBottom
+          }
+          this.tableWidth = tableWidth
+          if (this.$refs.searchAreaRef) {
+            tHeight -= this.$refs.searchAreaRef.clientHeight
+          }
+          if (this.$refs.headerRef) {
+            tHeight -= this.$refs.headerRef.clientHeight
+          }
+          if (this.$refs.footerRef) {
+            tHeight -= this.$refs.footerRef.clientHeight
+          }
+          if (this.fixedHeader) {
+            this.height = tHeight
+          } else {
+            let tableWrap =
+              this.$refs.plusTableInnerRef.getElementsByClassName(
+                'ivu-table-wrapper'
+              )[0]
+            if (tableWrap) {
+              if (!this.data.data || !this.data.data.length) {
+                tableWrap.style.minHeight = tHeight + 'px'
+              }
             }
           }
-        }
+        })
       })
     },
     slotValue(col, row) {