@zat-design/sisyphus-react 3.4.6-beta.1 → 3.4.6-beta.3

package/dist/index.esm.css

@@ -3983,6 +3983,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.pro-tree-select .ant-select-selector .check-mark-icon,
+.pro-tree-select-drop-down-container .ant-select-selector .check-mark-icon {
+  display: none;
+}
+.pro-tree-select.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon,
+.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
+  display: none;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

package/dist/less.esm.css

@@ -3983,6 +3983,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.pro-tree-select .ant-select-selector .check-mark-icon,
+.pro-tree-select-drop-down-container .ant-select-selector .check-mark-icon {
+  display: none;
+}
+.pro-tree-select.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon,
+.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
+  display: none;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

package/es/ProForm/components/render/Render.js

@@ -276,7 +276,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
   };

package/es/ProForm/utils/index.d.ts

@@ -83,7 +83,12 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @param value 选中值
  * @returns {}
  */
-export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+export declare const findOptionByValue: (treeData: any[], value: string | number, fieldNames: {
+    [key: string]: any;
+    label?: string;
+    value?: string;
+    children?: string;
+}) => any;
 /**
  * 对比依赖列表中的 值是否变更
  */

package/es/ProForm/utils/index.js

@@ -392,19 +392,19 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value) {
+export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
-    if (node.value === value) {
-      return omit(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node.children, value);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return omit(foundNode, ['children']);
+        return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/es/ProForm/utils/useForm.js

@@ -57,7 +57,8 @@ export var useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
-          case 14:
+            throw _context.t0;
+          case 15:
           case "end":
             return _context.stop();
         }

package/es/ProTree/components/ProTreeSelect/index.js

@@ -407,13 +407,13 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal) {
+  var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, selectList, null);
+    onChange && onChange(result, label, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -486,7 +486,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -40,6 +40,12 @@
                 color: red;
             }
         }
+        // 隐藏单选下拉树后面勾号
+        .@{ant-prefix}-select-tree-node-content-wrapper{
+            .check-mark-icon{
+                display: none;
+            }
+        }
         // 单选
         &.signal-tree{
             .@{ant-prefix}-select-tree{
@@ -63,14 +69,6 @@
                         display: block;
                     }
                 }
-                .@{ant-prefix}-select-tree-node-content-wrapper{
-                    background-color: transparent;
-                    &.@{ant-prefix}-select-tree-node-selected{
-                        .check-mark-icon{
-                            display: block;
-                        }
-                    }
-                }
                 .@{ant-prefix}-select-tree-treenode:hover{
                     background-color: #f5f5f5;
                 }

package/es/ProTree/style/index.less

@@ -348,3 +348,18 @@
   height: 16px !important;
 }
 
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
+}

package/lib/ProForm/components/render/Render.js

@@ -274,7 +274,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
   };

package/lib/ProForm/utils/index.d.ts

@@ -83,7 +83,12 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @param value 选中值
  * @returns {}
  */
-export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+export declare const findOptionByValue: (treeData: any[], value: string | number, fieldNames: {
+    [key: string]: any;
+    label?: string;
+    value?: string;
+    children?: string;
+}) => any;
 /**
  * 对比依赖列表中的 值是否变更
  */

package/lib/ProForm/utils/index.js

@@ -408,19 +408,19 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
-    if (node.value === value) {
-      return (0, _lodash.omit)(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node.children, value);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return (0, _lodash.omit)(foundNode, ['children']);
+        return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/lib/ProForm/utils/useForm.js

@@ -63,7 +63,8 @@ var useForm = exports.useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
-          case 14:
+            throw _context.t0;
+          case 15:
           case "end":
             return _context.stop();
         }

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -409,13 +409,13 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal) {
+  var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, selectList, null);
+    onChange && onChange(result, label, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -488,7 +488,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -40,6 +40,12 @@
                 color: red;
             }
         }
+        // 隐藏单选下拉树后面勾号
+        .@{ant-prefix}-select-tree-node-content-wrapper{
+            .check-mark-icon{
+                display: none;
+            }
+        }
         // 单选
         &.signal-tree{
             .@{ant-prefix}-select-tree{
@@ -63,14 +69,6 @@
                         display: block;
                     }
                 }
-                .@{ant-prefix}-select-tree-node-content-wrapper{
-                    background-color: transparent;
-                    &.@{ant-prefix}-select-tree-node-selected{
-                        .check-mark-icon{
-                            display: block;
-                        }
-                    }
-                }
                 .@{ant-prefix}-select-tree-treenode:hover{
                     background-color: #f5f5f5;
                 }

package/lib/ProTree/style/index.less

@@ -348,3 +348,18 @@
   height: 16px !important;
 }
 
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.6-beta.1",
+  "version": "3.4.6-beta.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",