vxe-pc-ui 3.16.4 → 3.16.6

package/packages/list/src/list.ts

@@ -583,7 +583,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const el = $xeList.$refs.refElem as HTMLDivElement
       if (el) {
         const parentEl = el.parentElement
-        reactData.parentHeight = parentEl ? parentEl.clientHeight : 0
+        let parentHeight = 0
+        if (parentEl) {
+          const parentStyle = getComputedStyle(parentEl)
+          parentHeight = parentEl.clientHeight - Math.ceil(XEUtils.toNumber(parentStyle.paddingLeft) + XEUtils.toNumber(parentStyle.paddingRight))
+        }
+        reactData.parentHeight = parentHeight
         $xeList.updateHeight()
         if (el.clientWidth && el.clientHeight) {
           return $xeList.computeScrollLoad()
@@ -837,7 +842,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       $xeList.emitCheckboxMode(value)
       return $xeList.updateCheckboxStatus()
     },
-    getCheckboxRows () {
+    getCheckboxRecords () {
       const $xeList = this
       const reactData = $xeList.reactData
       const internalData = $xeList.internalData
@@ -854,6 +859,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return rowList
     },
+    getCheckboxRows () {
+      const $xeList = this
+
+      return $xeList.getCheckboxRecords()
+    },
     getCheckboxRowKeys () {
       const $xeList = this
       const reactData = $xeList.reactData
@@ -1689,6 +1699,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const rowid = $xeList.getRowId(row)
       return !!reactData.removeRowFlag && !!internalData.removeRowMaps[rowid]
     },
+    getRecordset () {
+      const $xeList = this
+
+      return {
+        insertRecords: $xeList.getInsertRecords(),
+        removeRecords: $xeList.getRemoveRecords()
+      }
+    },
     handleCrossListRowDragCancelEvent () {
       const $xeList = this
 
@@ -2078,6 +2096,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
 
       const ctVNs: VNode[] = []
+      if (showRadio) {
+        ctVNs.push(
+          $xeList.renderRadio(h, row, rowid, isRadioChecked)
+        )
+      }
+      if (showCheckbox) {
+        ctVNs.push(
+          $xeList.renderCheckbox(h, row, rowid, isCheckboxChecked)
+        )
+      }
       let isDragDisabled = false
       if (isDrag && keyField && (!visibleMethod || visibleMethod(rowParams))) {
         const handleOns: {
@@ -2109,16 +2137,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
           ])
         )
       }
-      if (showRadio) {
-        ctVNs.push(
-          $xeList.renderRadio(h, row, rowid, isRadioChecked)
-        )
-      }
-      if (showCheckbox) {
-        ctVNs.push(
-          $xeList.renderCheckbox(h, row, rowid, isCheckboxChecked)
-        )
-      }
       ctVNs.push(
         h('div', {
           key: 'ct5',

package/packages/tree/src/tree.ts

@@ -2099,6 +2099,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return $xeTree.$nextTick()
     },
+    getRecordset () {
+      const $xeTree = this
+
+      return {
+        insertRecords: $xeTree.getInsertRecords(),
+        removeRecords: $xeTree.getRemoveRecords()
+      }
+    },
     handleContextmenuEvent (evnt: MouseEvent, node: any) {
       const $xeTree = this
       const props = $xeTree
@@ -2618,6 +2626,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     getCheckboxNodes () {
       const $xeTree = this
+
+      return $xeTree.getCheckboxRecords()
+    },
+    getCheckboxRecords () {
+      const $xeTree = this
       const internalData = $xeTree.internalData
 
       const { nodeMaps, selectCheckboxMaps } = internalData
@@ -3544,9 +3557,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
                     ])
               ]
             : []),
-          $xeTree.renderDragIcon(h, node, nodeid),
           $xeTree.renderRadio(h, node, nodeid, isExistChild, nLevel, isRadioChecked),
           $xeTree.renderCheckbox(h, node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate),
+          $xeTree.renderDragIcon(h, node, nodeid),
           h('div', {
             class: 'vxe-tree--node-item-inner'
           }, [
@@ -3892,6 +3905,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       internalData.resizeObserver = resizeObserver
     }
 
+    $xeTree.recalculate()
     globalEvents.on($xeTree, 'resize', $xeTree.handleGlobalResizeEvent)
   },
   beforeDestroy () {

package/styles/components/icon-picker.scss

@@ -122,12 +122,6 @@
   }
 }
 
-.vxe-ico-picker--all-list {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
-
 .vxe-ico-picker--list-wrapper {
   overflow-x: hidden;
   overflow-y: auto;
@@ -138,12 +132,12 @@
 .vxe-ico-picker--list {
   display: flex;
   flex-direction: row;
+  flex-wrap: wrap;
 }
 .vxe-ico-picker--item {
   display: flex;
   flex-direction: column;
-  min-width: 4.8em;
-  width: var(--vxe-ui-icon-picker-item-width, 4.8em);
+  width: var(--vxe-ui-icon-picker-item-width, 25%);
   padding: var(--vxe-ui-layout-padding-half);
   .vxe-ico-picker--item-inner {
     padding: 0.2em;
@@ -206,6 +200,7 @@
   font-size: var(--vxe-ui-ico-picker-current-font-size);
   color: var(--vxe-ui-font-color);
   text-align: left;
+  width: 20em;
   &:not(.is--transfer) {
     min-width: 100%;
   }

package/types/components/icon-picker.d.ts

@@ -61,11 +61,15 @@ export namespace VxeIconPickerPropTypes {
     trigger?: 'default' | 'icon' | 'manual' | '' | null
     transfer?: boolean
     /**
-     * 分块显示多少个图标
+     * 每行显示出多少个图标，如果设置了 chunkWidth 则该参数无效
      */
     chunkSize?: number
     /**
-     * 图标展示方式，支持分块和列表
+     * 每个图标的宽度
+     */
+    chunkWidth?: number | string
+    /**
+     * 宽度
      */
     width?: number | string
     height?: number | string
@@ -115,7 +119,7 @@ export interface IconPickerReactData {
   isAniVisible: boolean
   isActivated: boolean
   searchValue: string
-  iconGroups: VxeIconPickerDefines.IconItemObj[][]
+  iconList: VxeIconPickerDefines.IconItemObj[]
 }
 
 export interface IconPickerInternalData {

package/types/components/list.d.ts

@@ -440,6 +440,10 @@ export interface ListMethods<D = any> {
    * 只对 show-checkbox 有效，根据主键设置复选框
    */
   setCheckboxRowByKey(rowKeys: string | number | null | undefined | (string | number | null | undefined)[], checked: boolean): Promise<void>
+  /**
+   * 只对 show-checkbox 有效，获取复选框已选的行
+   */
+  getCheckboxRecords(): D[]
   /**
    * 只对 show-checkbox 有效，获取复选框已选的行
    */
@@ -492,6 +496,14 @@ export interface ListMethods<D = any> {
    * 判断数据是否被删除
    */
   isRemoveByRow(row: any | null): boolean
+  /**
+   * 获取列表数据集
+   * 获取新增、删除的数据
+   */
+  getRecordset(): {
+    insertRecords: D[]
+    removeRecords: D[]
+  }
 }
 export interface VxeListMethods<D = any> extends ListMethods<D> { }
 

package/types/components/tree.d.ts

@@ -537,6 +537,10 @@ export interface TreeMethods<D = any> {
    * 只对 show-checkbox 有效，获取复选框的节点
    */
   getCheckboxNodes(): D[]
+  /**
+   * 只对 show-checkbox 有效，获取复选框的节点
+   */
+  getCheckboxRecords(): D[]
   /**
    * 用于 showCheckbox，手动清空复选框的
    */
@@ -717,6 +721,14 @@ export interface TreeMethods<D = any> {
    * 手动关闭工具提示
    */
   closeTooltip(): Promise<void>
+  /**
+   * 获取列表数据集
+   * 获取新增、删除的数据
+   */
+  getRecordset(): {
+    insertRecords: D[]
+    removeRecords: D[]
+  }
 }
 export interface VxeTreeMethods<D = any> extends TreeMethods<D> { }