vxe-pc-ui 3.14.23 → 3.14.24

package/lib/index.umd.js

@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.23");
+var log_version = "ui v".concat("3.14.24");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.23";
+var ui_version = "3.14.24";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -31046,7 +31046,11 @@ var Countdown = VxeCountdown;
       var $xeDatePanel = this;
       var props = $xeDatePanel;
       var reactData = $xeDatePanel.reactData;
-      reactData.inputLabel = props.multiple ? $xeDatePanel.computeDateMultipleLabel : reactData.datePanelLabel;
+      var label = props.multiple ? $xeDatePanel.computeDateMultipleLabel : reactData.datePanelLabel;
+      reactData.inputLabel = label;
+      $xeDatePanel.dispatchEvent('revert', {
+        label: label
+      }, null);
     },
     afterCheckValue: function afterCheckValue(inpVal) {
       var $xeDatePanel = this;
@@ -32970,6 +32974,11 @@ var DatePanel = VxeDatePanel;
       var $xeDatePicker = this;
       $xeDatePicker.dispatchEvent('confirm', params, params.$event);
     },
+    panelRevertEvent: function panelRevertEvent(params) {
+      var $xeDatePicker = this;
+      var reactData = $xeDatePicker.reactData;
+      reactData.inputLabel = params.label;
+    },
     // 全局事件
     handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
       var $xeDatePicker = this;
@@ -33349,7 +33358,8 @@ var DatePanel = VxeDatePanel;
         },
         on: {
           change: $xeDatePicker.panelChangeEvent,
-          confirm: $xeDatePicker.panelConfirmEvent
+          confirm: $xeDatePicker.panelConfirmEvent,
+          revert: $xeDatePicker.panelRevertEvent
         }
       })]), h('div', {
         class: 'vxe-date-picker--layout-footer-wrapper'
@@ -58418,23 +58428,26 @@ function tree_createReactData() {
       evnt.preventDefault();
       evnt.stopPropagation();
       var transform = props.transform;
-      var selectCheckboxMaps = internalData.selectCheckboxMaps;
+      var selectCheckboxMaps = internalData.selectCheckboxMaps,
+        nodeMaps = internalData.nodeMaps;
       var childrenField = $xeTree.computeChildrenField;
       var mapChildrenField = $xeTree.computeMapChildrenField;
       var checkboxOpts = $xeTree.computeCheckboxOpts;
       var checkStrictly = checkboxOpts.checkStrictly,
+        checkMode = checkboxOpts.checkMode,
         checkMethod = checkboxOpts.checkMethod;
-      var isDisabled = !!checkMethod;
-      if (checkMethod) {
-        isDisabled = !checkMethod({
-          $tree: $xeTree,
-          node: node
-        });
-      }
+      var nodeid = $xeTree.getNodeId(node);
+      var childList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, childrenField);
+      var isExistChild = childList && childList.length > 0;
+      var nodeItem = nodeMaps[nodeid] || {};
+      var nLevel = nodeItem.level;
+      var isDisabled = checkMethod ? !checkMethod({
+        $tree: $xeTree,
+        node: node
+      }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
       if (isDisabled) {
         return;
       }
-      var nodeid = $xeTree.getNodeId(node);
       var isChecked = false;
       if (selectCheckboxMaps[nodeid]) {
         delete selectCheckboxMaps[nodeid];
@@ -58507,22 +58520,27 @@ function tree_createReactData() {
     changeRadioEvent: function changeRadioEvent(evnt, node) {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
+      var internalData = $xeTree.internalData;
       evnt.preventDefault();
       evnt.stopPropagation();
+      var nodeMaps = internalData.nodeMaps;
       var radioOpts = $xeTree.computeRadioOpts;
-      var checkMethod = radioOpts.checkMethod;
-      var isDisabled = !!checkMethod;
-      if (checkMethod) {
-        isDisabled = !checkMethod({
-          $tree: $xeTree,
-          node: node
-        });
-      }
+      var childrenField = $xeTree.computeChildrenField;
+      var checkMode = radioOpts.checkMode,
+        checkMethod = radioOpts.checkMethod;
+      var nodeid = $xeTree.getNodeId(node);
+      var childList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, childrenField);
+      var isExistChild = childList && childList.length > 0;
+      var nodeItem = nodeMaps[nodeid] || {};
+      var nLevel = nodeItem.level;
+      var isDisabled = checkMethod ? !checkMethod({
+        $tree: $xeTree,
+        node: node
+      }) : !handleVisibleOrCheckMode(checkMode, isExistChild, nLevel);
       if (isDisabled) {
         return;
       }
       var isChecked = true;
-      var nodeid = $xeTree.getNodeId(node);
       var value = deNodeValue(nodeid);
       reactData.selectRadioKey = nodeid;
       $xeTree.emitRadioMode(value);
@@ -59604,8 +59622,6 @@ var Tree = VxeTree;
 
 
 
-
-
 
 
 
@@ -59911,10 +59927,11 @@ function tree_select_createInternalData() {
       var propsOpts = $xeTreeSelect.computePropsOpts;
       return propsOpts.children || 'children';
     },
-    computeParentField: function computeParentField() {
+    computeNodeParentField: function computeNodeParentField() {
       var $xeTreeSelect = this;
       var propsOpts = $xeTreeSelect.computePropsOpts;
-      return propsOpts.parent || 'parentField';
+      var treeOpts = $xeTreeSelect.computeTreeOpts;
+      return propsOpts.parent || treeOpts.parentField || 'parentId';
     },
     computeHasChildField: function computeHasChildField() {
       var $xeTreeSelect = this;
@@ -60024,6 +60041,7 @@ function tree_select_createInternalData() {
       var separator = props.separator;
       var treeOpts = $xeTreeSelect.computeTreeOpts;
       var nodeKeyField = $xeTreeSelect.computeNodeKeyField;
+      var nodeParentField = $xeTreeSelect.computeNodeParentField;
       var childrenField = $xeTreeSelect.computeChildrenField;
       var valueField = $xeTreeSelect.computeValueField;
       var labelField = $xeTreeSelect.computeLabelField;
@@ -60056,9 +60074,22 @@ function tree_select_createInternalData() {
       };
       if (optList) {
         if (transform) {
-          optList.forEach(function (item, index, items) {
-            handleOptNode(item, index, items, [], null, []);
+          // if (showFullLabel) {
+          var treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(optList, {
+            key: nodeKeyField,
+            parentKey: nodeParentField,
+            mapChildren: childrenField,
+            rootParentValue: treeOpts.rootParentValue,
+            rootValues: treeOpts.rootValues
+          });
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(treeList, handleOptNode, {
+            children: childrenField
           });
+          // } else {
+          //   optList.forEach((item, index, items) => {
+          //     handleOptNode(item, index, items, [], null, [])
+          //   })
+          // }
         } else {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(optList, handleOptNode, {
             children: childrenField
@@ -60495,7 +60526,7 @@ function tree_select_createInternalData() {
       var labelField = $xeTreeSelect.computeLabelField;
       var valueField = $xeTreeSelect.computeValueField;
       var childrenField = $xeTreeSelect.computeChildrenField;
-      var parentField = $xeTreeSelect.computeParentField;
+      var nodeParentField = $xeTreeSelect.computeNodeParentField;
       var hasChildField = $xeTreeSelect.computeHasChildField;
       var virtualYOpts = $xeTreeSelect.computeVirtualYOpts;
       var filterOpts = $xeTreeSelect.computeFilterOpts;
@@ -60646,7 +60677,7 @@ function tree_select_createInternalData() {
           valueField: valueField,
           keyField: nodeKeyField,
           childrenField: treeOpts.childrenField || childrenField,
-          parentField: treeOpts.parentField || parentField,
+          parentField: nodeParentField,
           hasChildField: treeOpts.hasChildField || hasChildField,
           accordion: treeOpts.accordion,
           expandAll: treeOpts.expandAll,