vxe-pc-ui 4.16.4 → 4.16.6

package/packages/list/src/list.ts

@@ -420,7 +420,12 @@ export default defineVxeComponent({
       const el = refElem.value
       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
         updateHeight()
         if (el.clientWidth && el.clientHeight) {
           return computeScrollLoad()
@@ -1164,7 +1169,7 @@ export default defineVxeComponent({
       return updateCheckboxStatus()
     }
 
-    const getCheckboxRows = () => {
+    const getCheckboxRecords = () => {
       const { updateCheckboxFlag } = reactData
       const { selectCheckboxMaps } = internalData
       const rowList: string[] = []
@@ -1517,7 +1522,8 @@ export default defineVxeComponent({
       clearRadioRow,
       setCheckboxRow,
       setCheckboxRowByKey,
-      getCheckboxRows,
+      getCheckboxRecords,
+      getCheckboxRows: getCheckboxRecords,
       getCheckboxRowKeys,
       clearCheckboxRow,
       setAllCheckboxRow,
@@ -1616,6 +1622,12 @@ export default defineVxeComponent({
       isRemoveByRow (row) {
         const rowid = getRowId(row)
         return !!reactData.removeRowFlag && !!internalData.removeRowMaps[rowid]
+      },
+      getRecordset () {
+        return {
+          insertRecords: $xeList.getInsertRecords(),
+          removeRecords: $xeList.getRemoveRecords()
+        }
       }
     }
 
@@ -1930,6 +1942,16 @@ export default defineVxeComponent({
       }
 
       const ctVNs: VNode[] = []
+      if (showRadio) {
+        ctVNs.push(
+          renderRadio(row, rowid, isRadioChecked)
+        )
+      }
+      if (showCheckbox) {
+        ctVNs.push(
+          renderCheckbox(row, rowid, isCheckboxChecked)
+        )
+      }
       let isDragDisabled = false
       if (isDrag && keyField && (!visibleMethod || visibleMethod(rowParams))) {
         const handleOns: {
@@ -1961,16 +1983,6 @@ export default defineVxeComponent({
           ])
         )
       }
-      if (showRadio) {
-        ctVNs.push(
-          renderRadio(row, rowid, isRadioChecked)
-        )
-      }
-      if (showCheckbox) {
-        ctVNs.push(
-          renderCheckbox(row, rowid, isCheckboxChecked)
-        )
-      }
       ctVNs.push(
         h('div', {
           key: 'ct5',

package/packages/tree/src/tree.ts

@@ -1819,6 +1819,9 @@ export default defineVxeComponent({
         return nodeKeys
       },
       getCheckboxNodes () {
+        return $xeTree.getCheckboxRecords()
+      },
+      getCheckboxRecords () {
         const { nodeMaps, selectCheckboxMaps } = internalData
         const list: any[] = []
         XEUtils.each(selectCheckboxMaps, (item, nodeid) => {
@@ -2223,7 +2226,13 @@ export default defineVxeComponent({
         const nodeid = getNodeId(node)
         return !!reactData.removeNodeFlag && !!internalData.removeNodeMaps[nodeid]
       },
-      closeTooltip
+      closeTooltip,
+      getRecordset () {
+        return {
+          insertRecords: $xeTree.getInsertRecords(),
+          removeRecords: $xeTree.getRemoveRecords()
+        }
+      }
     }
 
     const handleNodeDragEndClearStatus = () => {
@@ -3210,9 +3219,9 @@ export default defineVxeComponent({
                     ])
               ]
             : []),
-          renderDragIcon(node, nodeid),
           renderRadio(node, nodeid, isExistChild, nLevel, isRadioChecked),
           renderCheckbox(node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate),
+          renderDragIcon(node, nodeid),
           h('div', {
             class: 'vxe-tree--node-item-inner'
           }, [
@@ -3517,6 +3526,7 @@ export default defineVxeComponent({
         internalData.resizeObserver = resizeObserver
       }
 
+      recalculate()
       globalEvents.on($xeTree, 'resize', handleGlobalResizeEvent)
     })
 

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/styles/components/menu.scss

@@ -114,7 +114,9 @@
 }
 
 .vxe-menu--item-group {
-  display: none;
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.3s ease-in-out;
 }
 .vxe-menu--item-wrapper {
   &.is--active {
@@ -130,7 +132,7 @@
   }
   &.is--expand {
     & > .vxe-menu--item-group {
-      display: block;
+      max-height: 1000px;
     }
   }
 }

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

@@ -68,11 +68,15 @@ export namespace VxeIconPickerPropTypes {
     trigger?: 'default' | 'icon' | 'manual' | '' | null
     transfer?: boolean
     /**
-     * 分块显示多少个图标
+     * 每行显示出多少个图标，如果设置了 chunkWidth 则该参数无效
      */
     chunkSize?: number
     /**
-     * 图标展示方式，支持分块和列表
+     * 每个图标的宽度
+     */
+    chunkWidth?: number | string
+    /**
+     * 宽度
      */
     width?: number | string
     height?: number | string
@@ -122,7 +126,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

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