tntd 2.7.2 → 2.7.4

package/lib/tntd-form/TntdForm/utils.js

@@ -1,27 +1,36 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleCheckItem = exports.getInitValue = exports.validateFields = exports.getFieldValue = exports.getFieldsValue = exports.recursionSort = exports.recursionCheck = exports.getNames = exports.isValidKey = void 0;
-const isValidKey = (key, object) => {
-    return key in object;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validateFields = exports.recursionSort = exports.recursionCheck = exports.isValidKey = exports.handleCheckItem = exports.getNames = exports.getInitValue = exports.getFieldsValue = exports.getFieldValue = void 0;
+function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var isValidKey = function isValidKey(key, object) {
+  return key in object;
 };
-exports.isValidKey = isValidKey;
 /**
  * 将xx.xx.xx 转换为数组
  * @param {*} name
  * @returns
  */
-const getNames = (name) => {
-    let attrs = [];
-    if (Array.isArray(name)) {
-        const [str, ...rest] = name;
-        attrs = str.split('.').concat(rest);
-    }
-    else {
-        attrs = typeof name === 'string' ? name.split('.') : [];
-    }
-    return attrs;
+exports.isValidKey = isValidKey;
+var getNames = function getNames(name) {
+  var attrs = [];
+  if (Array.isArray(name)) {
+    var _name = _toArray(name),
+      str = _name[0],
+      rest = _name.slice(1);
+    attrs = str.split('.').concat(rest);
+  } else {
+    attrs = typeof name === 'string' ? name.split('.') : [];
+  }
+  return attrs;
 };
-exports.getNames = getNames;
 /**
  * 对数据进行校验
  * @param {*} list
@@ -29,37 +38,36 @@ exports.getNames = getNames;
  * @param {*} formData
  * @returns
  */
-const recursionCheck = (list, dataLevel, formData, errorList = []) => {
-    try {
-        if (Array.isArray(list)) {
-            list.forEach((item) => {
-                const key = item.name;
-                const attrs = Object.keys(formData[key]);
-                attrs.forEach((attr) => {
-                    var _a;
-                    const error = (_a = formData[item.name][attr]) === null || _a === void 0 ? void 0 : _a.checkItem();
-                    if (error) {
-                        errorList.push(`${[item.name + '.' + attr]}:`, error);
-                    }
-                });
-                if (dataLevel[key]) {
-                    (0, exports.recursionCheck)(dataLevel[key], dataLevel, formData, errorList);
-                }
-            });
+exports.getNames = getNames;
+var recursionCheck = function recursionCheck(list, dataLevel, formData) {
+  var errorList = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  try {
+    if (Array.isArray(list)) {
+      list.forEach(function (item) {
+        var key = item.name;
+        var attrs = Object.keys(formData[key]);
+        attrs.forEach(function (attr) {
+          var _a;
+          var error = (_a = formData[item.name][attr]) === null || _a === void 0 ? void 0 : _a.checkItem();
+          if (error) {
+            errorList.push("".concat([item.name + '.' + attr], ":"), error);
+          }
+        });
+        if (dataLevel[key]) {
+          recursionCheck(dataLevel[key], dataLevel, formData, errorList);
         }
-        return errorList;
+      });
     }
-    catch (e) {
-        if (typeof e === 'string') {
-            throw e.toUpperCase();
-        }
-        else if (e instanceof Error) {
-            throw e.message;
-        }
-        throw e;
+    return errorList;
+  } catch (e) {
+    if (typeof e === 'string') {
+      throw e.toUpperCase();
+    } else if (e instanceof Error) {
+      throw e.message;
     }
+    throw e;
+  }
 };
-exports.recursionCheck = recursionCheck;
 /**
  * 将数据进行排序
  * @param {*} list
@@ -68,174 +76,164 @@ exports.recursionCheck = recursionCheck;
  * @param {*} errorList
  * @returns
  */
-const recursionSort = (list, dataLevel, formData) => {
-    try {
-        if (Array.isArray(list)) {
-            const values = list.reduce((total, item, index) => {
-                const attrObj = {};
-                const key = item.name;
-                const prefixs = key.split('.');
-                const attrs = formData[key] ? Object.keys(formData[key]) : [];
-                attrs.forEach((attr) => {
-                    var _a;
-                    attrObj[attr] = (_a = formData[key][attr]) === null || _a === void 0 ? void 0 : _a.value;
-                });
-                let children = [];
-                if (dataLevel[key]) {
-                    children = (0, exports.recursionSort)(dataLevel[key], dataLevel, formData);
-                }
-                const len = prefixs.length - 2;
-                if (total[prefixs[len]]) {
-                    total[prefixs[len]][index] = Object.assign(Object.assign({}, attrObj), (children || []));
-                }
-                else {
-                    total[prefixs[len]] = [
-                        Object.assign(Object.assign({}, attrObj), (children || [])),
-                    ];
-                }
-                return total;
-            }, {});
-            return values;
-        }
+exports.recursionCheck = recursionCheck;
+var recursionSort = function recursionSort(list, dataLevel, formData) {
+  try {
+    if (Array.isArray(list)) {
+      var values = list.reduce(function (total, item, index) {
+        var attrObj = {};
+        var key = item.name;
+        var prefixs = key.split('.');
+        var attrs = formData[key] ? Object.keys(formData[key]) : [];
+        attrs.forEach(function (attr) {
+          var _a;
+          attrObj[attr] = (_a = formData[key][attr]) === null || _a === void 0 ? void 0 : _a.value;
+        });
+        var children = [];
+        if (dataLevel[key]) {
+          children = recursionSort(dataLevel[key], dataLevel, formData);
+        }
+        var len = prefixs.length - 2;
+        if (total[prefixs[len]]) {
+          total[prefixs[len]][index] = Object.assign(Object.assign({}, attrObj), children || []);
+        } else {
+          total[prefixs[len]] = [Object.assign(Object.assign({}, attrObj), children || [])];
+        }
+        return total;
+      }, {});
+      return values;
     }
-    catch (e) {
-        if (typeof e === 'string') {
-            console.error(e.toUpperCase());
-            throw e.toUpperCase();
-        }
-        else if (e instanceof Error) {
-            console.error(e.message);
-            throw e.message;
-        }
-        throw e;
+  } catch (e) {
+    if (typeof e === 'string') {
+      console.error(e.toUpperCase());
+      throw e.toUpperCase();
+    } else if (e instanceof Error) {
+      console.error(e.message);
+      throw e.message;
     }
+    throw e;
+  }
 };
-exports.recursionSort = recursionSort;
 /**
  * 获取form表单的value
  * @param {*} formCurrent
  * @returns
  */
-const getFieldsValue = (formCurrent) => {
-    try {
-        const { formData, dataLevel } = formCurrent;
-        let firstKey = '';
-        // 这里不直接用Object.keys的原因是Object.keys并不能保证一定是按照属性顺序
-        for (const i in dataLevel) {
-            if (Object.prototype.hasOwnProperty.call(dataLevel, i)) {
-                firstKey = i;
-                break;
-            }
-        }
-        const recursionStart = dataLevel[firstKey];
-        const values = (0, exports.recursionSort)(recursionStart, dataLevel, formData);
-        return values;
+exports.recursionSort = recursionSort;
+var getFieldsValue = function getFieldsValue(formCurrent) {
+  try {
+    var formData = formCurrent.formData,
+      dataLevel = formCurrent.dataLevel;
+    var firstKey = '';
+    // 这里不直接用Object.keys的原因是Object.keys并不能保证一定是按照属性顺序
+    for (var i in dataLevel) {
+      if (Object.prototype.hasOwnProperty.call(dataLevel, i)) {
+        firstKey = i;
+        break;
+      }
     }
-    catch (e) {
-        if (typeof e === 'string') {
-            console.error(e.toUpperCase());
-            return e.toUpperCase();
-        }
-        else if (e instanceof Error) {
-            console.error(e.message);
-            return e.message;
-        }
-        return e;
+    var recursionStart = dataLevel[firstKey];
+    var values = recursionSort(recursionStart, dataLevel, formData);
+    return values;
+  } catch (e) {
+    if (typeof e === 'string') {
+      console.error(e.toUpperCase());
+      return e.toUpperCase();
+    } else if (e instanceof Error) {
+      console.error(e.message);
+      return e.message;
     }
+    return e;
+  }
 };
-exports.getFieldsValue = getFieldsValue;
 /**
  * 获取form表单的value
  * @param {*} formCurrent
  * @returns
  */
-const getFieldValue = (formCurrent, field) => {
-    var _a, _b;
-    try {
-        const { formData } = formCurrent;
-        return formData && ((_b = (_a = formData === null || formData === void 0 ? void 0 : formData[field[0]]) === null || _a === void 0 ? void 0 : _a[field[1]]) === null || _b === void 0 ? void 0 : _b.value);
-    }
-    catch (e) {
-        if (typeof e === 'string') {
-            return e.toUpperCase();
-        }
-        else if (e instanceof Error) {
-            return e.message;
-        }
-        return e;
+exports.getFieldsValue = getFieldsValue;
+var getFieldValue = function getFieldValue(formCurrent, field) {
+  var _a, _b;
+  try {
+    var formData = formCurrent.formData;
+    return formData && ((_b = (_a = formData === null || formData === void 0 ? void 0 : formData[field[0]]) === null || _a === void 0 ? void 0 : _a[field[1]]) === null || _b === void 0 ? void 0 : _b.value);
+  } catch (e) {
+    if (typeof e === 'string') {
+      return e.toUpperCase();
+    } else if (e instanceof Error) {
+      return e.message;
     }
+    return e;
+  }
 };
-exports.getFieldValue = getFieldValue;
 /**
  * 提交时候校验的方法
  * @param {*} formCurrent
  * @returns
  */
-const validateFields = (formCurrent) => {
-    return new Promise((resolve) => {
-        const { formData, dataLevel } = formCurrent;
-        let firstKey = '';
-        // 这里不直接用Object.keys的原因是Object.keys并不能保证一定是按照属性顺序
-        for (const i in dataLevel) {
-            if (Object.prototype.hasOwnProperty.call(dataLevel, i)) {
-                firstKey = i;
-                break;
-            }
-        }
-        const recursionStart = dataLevel[firstKey];
-        const errorList = (0, exports.recursionCheck)(recursionStart, dataLevel, formData);
-        if (Array.isArray(errorList) && errorList.length) {
-            console.error(JSON.stringify(errorList));
-        }
-        else {
-            resolve((0, exports.recursionSort)(recursionStart, dataLevel, formData));
-        }
-    });
-};
-exports.validateFields = validateFields;
-/** 获取初始化的值 */
-const getInitValue = (initialValues, names) => {
-    let keys = [];
-    if (Array.isArray(names)) {
-        const [str, ...rest] = names;
-        keys = str.split('.').concat(rest);
+exports.getFieldValue = getFieldValue;
+var validateFields = function validateFields(formCurrent) {
+  return new Promise(function (resolve) {
+    var formData = formCurrent.formData,
+      dataLevel = formCurrent.dataLevel;
+    var firstKey = '';
+    // 这里不直接用Object.keys的原因是Object.keys并不能保证一定是按照属性顺序
+    for (var i in dataLevel) {
+      if (Object.prototype.hasOwnProperty.call(dataLevel, i)) {
+        firstKey = i;
+        break;
+      }
     }
-    if (Array.isArray(keys) && !!keys.length) {
-        keys.forEach((i) => {
-            initialValues = ['', null, undefined].includes(initialValues === null || initialValues === void 0 ? void 0 : initialValues[i])
-                ? undefined
-                : initialValues === null || initialValues === void 0 ? void 0 : initialValues[i];
-        });
+    var recursionStart = dataLevel[firstKey];
+    var errorList = recursionCheck(recursionStart, dataLevel, formData);
+    if (Array.isArray(errorList) && errorList.length) {
+      console.error(JSON.stringify(errorList));
+    } else {
+      resolve(recursionSort(recursionStart, dataLevel, formData));
     }
-    return initialValues;
+  });
+};
+/** 获取初始化的值 */
+exports.validateFields = validateFields;
+var getInitValue = function getInitValue(initialValues, names) {
+  var keys = [];
+  if (Array.isArray(names)) {
+    var _names = _toArray(names),
+      str = _names[0],
+      rest = _names.slice(1);
+    keys = str.split('.').concat(rest);
+  }
+  if (Array.isArray(keys) && !!keys.length) {
+    keys.forEach(function (i) {
+      initialValues = ['', null, undefined].includes(initialValues === null || initialValues === void 0 ? void 0 : initialValues[i]) ? undefined : initialValues === null || initialValues === void 0 ? void 0 : initialValues[i];
+    });
+  }
+  return initialValues;
 };
-exports.getInitValue = getInitValue;
 /** 校验表单是否正确的方法 */
-const handleCheckItem = (value, rules) => {
-    try {
-        if (Array.isArray(rules)) {
-            rules.forEach((i) => {
-                // @ts-ignore
-                if (i.required && ['', null, undefined].includes(value)) {
-                    throw new Error((i === null || i === void 0 ? void 0 : i.message) || 'error');
-                }
-                if (i === null || i === void 0 ? void 0 : i.validator) {
-                    i.validator(rules, value, function (_errorMsg) {
-                        throw new Error(_errorMsg);
-                    });
-                }
-            });
-        }
-        return;
+exports.getInitValue = getInitValue;
+var handleCheckItem = function handleCheckItem(value, rules) {
+  try {
+    if (Array.isArray(rules)) {
+      rules.forEach(function (i) {
+        // @ts-ignore
+        if (i.required && ['', null, undefined].includes(value)) {
+          throw new Error((i === null || i === void 0 ? void 0 : i.message) || 'error');
+        }
+        if (i === null || i === void 0 ? void 0 : i.validator) {
+          i.validator(rules, value, function (_errorMsg) {
+            throw new Error(_errorMsg);
+          });
+        }
+      });
     }
-    catch (e) {
-        if (typeof e === 'string') {
-            return e.toUpperCase();
-        }
-        else if (e instanceof Error) {
-            return e.message;
-        }
+    return;
+  } catch (e) {
+    if (typeof e === 'string') {
+      return e.toUpperCase();
+    } else if (e instanceof Error) {
+      return e.message;
     }
+  }
 };
-exports.handleCheckItem = handleCheckItem;
-//# sourceMappingURL=utils.js.map
+exports.handleCheckItem = handleCheckItem;

package/lib/tntd-form/tntd-form.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tntd-form.stories.d.ts","sourceRoot":"","sources":["../../src/tntd-form/tntd-form.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;;;;;;;;;;;;;;;;;;;AAgCvC,wBAGsB;AAOtB,eAAO,MAAM,KAAK,uBAAoB,CAAA;AAmJtC,eAAO,MAAM,gBAAgB,uBAA+B,CAAA;AAyD5D,eAAO,MAAM,cAAc,mBAA8B,CAAA;AAyCzD,eAAO,MAAM,eAAe,mBAAmC,CAAA;AAuB/D,eAAO,MAAM,aAAa,mBAA4B,CAAA;AAuGtD,eAAO,MAAM,sBAAsB,mBAAqC,CAAA;AA8FxE,eAAO,MAAM,mBAAmB,mBAAkC,CAAA;AA2DlE,eAAO,MAAM,WAAW,mBAA0B,CAAA;AAiKlD,eAAO,MAAM,oBAAoB,mBAA2B,CAAA;AAkD5D,eAAO,MAAM,iBAAiB,mBAAgC,CAAA"}
+{"version":3,"file":"tntd-form.stories.d.ts","sourceRoot":"","sources":["../../src/tntd-form/tntd-form.stories.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;;;;;;;;;;;;;;;;;;;AA+BvC,wBAGsB;AAOtB,eAAO,MAAM,KAAK,uBAAoB,CAAA;AAuJtC,eAAO,MAAM,gBAAgB,uBAA+B,CAAA;AAyD5D,eAAO,MAAM,cAAc,mBAA8B,CAAA;AAyCzD,eAAO,MAAM,eAAe,mBAAmC,CAAA;AAuB/D,eAAO,MAAM,aAAa,mBAA4B,CAAA;AAuGtD,eAAO,MAAM,sBAAsB,mBAAqC,CAAA;AA8FxE,eAAO,MAAM,mBAAmB,mBAAkC,CAAA;AAkElE,eAAO,MAAM,WAAW,mBAA0B,CAAA;AAiKlD,eAAO,MAAM,oBAAoB,mBAA2B,CAAA;AAkD5D,eAAO,MAAM,iBAAiB,mBAAgC,CAAA"}

package/lib/tntd-form/tntd-form.stories.js

@@ -42,8 +42,8 @@ const react_1 = __importStar(require("react"));
 const index_1 = __importDefault(require("./index"));
 const index_2 = require("../index");
 const moment_1 = __importDefault(require("moment"));
-const { TreeNode } = index_2.TreeSelect;
 const { Option } = index_2.Select;
+const { TreeNode } = index_2.TreeSelect;
 const options = [
     { label: 'Apple', value: 'apple' },
     { label: 'Pear', value: 'pear' },
@@ -79,8 +79,8 @@ exports.Basic.args = {
             react_1.default.createElement(index_2.Input, null)),
         react_1.default.createElement(index_1.default.Item, { label: "Password", name: "password", rules: [{ required: true, message: 'Please input your password!' }] },
             react_1.default.createElement(index_2.Input.Password, null)),
-        react_1.default.createElement(index_1.default.Item, { label: "TreeSelect", name: "treeSelect" },
-            react_1.default.createElement(index_2.TreeSelect, { treeDefaultExpandAll: true, showSearch: true },
+        react_1.default.createElement(index_1.default.Item, { label: "TreeSelect", name: "treeSelect", rules: [{ required: true, message: 'Please select one node' }] },
+            react_1.default.createElement(index_2.TreeSelect, { showSearch: true, treeDefaultExpandAll: true, allowClear: true },
                 react_1.default.createElement(TreeNode, { value: "parent 1", title: "parent 1", key: "0-1" },
                     react_1.default.createElement(TreeNode, { value: "parent 1-0", title: "parent 1-0", key: "0-1-1" },
                         react_1.default.createElement(TreeNode, { value: "leaf1", title: "my leaf", key: "random" }),
@@ -297,13 +297,14 @@ exports.DynamicItemsComplex = DynamicItemsComplexTpl.bind({});
 // 弹窗中表单
 const FormInModalTpl = () => {
     const [data, setData] = (0, react_1.useState)({});
+    const [destroyOnClose, setDestroyOnClose] = (0, react_1.useState)(true);
     const [popupType, setPopupType] = (0, react_1.useState)('modal');
     const PopupCom = {
         modal: index_2.Modal,
         drawer: index_2.Drawer,
     }[popupType];
-    const [form] = index_1.default.useForm();
     const close = () => setData(null);
+    const [form] = index_1.default.useForm();
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(index_2.Button, { type: "primary", onClick: () => setData({}), style: { marginRight: 12 } }, "\u65B0\u5EFA"),
         react_1.default.createElement(index_2.Button, { type: "primary", style: { marginRight: 12, marginBottom: 12 }, onClick: () => setData({
@@ -315,7 +316,8 @@ const FormInModalTpl = () => {
         react_1.default.createElement(index_2.Radio.Group, { value: popupType, onChange: (evt) => setPopupType(evt.target.value) },
             react_1.default.createElement(index_2.Radio.Button, { value: "modal" }, "\u5F39\u7A97"),
             react_1.default.createElement(index_2.Radio.Button, { value: "drawer" }, "\u62BD\u5C49")),
-        react_1.default.createElement(PopupCom, { title: `${(data === null || data === void 0 ? void 0 : data.id) ? '编辑' : '新建'}`, visible: !!data, width: "40%", destroyOnClose: true, onClose: close, onCancel: close, onOk: close },
+        react_1.default.createElement(index_2.Switch, { onClick: () => setDestroyOnClose(!destroyOnClose), checked: destroyOnClose, checkedChildren: "\u5173\u95ED\u65F6\u9500\u6BC1\u5B50\u5143\u7D20", unCheckedChildren: "\u5173\u95ED\u65F6\u4E0D\u9500\u6BC1\u5B50\u5143\u7D20" }),
+        react_1.default.createElement(PopupCom, { title: `${(data === null || data === void 0 ? void 0 : data.id) ? '编辑' : '新建'}`, visible: !!data, width: "40%", destroyOnClose: destroyOnClose, onClose: close, onCancel: close, onOk: close },
             react_1.default.createElement(index_1.default, { initialValues: data, form: form },
                 react_1.default.createElement(index_1.default.Item, { name: "name", label: "\u540D\u79F0" },
                     react_1.default.createElement(index_2.Input, null)),