@hw-component/form 1.9.28 → 1.9.29

package/es/Select/TreeSelect.d.ts

@@ -2,6 +2,7 @@ import { TreeSelectProps } from "antd/lib/tree-select";
 import { PromiseFnResult } from "../modal";
 interface IProps extends TreeSelectProps {
     request?: PromiseFnResult;
+    onlyCheckChild?: boolean;
 }
-declare const _default: ({ request, treeData, ...props }: IProps) => JSX.Element;
+declare const _default: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: IProps) => JSX.Element;
 export default _default;

package/es/Select/TreeSelect.js

@@ -1,28 +1,98 @@
 // welcome to hoo hoo hoo
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsx } from 'react/jsx-runtime';
 import { TreeSelect } from 'antd';
 import { useRequest } from 'ahooks';
 
-var _excluded = ["request", "treeData"];
+var _excluded = ["request", "onlyCheckChild", "multiple", "treeCheckable", "treeData", "fieldNames"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var HTreeSelect = (function (_ref) {
-  var request = _ref.request,
-    treeData = _ref.treeData,
-    props = _objectWithoutProperties(_ref, _excluded);
-  var _useRequest = useRequest(function () {
-      if (request) {
-        return request({});
-      }
-      return Promise.resolve(treeData);
-    }),
+var _opMk = function opMk(_ref) {
+  var options = _ref.options,
+    _ref$onlyCheckChild = _ref.onlyCheckChild,
+    onlyCheckChild = _ref$onlyCheckChild === void 0 ? false : _ref$onlyCheckChild,
+    fieldNames = _ref.fieldNames;
+  var _ref2 = fieldNames || {},
+    _ref2$children = _ref2.children,
+    children = _ref2$children === void 0 ? "children" : _ref2$children;
+  return options === null || options === void 0 ? void 0 : options.map(function (item) {
+    var child = item[children];
+    var len = child === null || child === void 0 ? void 0 : child.length;
+    if (!len) {
+      return _objectSpread({}, item);
+    }
+    var newChild = _opMk({
+      options: child,
+      onlyCheckChild: onlyCheckChild,
+      fieldNames: fieldNames
+    });
+    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({
+      selectable: !onlyCheckChild
+    }, children, newChild));
+  });
+};
+var useGetOnlyCheckChild = function useGetOnlyCheckChild(_ref3) {
+  var onlyCheckChild = _ref3.onlyCheckChild,
+    treeCheckable = _ref3.treeCheckable,
+    multiple = _ref3.multiple;
+  if (typeof onlyCheckChild !== "undefined") {
+    return onlyCheckChild;
+  }
+  if (!treeCheckable && !multiple) {
+    return true;
+  }
+  return false;
+};
+var HTreeSelect = (function (_ref4) {
+  var request = _ref4.request,
+    onlyCheckChild = _ref4.onlyCheckChild,
+    multiple = _ref4.multiple,
+    treeCheckable = _ref4.treeCheckable,
+    treeData = _ref4.treeData,
+    fieldNames = _ref4.fieldNames,
+    props = _objectWithoutProperties(_ref4, _excluded);
+  var cuOnlyCheckChild = useGetOnlyCheckChild({
+    onlyCheckChild: onlyCheckChild,
+    treeCheckable: treeCheckable,
+    multiple: multiple
+  });
+  var _useRequest = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var options;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            options = treeData;
+            if (!request) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
+            return request({});
+          case 4:
+            options = _context.sent;
+          case 5:
+            return _context.abrupt("return", _opMk({
+              options: options,
+              onlyCheckChild: cuOnlyCheckChild,
+              fieldNames: fieldNames
+            }));
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))),
     loading = _useRequest.loading,
     data = _useRequest.data;
   return jsx(TreeSelect, _objectSpread({
     treeData: data,
-    loading: loading
+    loading: loading,
+    fieldNames: fieldNames,
+    treeCheckable: treeCheckable,
+    multiple: multiple
   }, props));
 });
 

package/lib/Select/TreeSelect.d.ts

@@ -2,6 +2,7 @@ import { TreeSelectProps } from "antd/lib/tree-select";
 import { PromiseFnResult } from "../modal";
 interface IProps extends TreeSelectProps {
     request?: PromiseFnResult;
+    onlyCheckChild?: boolean;
 }
-declare const _default: ({ request, treeData, ...props }: IProps) => JSX.Element;
+declare const _default: ({ request, onlyCheckChild, multiple, treeCheckable, treeData, fieldNames, ...props }: IProps) => JSX.Element;
 export default _default;

package/lib/Select/TreeSelect.js

@@ -2,30 +2,100 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var ahooks = require('ahooks');
 
-var _excluded = ["request", "treeData"];
+var _excluded = ["request", "onlyCheckChild", "multiple", "treeCheckable", "treeData", "fieldNames"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var HTreeSelect = (function (_ref) {
-  var request = _ref.request,
-    treeData = _ref.treeData,
-    props = _objectWithoutProperties(_ref, _excluded);
-  var _useRequest = ahooks.useRequest(function () {
-      if (request) {
-        return request({});
-      }
-      return Promise.resolve(treeData);
-    }),
+var _opMk = function opMk(_ref) {
+  var options = _ref.options,
+    _ref$onlyCheckChild = _ref.onlyCheckChild,
+    onlyCheckChild = _ref$onlyCheckChild === void 0 ? false : _ref$onlyCheckChild,
+    fieldNames = _ref.fieldNames;
+  var _ref2 = fieldNames || {},
+    _ref2$children = _ref2.children,
+    children = _ref2$children === void 0 ? "children" : _ref2$children;
+  return options === null || options === void 0 ? void 0 : options.map(function (item) {
+    var child = item[children];
+    var len = child === null || child === void 0 ? void 0 : child.length;
+    if (!len) {
+      return _objectSpread({}, item);
+    }
+    var newChild = _opMk({
+      options: child,
+      onlyCheckChild: onlyCheckChild,
+      fieldNames: fieldNames
+    });
+    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({
+      selectable: !onlyCheckChild
+    }, children, newChild));
+  });
+};
+var useGetOnlyCheckChild = function useGetOnlyCheckChild(_ref3) {
+  var onlyCheckChild = _ref3.onlyCheckChild,
+    treeCheckable = _ref3.treeCheckable,
+    multiple = _ref3.multiple;
+  if (typeof onlyCheckChild !== "undefined") {
+    return onlyCheckChild;
+  }
+  if (!treeCheckable && !multiple) {
+    return true;
+  }
+  return false;
+};
+var HTreeSelect = (function (_ref4) {
+  var request = _ref4.request,
+    onlyCheckChild = _ref4.onlyCheckChild,
+    multiple = _ref4.multiple,
+    treeCheckable = _ref4.treeCheckable,
+    treeData = _ref4.treeData,
+    fieldNames = _ref4.fieldNames,
+    props = _objectWithoutProperties(_ref4, _excluded);
+  var cuOnlyCheckChild = useGetOnlyCheckChild({
+    onlyCheckChild: onlyCheckChild,
+    treeCheckable: treeCheckable,
+    multiple: multiple
+  });
+  var _useRequest = ahooks.useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var options;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            options = treeData;
+            if (!request) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
+            return request({});
+          case 4:
+            options = _context.sent;
+          case 5:
+            return _context.abrupt("return", _opMk({
+              options: options,
+              onlyCheckChild: cuOnlyCheckChild,
+              fieldNames: fieldNames
+            }));
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))),
     loading = _useRequest.loading,
     data = _useRequest.data;
   return jsxRuntime.jsx(antd.TreeSelect, _objectSpread({
     treeData: data,
-    loading: loading
+    loading: loading,
+    fieldNames: fieldNames,
+    treeCheckable: treeCheckable,
+    multiple: multiple
   }, props));
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.28",
+  "version": "1.9.29",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Select/TreeSelect.tsx

@@ -4,13 +4,61 @@ import { PromiseFnResult } from "../modal";
 import { useRequest } from "ahooks";
 interface IProps extends TreeSelectProps {
   request?: PromiseFnResult;
+  onlyCheckChild?:boolean;
 }
-export default ({ request,treeData, ...props }: IProps) => {
-  const { loading, data } = useRequest(() => {
+interface OpMkParamsModal {
+  options?:any[];
+  onlyCheckChild?:boolean;
+  fieldNames?:TreeSelectProps["fieldNames"]
+}
+const opMk=({options,onlyCheckChild=false,fieldNames}:OpMkParamsModal)=>{
+   const {children="children"}=fieldNames||{}
+   return options?.map((item)=>{
+        const {[children]:child}=item;
+        const len=child?.length;
+        if (!len){
+          return {
+            ...item
+          };
+        }
+        const newChild=opMk({options:child,onlyCheckChild,fieldNames});
+        return  {
+          ...item,
+          selectable:!onlyCheckChild,
+          [children]:newChild
+        }
+   })
+}
+const useGetOnlyCheckChild=({onlyCheckChild,treeCheckable,multiple}:IProps)=>{
+    if (typeof onlyCheckChild!=="undefined"){
+      return onlyCheckChild;
+    }
+    if (!treeCheckable&&!multiple){
+      return  true
+    }
+    return  false;
+}
+export default ({ request,onlyCheckChild,multiple,treeCheckable,treeData,fieldNames, ...props }: IProps) => {
+  const cuOnlyCheckChild=useGetOnlyCheckChild({
+    onlyCheckChild,
+    treeCheckable,
+    multiple
+  })
+  const { loading, data } = useRequest(async () => {
+    let options=treeData;
     if (request) {
-      return request({});
+      options=await request({});
     }
-    return Promise.resolve(treeData);
+    return opMk({
+      options,
+      onlyCheckChild:cuOnlyCheckChild,
+      fieldNames
+    });
   });
-  return <TreeSelect treeData={data} loading={loading} {...props}/>;
+  return <TreeSelect treeData={data}
+                     loading={loading}
+                     fieldNames={fieldNames}
+                     treeCheckable={treeCheckable}
+                     multiple={multiple}
+                     {...props}/>;
 };

package/src/pages/Form/index.tsx

@@ -143,6 +143,7 @@ const formData = (options) => {
       label: "treeSelect",
       type: "treeSelect",
       itemProps: {
+        multiple:true,
         request: async () => {
           return [
             {