vxe-pc-ui 3.15.11 → 3.15.12

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,71 @@
+import { defineVxeComponent } from '../../ui/src/comp';
+import XEUtils from 'xe-utils';
+import { getConfig, createEvent } from '../../ui';
+function createReactData() {
+    return {};
+}
+function createInternalData() {
+    return {};
+}
+export default {
+    name: 'VxeTableTransfer',
+    props: {
+        modelValue: Array,
+        options: Array,
+        size: {
+            type: String,
+            default: () => getConfig().tableTransfer.size || getConfig().size
+        }
+    },
+    data() {
+        const xID = XEUtils.uniqueId();
+        const reactData = createReactData();
+        return Object.assign(Object.assign({}, {}), { xID,
+            reactData });
+    },
+    methods: {
+        //
+        // Method
+        //
+        dispatchEvent(type, params, evnt) {
+            const $xeTableTransfer = this;
+            $xeTableTransfer.$emit(type, createEvent(evnt, { $tableTransfer: $xeTableTransfer }, params));
+        },
+        emitModel(value) {
+            const $xeTableTransfer = this;
+            const { _events } = $xeTableTransfer;
+            if (_events && _events.modelValue) {
+                $xeTableTransfer.$emit('modelValue', value);
+            }
+            else {
+                $xeTableTransfer.$emit('model-value', value);
+            }
+        },
+        //
+        // Render
+        //
+        renderVN(h) {
+            const $xeTableTransfer = this;
+            const slots = $xeTableTransfer.$scopedSlots;
+            const defaultSlot = slots.default;
+            return h('div', {
+                ref: 'refElem',
+                class: 'vxe-table-transfer'
+            }, defaultSlot ? defaultSlot({}) : []);
+        }
+    },
+    created() {
+        const $xeUpload = this;
+        $xeUpload.internalData = createInternalData();
+    },
+    beforeDestroy() {
+        const $xeUpload = this;
+        const reactData = $xeUpload.reactData;
+        const internalData = $xeUpload.internalData;
+        XEUtils.assign(reactData, createReactData());
+        XEUtils.assign(internalData, createInternalData());
+    },
+    render(h) {
+        return this.renderVN(h);
+    }
+};

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,86 @@
+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 {
+    name: 'VxeTransfer',
+    props: {
+        modelValue: Array,
+        options: Array,
+        size: {
+            type: String,
+            default: () => getConfig().transfer.size || getConfig().size
+        }
+    },
+    data() {
+        const xID = XEUtils.uniqueId();
+        const reactData = createReactData();
+        return Object.assign(Object.assign({}, {}), { xID,
+            reactData });
+    },
+    methods: {
+        //
+        // Method
+        //
+        dispatchEvent(type, params, evnt) {
+            const $xeTransfer = this;
+            $xeTransfer.$emit(type, createEvent(evnt, { $transfer: $xeTransfer }, params));
+        },
+        emitModel(value) {
+            const $xeTransfer = this;
+            const { _events } = $xeTransfer;
+            if (_events && _events.modelValue) {
+                $xeTransfer.$emit('modelValue', value);
+            }
+            else {
+                $xeTransfer.$emit('model-value', value);
+            }
+        },
+        //
+        // Render
+        //
+        renderVN(h) {
+            const $xeTransfer = this;
+            const slots = $xeTransfer.$scopedSlots;
+            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'),
+                h('div'),
+                h('div'),
+                footerSlot
+                    ? h('div', {
+                        class: 'vxe-transfer--footer'
+                    }, footerSlot({ $transfer: $xeTransfer }))
+                    : renderEmptyElement($xeTransfer)
+            ]);
+        }
+    },
+    created() {
+        const $xeUpload = this;
+        $xeUpload.internalData = createInternalData();
+    },
+    beforeDestroy() {
+        const $xeUpload = this;
+        const reactData = $xeUpload.reactData;
+        const internalData = $xeUpload.internalData;
+        XEUtils.assign(reactData, createReactData());
+        XEUtils.assign(internalData, createInternalData());
+    },
+    render(h) {
+        return this.renderVN(h);
+    }
+};

package/es/tree/src/tree.js

@@ -1,12 +1,12 @@
 import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI, createEvent, globalEvents, globalResize, renderEmptyElement, globalMixins } from '../../ui';
-import { calcTreeLine, enNodeValue, deNodeValue } from './util';
+import { calcTreeLine } from './util';
 import { createComponentLog } from '../../ui/src/log';
 import { getSlotVNs } from '../../ui/src/vn';
 import { crossTreeDragNodeGlobal, getCrossTreeDragNodeInfo } from './store';
 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');
@@ -208,10 +208,11 @@ function handleNodeDragSwapEvent($xeTree, evnt, dragNode, prevDragNode, prevDrag
         const dragNodeid = $xeTree.getNodeId(dragNode);
         const dragNodeRest = nodeMaps[dragNodeid] || {};
         const _dragNodeIndex = dragNodeRest._index;
+        const newNodeid = $xeTree.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) {
@@ -226,7 +227,6 @@ function handleNodeDragSwapEvent($xeTree, evnt, dragNode, prevDragNode, prevDrag
         const oldAllMaps = {};
         let isSelfToChildStatus = false;
         const oldRest = dragNodeRest;
-        const newNodeid = $xeTree.getNodeId(prevDragNode);
         const newRest = nodeMaps[newNodeid];
         if (transform) {
             if (oldRest && newRest) {
@@ -582,19 +582,13 @@ export default {
             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,
@@ -793,7 +787,7 @@ export default {
             }
             const valueField = $xeTree.computeValueField;
             const nodeKey = XEUtils.get(node, valueField);
-            return enNodeValue(nodeKey);
+            return enModelValue(nodeKey);
         },
         getNodeById(nodeid) {
             const $xeTree = this;
@@ -864,7 +858,7 @@ export default {
             if (node) {
                 const nodeid = $xeTree.getNodeId(node);
                 reactData.selectRadioKey = nodeid;
-                $xeTree.emitRadioMode(deNodeValue(nodeid));
+                $xeTree.emitRadioMode(deModelValue(nodeid));
             }
             else {
                 $xeTree.emitRadioMode(null);
@@ -898,7 +892,7 @@ export default {
                 }
                 const nodeList = [];
                 nodeKeys.forEach((nodeKey) => {
-                    const nodeid = enNodeValue(nodeKey);
+                    const nodeid = enModelValue(nodeKey);
                     const nodeItem = nodeMaps[nodeid];
                     if (nodeItem) {
                         nodeList.push(nodeItem.item);
@@ -1882,7 +1876,7 @@ export default {
             reactData.updateCheckboxFlag++;
             $xeTree.updateCheckboxStatus();
             const nodeids = XEUtils.keys(selectCheckboxMaps);
-            const value = nodeids.map(deNodeValue);
+            const value = nodeids.map(deModelValue);
             $xeTree.emitCheckboxMode(value);
             $xeTree.dispatchEvent('checkbox-change', { node, value, checked: isChecked }, evnt);
         },
@@ -1936,7 +1930,7 @@ export default {
                 return;
             }
             const isChecked = true;
-            const value = deNodeValue(nodeid);
+            const value = deModelValue(nodeid);
             reactData.selectRadioKey = nodeid;
             $xeTree.emitRadioMode(value);
             $xeTree.dispatchEvent('radio-change', { node, value, checked: isChecked }, evnt);
@@ -1964,7 +1958,7 @@ export default {
             const reactData = $xeTree.reactData;
             const { currentNode } = reactData;
             if (currentNode) {
-                return deNodeValue($xeTree.getNodeId(currentNode));
+                return deModelValue($xeTree.getNodeId(currentNode));
             }
             return null;
         },
@@ -1987,7 +1981,7 @@ export default {
             const reactData = $xeTree.reactData;
             const internalData = $xeTree.internalData;
             const { nodeMaps } = internalData;
-            const nodeItem = nodeMaps[enNodeValue(nodeKey)];
+            const nodeItem = nodeMaps[enModelValue(nodeKey)];
             reactData.currentNode = nodeItem ? nodeItem.item : null;
             return $xeTree.$nextTick();
         },
@@ -2026,7 +2020,7 @@ export default {
         setRadioNodeId(nodeKey) {
             const $xeTree = this;
             const reactData = $xeTree.reactData;
-            reactData.selectRadioKey = enNodeValue(nodeKey);
+            reactData.selectRadioKey = enModelValue(nodeKey);
             $xeTree.emitRadioMode(nodeKey);
             return $xeTree.$nextTick();
         },
@@ -2036,7 +2030,7 @@ export default {
             const { selectCheckboxMaps } = internalData;
             const nodeKeys = [];
             XEUtils.each(selectCheckboxMaps, (item, nodeId) => {
-                nodeKeys.push(deNodeValue(nodeId));
+                nodeKeys.push(deModelValue(nodeId));
             });
             return nodeKeys;
         },
@@ -2130,7 +2124,7 @@ export default {
                     nodeKeys = [nodeKeys];
                 }
                 nodeKeys.forEach((nodeKey) => {
-                    const nodeid = enNodeValue(nodeKey);
+                    const nodeid = enModelValue(nodeKey);
                     handleSetExpand(nodeid, expanded, treeExpandedMaps);
                 });
                 reactData.updateExpandedFlag++;
@@ -2145,7 +2139,7 @@ export default {
             const { treeExpandedMaps } = internalData;
             const nodeKeys = [];
             XEUtils.each(treeExpandedMaps, (item, nodeId) => {
-                nodeKeys.push(deNodeValue(nodeId));
+                nodeKeys.push(deModelValue(nodeId));
             });
             return nodeKeys;
         },
@@ -2191,7 +2185,7 @@ export default {
                     nodeKeys = [nodeKeys];
                 }
                 nodeKeys.forEach((nodeKey) => {
-                    const nodeid = enNodeValue(nodeKey);
+                    const nodeid = enModelValue(nodeKey);
                     handleSetExpand(nodeid, !treeExpandedMaps[`${nodeid}`], treeExpandedMaps);
                 });
                 reactData.updateExpandedFlag++;
@@ -2884,7 +2878,7 @@ export default {
         checkNodeKey(nodeKey) {
             const $xeTree = this;
             const reactData = $xeTree.reactData;
-            reactData.selectRadioKey = enNodeValue(nodeKey);
+            reactData.selectRadioKey = enModelValue(nodeKey);
         },
         checkNodeKeys() {
             const $xeTree = this;
@@ -2917,7 +2911,7 @@ export default {
         const props = $xeTree;
         const reactData = $xeTree.reactData;
         $xeTree.internalData = createInternalData();
-        reactData.selectRadioKey = enNodeValue(props.checkNodeKey);
+        reactData.selectRadioKey = enModelValue(props.checkNodeKey);
         $xeTree.loadData(props.data || []);
     },
     mounted() {

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 { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { getConfig, getI18n, getIcon, globalEvents, createEvent, globalMixins, 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 VxeInputComponent from '../../input';
 import VxeButtonComponent from '../../button';
@@ -102,10 +101,12 @@ export default {
             type: Boolean,
             default: () => getConfig().treeSelect.showRadio
         },
+        radioConfig: Object,
         showCheckbox: {
             type: Boolean,
             default: () => getConfig().treeSelect.showCheckbox
         },
+        checkboxConfig: Object,
         popupConfig: Object,
         treeConfig: Object,
         menuConfig: Object,
@@ -258,22 +259,22 @@ export default {
         computeTreeCheckboxOpts() {
             const $xeTreeSelect = this;
             const props = $xeTreeSelect;
-            const { showCheckbox } = props;
+            const { showCheckbox, checkboxConfig } = props;
             const treeOpts = $xeTreeSelect.computeTreeOpts;
             return Object.assign({
                 showIcon: XEUtils.isBoolean(showCheckbox) ? showCheckbox : !!treeOpts.showCheckbox
-            }, treeOpts.checkboxConfig, {
+            }, treeOpts.checkboxConfig, checkboxConfig, {
                 trigger: 'node'
             });
         },
         computeTreeRadioOpts() {
             const $xeTreeSelect = this;
             const props = $xeTreeSelect;
-            const { showRadio } = props;
+            const { showRadio, radioConfig } = props;
             const treeOpts = $xeTreeSelect.computeTreeOpts;
             return Object.assign({
                 showIcon: XEUtils.isBoolean(showRadio) ? showRadio : !!treeOpts.showRadio
-            }, treeOpts.radioConfig, {
+            }, treeOpts.radioConfig, radioConfig, {
                 trigger: 'node'
             });
         },
@@ -580,7 +581,7 @@ export default {
             const props = $xeTreeSelect;
             const $xeForm = $xeTreeSelect.$xeForm;
             const formItemInfo = $xeTreeSelect.formItemInfo;
-            const value = XEUtils.isArray(selectValue) ? selectValue.map(deNodeValue) : deNodeValue(selectValue);
+            const value = XEUtils.isArray(selectValue) ? selectValue.map(deModelValue) : deModelValue(selectValue);
             $xeTreeSelect.emitModel(value);
             if (value !== props.value) {
                 $xeTreeSelect.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 = "3.15.11";
+export const version = "3.15.12";
 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: 60
@@ -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${"3.15.11"}`;
+const uiVersion = `ui v${"3.15.12"}`;
 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;
+}