vxe-pc-ui 4.10.50 → 4.11.1

package/lib/index.umd.js

@@ -3599,14 +3599,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.10.50"}`;
+const log_version = `ui v${"4.11.1"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.10.50";
+const ui_version = "4.11.1";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -29861,6 +29861,7 @@ function select_createInternalData() {
       type: Boolean,
       default: null
     },
+    popupConfig: Object,
     virtualYConfig: Object,
     scrollY: Object,
     /**
@@ -30015,6 +30016,9 @@ function select_createInternalData() {
       const selectVals = computeSelectVals.value;
       return checkMaxLimit(selectVals);
     });
+    const computePopupOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, getConfig().treeSelect.popupConfig, props.popupConfig);
+    });
     const computeVirtualYOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, getConfig().select.virtualYConfig || getConfig().select.scrollY, props.virtualYConfig || props.scrollY);
     });
@@ -30027,6 +30031,22 @@ function select_createInternalData() {
     const computeMultiMaxCharNum = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(props.multiCharOverflow);
     });
+    const computePopupWrapperStyle = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const popupOpts = computePopupOpts.value;
+      const {
+        height,
+        width
+      } = popupOpts;
+      const stys = {};
+      if (width) {
+        stys.width = toCssUnit(width);
+      }
+      if (height) {
+        stys.height = toCssUnit(height);
+        stys.maxHeight = toCssUnit(height);
+      }
+      return stys;
+    });
     const computeSelectVals = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         modelValue,
@@ -31224,7 +31244,6 @@ function select_createInternalData() {
     const renderVN = () => {
       const {
         className,
-        popupClassName,
         multiple,
         loading,
         filterable,
@@ -31248,6 +31267,9 @@ function select_createInternalData() {
       const btnTransfer = computeBtnTransfer.value;
       const formReadonly = computeFormReadonly.value;
       const inpPlaceholder = computeInpPlaceholder.value;
+      const popupWrapperStyle = computePopupWrapperStyle.value;
+      const popupOpts = computePopupOpts.value;
+      const popupClassName = popupOpts.className || props.popupClassName;
       const defaultSlot = slots.default;
       const headerSlot = slots.header;
       const footerSlot = slots.footer;
@@ -31315,7 +31337,8 @@ function select_createInternalData() {
         placement: reactData.panelPlacement,
         style: reactData.panelStyle
       }, initialized && (visiblePanel || isAniVisible) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: 'vxe-select--panel-wrapper'
+        class: 'vxe-select--panel-wrapper',
+        style: popupWrapperStyle
       }, [filterable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-select--panel-search'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(input, {
@@ -39375,6 +39398,15 @@ function calcTreeLine($xeTree, node, prevNode) {
   }
   return (rowHeight || 28) * expandSize - (prevNode ? 1 : 12);
 }
+;// CONCATENATED MODULE: ./packages/tree/src/store.ts
+
+// 跨树拖拽
+const crossTreeDragNodeInfo = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)({
+  node: null
+});
+function getCrossTreeDragNodeInfo() {
+  return crossTreeDragNodeInfo;
+}
 ;// CONCATENATED MODULE: ./packages/ui/src/anime.ts
 
 
@@ -39434,6 +39466,7 @@ function clearColAnimate(elem, clss) {
 
 
 
+
 /**
  * 生成节点的唯一主键
  */
@@ -39468,6 +39501,10 @@ function tree_createInternalData() {
     // hpTimeout: undefined
   };
 }
+// let crossTreeDragNodeObj: {
+//   $oldTree: VxeTreeConstructor & VxeTreePrivateMethods
+//   $newTree: (VxeTreeConstructor & VxeTreePrivateMethods) | null
+// } | null = null
 /* harmony default export */ var tree = (defineVxeComponent({
   name: 'VxeTree',
   props: {
@@ -39603,6 +39640,7 @@ function tree_createInternalData() {
     const refVirtualBody = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refDragNodeLineElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refDragTipElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const crossTreeDragNodeInfo = getCrossTreeDragNodeInfo();
     const reactData = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)({
       parentHeight: 0,
       customHeight: 0,
@@ -41385,13 +41423,18 @@ function tree_createInternalData() {
         rdLineEl.style.display = '';
       }
     };
+    const clearCrossTreeDragStatus = () => {
+      // crossTreeDragNodeObj = null
+      crossTreeDragNodeInfo.node = null;
+    };
     const clearDragStatus = () => {
       const {
         dragNode
       } = reactData;
       if (dragNode) {
-        clearNodeDropOrigin();
         hideDropTip();
+        clearNodeDropOrigin();
+        clearCrossTreeDragStatus();
         reactData.dragNode = null;
       }
     };
@@ -41734,10 +41777,12 @@ function tree_createInternalData() {
           return errRest;
         }).then(rest => {
           clearNodeDragData();
+          clearCrossTreeDragStatus();
           return rest;
         });
       }
       clearNodeDragData();
+      clearCrossTreeDragStatus();
       return Promise.resolve(errRest);
     };
     const handleNodeDragDragstartEvent = evnt => {
@@ -41837,6 +41882,25 @@ function tree_createInternalData() {
           return getNodeId(node1) === getNodeId(node2);
         }
         return false;
+      },
+      handleCrossTreeNodeDragCancelEvent() {
+        clearNodeDragData();
+        clearCrossTreeDragStatus();
+      },
+      /**
+       * 处理跨树拖拽完成
+       */
+      handleCrossTreeNodeDragFinishEvent() {},
+      /**
+       * 处理跨树拖至新的空树
+       */
+      handleCrossTreeNodeDragInsertEvent() {},
+      /**
+       * 处理跨树拖插入
+       */
+      handleCrossTreeNodeDragoverEmptyEvent() {},
+      hideCrossTreeNodeDropClearStatus() {
+        hideDropTip();
       }
     };
     Object.assign($xeTree, treeMethods, treePrivateMethods);
@@ -42263,6 +42327,10 @@ function tree_createInternalData() {
       recalculate();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
+      const dragOpts = computeDragOpts.value;
+      if (dragOpts.isCrossTreeDrag) {
+        errLog('vxe.error.notProp', ['drag-config.isCrossTreeDrag']);
+      }
       if (props.autoResize) {
         const el = refElem.value;
         const parentEl = getParentElem();
@@ -45715,13 +45783,13 @@ const readFile = readLocalFile;
 
 
 if (typeof window !== 'undefined') {
-  if (window.VxeUI && !window.VxeUIAll) {
+  if (!window.VxeUIAll) {
     window.VxeUIAll = components_namespaceObject;
   }
-  if (window.VxeUI && !window.VxeUIBase) {
+  if (!window.VxeUIBase) {
     window.VxeUIBase = components_namespaceObject;
   }
-  if (window.VxeUIBase && !window.VxeUI) {
+  if (!window.VxeUI) {
     window.VxeUI = components_namespaceObject;
   }
 }