vxe-table 3.3.14-beta.0 → 3.3.14-beta.1

package/packages/form/src/render.js

@@ -0,0 +1,79 @@
+import GlobalConfig from '../../v-x-e-table/src/conf'
+import VXETable from '../../v-x-e-table'
+import { UtilTools, isEnableConf } from '../../tools'
+
+function renderPrefixIcon (h, titlePrefix) {
+  return h('span', {
+    class: 'vxe-form--item-title-prefix'
+  }, [
+    h('i', {
+      class: titlePrefix.icon || GlobalConfig.icon.FORM_PREFIX
+    })
+  ])
+}
+
+function renderSuffixIcon (h, titleSuffix) {
+  return h('span', {
+    class: 'vxe-form--item-title-suffix'
+  }, [
+    h('i', {
+      class: titleSuffix.icon || GlobalConfig.icon.FORM_SUFFIX
+    })
+  ])
+}
+
+export function renderTitle (h, _vm, item) {
+  const { data } = _vm
+  const { slots, field, itemRender, titlePrefix, titleSuffix } = item
+  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
+  const params = { data, property: field, item, $form: _vm }
+  const contVNs = []
+  const titVNs = []
+  if (titlePrefix) {
+    titVNs.push(
+      titlePrefix.message
+        ? h('vxe-tooltip', {
+          props: {
+            content: UtilTools.getFuncText(titlePrefix.message),
+            enterable: titlePrefix.enterable,
+            theme: titlePrefix.theme
+          }
+        }, [
+          renderPrefixIcon(h, titlePrefix)
+        ])
+        : renderPrefixIcon(h, titlePrefix)
+    )
+  }
+  titVNs.push(
+    h('span', {
+      class: 'vxe-form--item-title-label'
+    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : UtilTools.getFuncText(item.title)))
+  )
+  contVNs.push(
+    h('div', {
+      class: 'vxe-form--item-title-content'
+    }, titVNs)
+  )
+  const fixVNs = []
+  if (titleSuffix) {
+    fixVNs.push(
+      titleSuffix.message
+        ? h('vxe-tooltip', {
+          props: {
+            content: UtilTools.getFuncText(titleSuffix.message),
+            enterable: titleSuffix.enterable,
+            theme: titleSuffix.theme
+          }
+        }, [
+          renderSuffixIcon(h, titleSuffix)
+        ])
+        : renderSuffixIcon(h, titleSuffix)
+    )
+  }
+  contVNs.push(
+    h('div', {
+      class: 'vxe-form--item-title-postfix'
+    }, fixVNs)
+  )
+  return contVNs
+}

package/packages/grid/src/grid.js

@@ -40,8 +40,8 @@ function renderDefaultForm (h, _vm) {
         on: {
           submit: _vm.submitEvent,
           reset: _vm.resetEvent,
-          'submit-invalid': _vm.submitInvalidEvent,
-          'toggle-collapse': _vm.togglCollapseEvent
+          collapse: _vm.collapseEvent,
+          'submit-invalid': _vm.submitInvalidEvent
         },
         scopedSlots: formSlots
       })
@@ -819,9 +819,10 @@ export default {
     submitInvalidEvent (params) {
       this.$emit('form-submit-invalid', Object.assign({ $grid: this }, params))
     },
-    togglCollapseEvent (params) {
+    collapseEvent (params) {
       this.$nextTick(() => this.recalculate(true))
       this.$emit('form-toggle-collapse', Object.assign({ $grid: this }, params))
+      this.$emit('form-collapse', Object.assign({ $grid: this }, params))
     },
     triggerZoomEvent (evnt) {
       this.zoom()

package/packages/table/src/body.js

@@ -574,13 +574,17 @@ export default {
      */
     scrollEvent (evnt) {
       const { $el: scrollBodyElem, $parent: $xetable, fixedType } = this
-      const { $refs, highlightHoverRow, scrollXLoad, scrollYLoad, lastScrollTop, lastScrollLeft } = $xetable
+      const { $refs, elemStore, highlightHoverRow, scrollXLoad, scrollYLoad, lastScrollTop, lastScrollLeft } = $xetable
       const { tableHeader, tableBody, leftBody, rightBody, tableFooter, validTip } = $refs
       const headerElem = tableHeader ? tableHeader.$el : null
       const footerElem = tableFooter ? tableFooter.$el : null
       const bodyElem = tableBody.$el
       const leftElem = leftBody ? leftBody.$el : null
       const rightElem = rightBody ? rightBody.$el : null
+      const bodyYElem = elemStore['main-body-ySpace']
+      const bodyXElem = elemStore['main-body-xSpace']
+      const bodyHeight = bodyYElem ? bodyYElem.clientHeight : 0
+      const bodyWidth = bodyXElem ? bodyXElem.clientWidth : 0
       let scrollTop = scrollBodyElem.scrollTop
       const scrollLeft = bodyElem.scrollLeft
       const isRollX = scrollLeft !== lastScrollLeft
@@ -622,16 +626,20 @@ export default {
       if (isRollX && validTip && validTip.visible) {
         validTip.updatePlacement()
       }
-      $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop, scrollLeft, isX: isRollX, isY: isRollY }, evnt)
+      $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop, scrollLeft, bodyHeight, bodyWidth, isX: isRollX, isY: isRollY }, evnt)
     },
     handleWheel (evnt, isTopWheel, deltaTop, isRollX, isRollY) {
       const { $parent: $xetable } = this
-      const { $refs } = $xetable
+      const { $refs, elemStore } = $xetable
       const { tableBody, leftBody, rightBody } = $refs
       const bodyElem = tableBody.$el
       const leftElem = leftBody ? leftBody.$el : null
       const rightElem = rightBody ? rightBody.$el : null
       const remainSize = this.isPrevWheelTop === isTopWheel ? Math.max(0, this.wheelYSize - this.wheelYTotal) : 0
+      const bodyYElem = elemStore['main-body-ySpace']
+      const bodyXElem = elemStore['main-body-xSpace']
+      const bodyHeight = bodyYElem ? bodyYElem.clientHeight : 0
+      const bodyWidth = bodyXElem ? bodyXElem.clientWidth : 0
       this.isPrevWheelTop = isTopWheel
       this.wheelYSize = Math.abs(isTopWheel ? deltaTop - remainSize : deltaTop + remainSize)
       this.wheelYInterval = 0
@@ -659,7 +667,7 @@ export default {
           }
           this.wheelYTotal = wheelYTotal
           this.wheelYInterval = wheelYInterval
-          $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop: bodyElem.scrollTop, scrollLeft: bodyElem.scrollLeft, isX: isRollX, isY: isRollY }, evnt)
+          $xetable.emitEvent('scroll', { type: renderType, fixed: fixedType, scrollTop: bodyElem.scrollTop, scrollLeft: bodyElem.scrollLeft, bodyHeight, bodyWidth, isX: isRollX, isY: isRollY }, evnt)
         }
       }
       handleSmooth()

package/packages/textarea/src/textarea.js

@@ -21,6 +21,7 @@ export default {
     placeholder: String,
     maxlength: [String, Number],
     rows: { type: [String, Number], default: 2 },
+    cols: { type: [String, Number], default: null },
     showWordCount: Boolean,
     countMethod: Function,
     autosize: [Boolean, Object],
@@ -71,14 +72,16 @@ export default {
     }
   },
   render (h) {
-    const { className, defaultEvents, inputValue, vSize, name, form, resize, placeholder, readonly, disabled, maxlength, autosize, showWordCount, countMethod } = this
+    const { className, defaultEvents, inputValue, vSize, name, form, resize, placeholder, readonly, disabled, maxlength, autosize, showWordCount, countMethod, rows, cols } = this
     const attrs = {
       name,
       form,
       placeholder,
       maxlength,
       readonly,
-      disabled
+      disabled,
+      rows,
+      cols
     }
     if (placeholder) {
       attrs.placeholder = UtilTools.getFuncText(placeholder)
@@ -87,7 +90,9 @@ export default {
       class: ['vxe-textarea', className, {
         [`size--${vSize}`]: vSize,
         'is--autosize': autosize,
-        'is--disabled': disabled
+        'is--disabled': disabled,
+        'def--rows': !XEUtils.eqNull(rows),
+        'def--cols': !XEUtils.eqNull(cols)
       }]
     }, [
       h('textarea', {

package/styles/textarea.scss

@@ -3,7 +3,12 @@
 .vxe-textarea {
   position: relative;
   display: inline-block;
-  width: 100%;
+  &:not(.def--cols) {
+    width: 100%;
+    .vxe-textarea--inner {
+      width: 100%;
+    }
+  }
 }
 
 .vxe-textarea--inner {
@@ -15,6 +20,11 @@
   line-height: inherit;
   border: 1px solid $vxe-input-border-color;
   background-color: $vxe-textarea-background-color;
+  display: block;
+  padding: 0.3em 0.6em;
+  &::placeholder {
+    color: $vxe-input-placeholder-color;
+  }
   &:focus {
     border: 1px solid $vxe-primary-color;
   }
@@ -24,16 +34,6 @@
   }
 }
 
-.vxe-textarea--inner {
-  width: 100%;
-  height: 100%;
-  display: block;
-  padding: 0.3em 0.6em;
-  &::placeholder {
-    color: $vxe-input-placeholder-color;
-  }
-}
-
 .vxe-textarea--inner,
 .vxe-textarea--autosize {
   line-height: $vxe-textarea-line-height;