vxe-pc-ui 4.15.11 → 4.15.13

package/es/table-transfer/index.js

@@ -0,0 +1,12 @@
+import { VxeUI } from '@vxe-ui/core';
+import VxeTableTransferComponent from './src/table-transfer';
+import { dynamicApp } from '../dynamics';
+export const VxeTableTransfer = Object.assign({}, VxeTableTransferComponent, {
+    install(app) {
+        app.component(VxeTableTransferComponent.name, VxeTableTransferComponent);
+    }
+});
+dynamicApp.use(VxeTableTransfer);
+VxeUI.component(VxeTableTransferComponent);
+export const TableTransfer = VxeTableTransfer;
+export default VxeTableTransfer;

package/es/table-transfer/src/table-transfer.js

@@ -0,0 +1,65 @@
+import { ref, h, reactive, onBeforeUnmount } from 'vue';
+import { defineVxeComponent } from '../../ui/src/comp';
+import XEUtils from 'xe-utils';
+import { getConfig, createEvent } from '../../ui';
+function createReactData() {
+    return {};
+}
+function createInternalData() {
+    return {};
+}
+export default defineVxeComponent({
+    name: 'VxeTableTransfer',
+    props: {
+        modelValue: Array,
+        options: Array,
+        size: {
+            type: String,
+            default: () => getConfig().tableTransfer.size || getConfig().size
+        }
+    },
+    emits: [],
+    setup(props, context) {
+        const { emit } = context;
+        const xID = XEUtils.uniqueId();
+        const refElem = ref();
+        const reactData = reactive(createReactData());
+        const internalData = createInternalData();
+        const refMaps = {
+            refElem
+        };
+        const computeMaps = {};
+        const $xeTableTransfer = {
+            xID,
+            props,
+            context,
+            reactData,
+            internalData,
+            getRefMaps: () => refMaps,
+            getComputeMaps: () => computeMaps
+        };
+        const dispatchEvent = (type, params, evnt) => {
+            emit(type, createEvent(evnt, { $tableTransfer: $xeTableTransfer }, params));
+        };
+        const tableTransferMethods = {
+            dispatchEvent
+        };
+        const tableTransferPrivateMethods = {};
+        Object.assign($xeTableTransfer, tableTransferMethods, tableTransferPrivateMethods);
+        const renderVN = () => {
+            return h('div', {
+                ref: refElem,
+                class: 'vxe-table-transfer'
+            }, []);
+        };
+        onBeforeUnmount(() => {
+            XEUtils.assign(reactData, createReactData());
+            XEUtils.assign(internalData, createInternalData());
+        });
+        $xeTableTransfer.renderVN = renderVN;
+        return $xeTableTransfer;
+    },
+    render() {
+        return this.renderVN();
+    }
+});

package/es/transfer/index.js

@@ -0,0 +1,12 @@
+import { VxeUI } from '@vxe-ui/core';
+import VxeTransferComponent from './src/transfer';
+import { dynamicApp } from '../dynamics';
+export const VxeTransfer = Object.assign({}, VxeTransferComponent, {
+    install(app) {
+        app.component(VxeTransferComponent.name, VxeTransferComponent);
+    }
+});
+dynamicApp.use(VxeTransfer);
+VxeUI.component(VxeTransferComponent);
+export const Transfer = VxeTransfer;
+export default VxeTransfer;

package/es/transfer/src/transfer.js

@@ -0,0 +1,91 @@
+import { ref, h, reactive, onBeforeUnmount } from 'vue';
+import { defineVxeComponent } from '../../ui/src/comp';
+import XEUtils from 'xe-utils';
+import { getConfig, createEvent, renderEmptyElement } from '../../ui';
+function createReactData() {
+    return {};
+}
+function createInternalData() {
+    return {};
+}
+export default defineVxeComponent({
+    name: 'VxeTransfer',
+    props: {
+        modelValue: Array,
+        options: Array,
+        size: {
+            type: String,
+            default: () => getConfig().transfer.size || getConfig().size
+        }
+    },
+    emits: [],
+    setup(props, context) {
+        const { emit, slots } = context;
+        const xID = XEUtils.uniqueId();
+        const refElem = ref();
+        const reactData = reactive(createReactData());
+        const internalData = createInternalData();
+        const refMaps = {
+            refElem
+        };
+        const computeMaps = {};
+        const $xeTransfer = {
+            xID,
+            props,
+            context,
+            reactData,
+            internalData,
+            getRefMaps: () => refMaps,
+            getComputeMaps: () => computeMaps
+        };
+        const dispatchEvent = (type, params, evnt) => {
+            emit(type, createEvent(evnt, { $transfer: $xeTransfer }, params));
+        };
+        const transferMethods = {
+            dispatchEvent
+        };
+        const transferPrivateMethods = {};
+        Object.assign($xeTransfer, transferMethods, transferPrivateMethods);
+        const renderVN = () => {
+            const headerSlot = slots.header;
+            const footerSlot = slots.footer;
+            return h('div', {
+                ref: refElem,
+                class: 'vxe-transfer'
+            }, [
+                headerSlot
+                    ? h('div', {
+                        class: 'vxe-transfer--header'
+                    }, headerSlot({ $transfer: $xeTransfer }))
+                    : renderEmptyElement($xeTransfer),
+                h('div', {
+                    class: 'vxe-transfer--body'
+                }, [
+                    h('div', {
+                        class: 'vxe-transfer--left-wrapper'
+                    }),
+                    h('div', {
+                        class: 'vxe-transfer--buttons-wrapper'
+                    }),
+                    h('div', {
+                        class: 'vxe-transfer--right-wrapper'
+                    })
+                ]),
+                footerSlot
+                    ? h('div', {
+                        class: 'vxe-transfer--footer'
+                    }, footerSlot({ $transfer: $xeTransfer }))
+                    : renderEmptyElement($xeTransfer)
+            ]);
+        };
+        onBeforeUnmount(() => {
+            XEUtils.assign(reactData, createReactData());
+            XEUtils.assign(internalData, createInternalData());
+        });
+        $xeTransfer.renderVN = renderVN;
+        return $xeTransfer;
+    },
+    render() {
+        return this.renderVN();
+    }
+});

package/es/transfer/style.css

@@ -0,0 +1,4 @@
+.vxe-transfer--body {
+  display: flex;
+  flex-direction: row;
+}

package/es/transfer/style.min.css

@@ -0,0 +1 @@
+.vxe-transfer--body{display:flex;flex-direction:row}

package/es/tree/src/tree.js

@@ -1,13 +1,13 @@
 import { ref, h, reactive, computed, watch, onBeforeUnmount, nextTick, onMounted, provide } from 'vue';
 import { defineVxeComponent } from '../../ui/src/comp';
 import { VxeUI, createEvent, useSize, globalEvents, globalResize, renderEmptyElement } from '../../ui';
-import { calcTreeLine, enNodeValue, deNodeValue } from './util';
+import { calcTreeLine } from './util';
 import { createComponentLog } from '../../ui/src/log';
 import { getCrossTreeDragNodeInfo } from './store';
 import XEUtils from 'xe-utils';
 import { getSlotVNs } from '../../ui/src/vn';
 import { toCssUnit, isScale, getPaddingTopBottomSize, addClass, removeClass, getTpImg, hasControlKey, getEventTargetNode } from '../../ui/src/dom';
-import { isEnableConf } from '../../ui/src/utils';
+import { isEnableConf, enModelValue, deModelValue } from '../../ui/src/utils';
 import { moveRowAnimateToTb, clearRowAnimate } from '../../ui/src/anime';
 import VxeLoadingComponent from '../../loading';
 const { errLog } = createComponentLog('tree');
@@ -139,19 +139,13 @@ export default defineVxeComponent({
             type: Boolean,
             default: () => getConfig().tree.showRadio
         },
-        checkNodeKey: {
-            type: [String, Number],
-            default: () => getConfig().tree.checkNodeKey
-        },
+        checkNodeKey: [String, Number],
         radioConfig: Object,
         showCheckbox: {
             type: Boolean,
             default: () => getConfig().tree.showCheckbox
         },
-        checkNodeKeys: {
-            type: Array,
-            default: () => getConfig().tree.checkNodeKeys
-        },
+        checkNodeKeys: Array,
         checkboxConfig: Object,
         nodeConfig: Object,
         lazy: Boolean,
@@ -347,7 +341,7 @@ export default defineVxeComponent({
             }
             const valueField = computeValueField.value;
             const nodeKey = XEUtils.get(node, valueField);
-            return enNodeValue(nodeKey);
+            return enModelValue(nodeKey);
         };
         const isExpandByNode = (node) => {
             const { updateExpandedFlag } = reactData;
@@ -392,7 +386,7 @@ export default defineVxeComponent({
                 }
                 const nodeList = [];
                 nodeKeys.forEach((nodeKey) => {
-                    const nodeid = enNodeValue(nodeKey);
+                    const nodeid = enModelValue(nodeKey);
                     const nodeItem = nodeMaps[nodeid];
                     if (nodeItem) {
                         nodeList.push(nodeItem.item);
@@ -1276,7 +1270,7 @@ export default defineVxeComponent({
             reactData.updateCheckboxFlag++;
             updateCheckboxStatus();
             const nodeids = XEUtils.keys(selectCheckboxMaps);
-            const value = nodeids.map(deNodeValue);
+            const value = nodeids.map(deModelValue);
             emitCheckboxMode(value);
             dispatchEvent('checkbox-change', { node, value, checked: isChecked }, evnt);
         };
@@ -1325,7 +1319,7 @@ export default defineVxeComponent({
                 return;
             }
             const isChecked = true;
-            const value = deNodeValue(nodeid);
+            const value = deModelValue(nodeid);
             reactData.selectRadioKey = nodeid;
             emitRadioMode(value);
             dispatchEvent('radio-change', { node, value, checked: isChecked }, evnt);
@@ -1363,7 +1357,7 @@ export default defineVxeComponent({
             getCurrentNodeId() {
                 const { currentNode } = reactData;
                 if (currentNode) {
-                    return deNodeValue(getNodeId(currentNode));
+                    return deModelValue(getNodeId(currentNode));
                 }
                 return null;
             },
@@ -1380,7 +1374,7 @@ export default defineVxeComponent({
             },
             setCurrentNodeId(nodeKey) {
                 const { nodeMaps } = internalData;
-                const nodeItem = nodeMaps[enNodeValue(nodeKey)];
+                const nodeItem = nodeMaps[enModelValue(nodeKey)];
                 reactData.currentNode = nodeItem ? nodeItem.item : null;
                 return nextTick();
             },
@@ -1408,7 +1402,7 @@ export default defineVxeComponent({
                 return null;
             },
             setRadioNodeId(nodeKey) {
-                reactData.selectRadioKey = enNodeValue(nodeKey);
+                reactData.selectRadioKey = enModelValue(nodeKey);
                 emitRadioMode(nodeKey);
                 return nextTick();
             },
@@ -1416,7 +1410,7 @@ export default defineVxeComponent({
                 if (node) {
                     const nodeid = getNodeId(node);
                     reactData.selectRadioKey = nodeid;
-                    emitRadioMode(deNodeValue(nodeid));
+                    emitRadioMode(deModelValue(nodeid));
                 }
                 else {
                     emitRadioMode(null);
@@ -1442,7 +1436,7 @@ export default defineVxeComponent({
                 const { selectCheckboxMaps } = internalData;
                 const nodeKeys = [];
                 XEUtils.each(selectCheckboxMaps, (item, nodeId) => {
-                    nodeKeys.push(deNodeValue(nodeId));
+                    nodeKeys.push(deModelValue(nodeId));
                 });
                 return nodeKeys;
             },
@@ -1520,7 +1514,7 @@ export default defineVxeComponent({
                         nodeKeys = [nodeKeys];
                     }
                     nodeKeys.forEach((nodeKey) => {
-                        const nodeid = enNodeValue(nodeKey);
+                        const nodeid = enModelValue(nodeKey);
                         handleSetExpand(nodeid, expanded, treeExpandedMaps);
                     });
                     reactData.updateExpandedFlag++;
@@ -1533,7 +1527,7 @@ export default defineVxeComponent({
                 const { treeExpandedMaps } = internalData;
                 const nodeKeys = [];
                 XEUtils.each(treeExpandedMaps, (item, nodeId) => {
-                    nodeKeys.push(deNodeValue(nodeId));
+                    nodeKeys.push(deModelValue(nodeId));
                 });
                 return nodeKeys;
             },
@@ -1571,7 +1565,7 @@ export default defineVxeComponent({
                         nodeKeys = [nodeKeys];
                     }
                     nodeKeys.forEach((nodeKey) => {
-                        const nodeid = enNodeValue(nodeKey);
+                        const nodeid = enModelValue(nodeKey);
                         handleSetExpand(nodeid, !treeExpandedMaps[`${nodeid}`], treeExpandedMaps);
                     });
                     reactData.updateExpandedFlag++;
@@ -1903,10 +1897,11 @@ export default defineVxeComponent({
                 const dragNodeid = getNodeId(dragNode);
                 const dragNodeRest = nodeMaps[dragNodeid] || {};
                 const _dragNodeIndex = dragNodeRest._index;
+                const newNodeid = getNodeId(prevDragNode);
                 let dragNodeHeight = 0;
                 let dragOffsetTop = -1;
                 if (animation) {
-                    const prevItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${prevDragNode}"]`);
+                    const prevItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${newNodeid}"]`);
                     const oldItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${dragNodeid}"]`);
                     const targetItemEl = prevItemEl || oldItemEl;
                     if (targetItemEl) {
@@ -1921,7 +1916,6 @@ export default defineVxeComponent({
                 const oldAllMaps = {};
                 let isSelfToChildStatus = false;
                 const oldRest = dragNodeRest;
-                const newNodeid = getNodeId(prevDragNode);
                 const newRest = nodeMaps[newNodeid];
                 if (transform) {
                     if (oldRest && newRest) {
@@ -2629,7 +2623,7 @@ export default defineVxeComponent({
             loadData(props.data || []);
         });
         watch(() => props.checkNodeKey, (nodeKey) => {
-            reactData.selectRadioKey = enNodeValue(nodeKey);
+            reactData.selectRadioKey = enModelValue(nodeKey);
         });
         const checkboxFlag = ref(0);
         watch(() => props.checkNodeKeys ? props.checkNodeKeys.length : 0, () => {
@@ -2700,7 +2694,7 @@ export default defineVxeComponent({
             XEUtils.assign(reactData, createReactData());
             XEUtils.assign(internalData, createInternalData());
         });
-        reactData.selectRadioKey = enNodeValue(props.checkNodeKey);
+        reactData.selectRadioKey = enModelValue(props.checkNodeKey);
         loadData(props.data || []);
         $xeTree.renderVN = renderVN;
         provide('$xeTree', $xeTree);

package/es/tree/src/util.js

@@ -1,10 +1,3 @@
-import XEUtils from 'xe-utils';
-export function enNodeValue(nodeid) {
-    return XEUtils.eqNull(nodeid) ? '' : encodeURIComponent(`${nodeid}`);
-}
-export function deNodeValue(nodeid) {
-    return nodeid ? decodeURIComponent(`${nodeid}`) : nodeid;
-}
 function countTreeExpand($xeTree, prevNode) {
     let count = 1;
     if (!prevNode) {

package/es/tree-select/src/tree-select.js

@@ -2,8 +2,7 @@ import { ref, computed, h, nextTick, inject, provide, reactive, Teleport, onMoun
 import { defineVxeComponent } from '../../ui/src/comp';
 import { getConfig, getI18n, getIcon, globalEvents, createEvent, useSize, renderEmptyElement } from '../../ui';
 import { getEventTargetNode, updatePanelPlacement, toCssUnit } from '../../ui/src/dom';
-import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
-import { deNodeValue } from '../../tree/src/util';
+import { getLastZIndex, nextZIndex, deModelValue } from '../../ui/src/utils';
 import { createComponentLog } from '../../ui/src/log';
 import XEUtils from 'xe-utils';
 import VxeInputComponent from '../../input';
@@ -96,10 +95,12 @@ export default defineVxeComponent({
             type: Boolean,
             default: () => getConfig().treeSelect.showRadio
         },
+        radioConfig: Object,
         showCheckbox: {
             type: Boolean,
             default: () => getConfig().treeSelect.showCheckbox
         },
+        checkboxConfig: Object,
         popupConfig: Object,
         treeConfig: Object,
         menuConfig: Object,
@@ -232,20 +233,20 @@ export default defineVxeComponent({
             return Object.assign({ isHover: true }, treeOpts.nodeConfig);
         });
         const computeTreeCheckboxOpts = computed(() => {
-            const { showCheckbox } = props;
+            const { showCheckbox, checkboxConfig } = props;
             const treeOpts = computeTreeOpts.value;
             return Object.assign({
                 showIcon: XEUtils.isBoolean(showCheckbox) ? showCheckbox : !!treeOpts.showCheckbox
-            }, treeOpts.checkboxConfig, {
+            }, treeOpts.checkboxConfig, checkboxConfig, {
                 trigger: 'node'
             });
         });
         const computeTreeRadioOpts = computed(() => {
-            const { showRadio } = props;
+            const { showRadio, radioConfig } = props;
             const treeOpts = computeTreeOpts.value;
             return Object.assign({
                 showIcon: XEUtils.isBoolean(showRadio) ? showRadio : !!treeOpts.showRadio
-            }, treeOpts.radioConfig, {
+            }, treeOpts.radioConfig, radioConfig, {
                 trigger: 'node'
             });
         });
@@ -493,7 +494,7 @@ export default defineVxeComponent({
             dispatchEvent('visible-change', { visible: false }, evnt || null);
         };
         const changeEvent = (evnt, selectValue, node) => {
-            const value = XEUtils.isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue);
+            const value = XEUtils.isArray(selectValue) ? selectValue.map(deModelValue) : deModelValue(selectValue);
             emitModel(value);
             if (value !== props.modelValue) {
                 dispatchEvent('change', { value, node, option: node }, evnt);

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "4.15.11";
+export const version = "4.15.13";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {
@@ -221,6 +221,12 @@ setConfig({
     listView: {},
     list: {
         // size: null,
+        dragConfig: {
+            showIcon: true,
+            animation: true,
+            showGuidesStatus: true,
+            showDragTip: true
+        },
         virtualYConfig: {
             enabled: true,
             gt: 100
@@ -376,6 +382,7 @@ setConfig({
             }
         }
     },
+    tableTransfer: {},
     tabs: {
     // destroyOnClose: false
     },
@@ -403,6 +410,7 @@ setConfig({
         leaveDelay: 300,
         isArrow: true
     },
+    transfer: {},
     tree: {
         // autoResize: false,
         indent: 20,
@@ -664,7 +672,11 @@ setIcon({
     // cascader
     CASCADER_NODE_OPEN: iconPrefix + 'arrow-right',
     CASCADER_NODE_CLOSE: iconPrefix + 'arrow-right',
-    CASCADER_NODE_LOADED: iconPrefix + 'spinner roll'
+    CASCADER_NODE_LOADED: iconPrefix + 'spinner roll',
+    // list
+    LIST_DRAG: iconPrefix + 'drag-handle',
+    LIST_DRAG_STATUS_NODE: iconPrefix + 'sort',
+    LIST_DRAG_DISABLED: iconPrefix + 'no-drop'
 });
 export * from '@vxe-ui/core';
 export default VxeUI;

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.15.11"}`;
+const uiVersion = `ui v${"4.15.13"}`;
 export function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/es/ui/src/utils.js

@@ -29,6 +29,12 @@ export function getFuncText(content, args) {
     const translate = getConfig().translate;
     return `${translate ? translate('' + content, args) : content}`;
 }
+export function getText(content) {
+    if (XEUtils.eqNull(content)) {
+        return '';
+    }
+    return '' + content;
+}
 /**
  * 判断值为：'' | null | undefined 时都属于空值
  */
@@ -38,3 +44,9 @@ export function eqEmptyValue(cellValue) {
 export function handleBooleanDefaultValue(value) {
     return XEUtils.isBoolean(value) ? value : null;
 }
+export function enModelValue(nodeid) {
+    return XEUtils.eqNull(nodeid) ? '' : encodeURIComponent(`${nodeid}`);
+}
+export function deModelValue(nodeid) {
+    return nodeid ? decodeURIComponent(`${nodeid}`) : nodeid;
+}