tntd 3.0.40-beta.8 → 3.0.41-beta.1

package/es/query-form/index.js

@@ -1,260 +1,175 @@
-"use strict";
-
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _flatten2 = _interopRequireDefault(require("lodash/flatten"));
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _Composition = _interopRequireDefault(require("./Field/Composition"));
-var _form = _interopRequireDefault(require("../form"));
-var _createActions = _interopRequireDefault(require("./createActions"));
-var _Field = _interopRequireDefault(require("./Field"));
-var _useForm = _interopRequireDefault(require("./useForm"));
-require("./index.less");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } // import Button from '../button'
+import React, { useMemo, useRef, useEffect, useState, useImperativeHandle, forwardRef } from 'react';
+import cn from 'classnames';
+import { flatten } from 'lodash';
+import Composition from './Field/Composition';
+// import Button from '../button'
+import Form from '../form';
 // import { getLanguage, getText } from '../prev-locale'
-var clsPrefix = 'tnt-queryform';
-var QueryForm = (0, _react.forwardRef)(function (_ref, ref) {
-  var form = _ref.form,
-    _ref$className = _ref.className,
-    className = _ref$className === void 0 ? '' : _ref$className,
-    _initialValues = _ref.initialValues,
-    language = _ref.language,
-    onSearch = _ref.onSearch,
-    onReset = _ref.onReset,
-    hasOnChange = _ref.hasOnChange,
-    onChange = _ref.onChange,
-    renderActions = _ref.renderActions,
-    extraActions = _ref.extraActions,
-    children = _ref.children,
-    _ref$showSearch = _ref.showSearch,
-    showSearch = _ref$showSearch === void 0 ? false : _ref$showSearch,
-    _ref$showReset = _ref.showReset,
-    showReset = _ref$showReset === void 0 ? false : _ref$showReset,
-    _ref$showFieldCount = _ref.showFieldCount,
-    showFieldCount = _ref$showFieldCount === void 0 ? 3 : _ref$showFieldCount,
-    _ref$minGroupCount = _ref.minGroupCount,
-    minGroupCount = _ref$minGroupCount === void 0 ? 3 : _ref$minGroupCount,
-    _ref$compositionShowR = _ref.compositionShowReset,
-    compositionShowReset = _ref$compositionShowR === void 0 ? true : _ref$compositionShowR,
-    inline = _ref.inline,
-    defaultSearchField = _ref.defaultSearchField,
-    defaultSearchPlaceholder = _ref.defaultSearchPlaceholder;
-  var _useState = (0, _react.useState)(_initialValues || {}),
-    _useState2 = _slicedToArray(_useState, 2),
-    initialValues = _useState2[0],
-    setInitialValues = _useState2[1];
-  var formRef = (0, _react.useRef)(form || (0, _createActions["default"])());
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      form: formRef.current
-    };
-  }, []);
-  (0, _react.useEffect)(function () {
-    var _search = function _search() {
-      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      onSearch === null || onSearch === void 0 ? void 0 : onSearch(Object.assign(Object.assign({}, formRef.current.getValues()), params));
+import createActions from './createActions';
+import Field from './Field';
+import useForm from './useForm';
+import './index.less';
+const clsPrefix = 'tnt-queryform';
+const QueryForm = forwardRef(({ form, className = '', initialValues: _initialValues, language, onSearch, onReset, hasOnChange, onChange, renderActions, extraActions, children, showSearch = false, showReset = false, showFieldCount = 3, minGroupCount = 3, // 最小聚合个数
+compositionShowReset = true, inline, defaultSearchField, defaultSearchPlaceholder, }, ref) => {
+    const [initialValues, setInitialValues] = useState(_initialValues || {});
+    const formRef = useRef(form || createActions());
+    useImperativeHandle(ref, () => ({
+        form: formRef.current,
+    }), []);
+    useEffect(() => {
+        const _search = (params = {}) => {
+            onSearch === null || onSearch === void 0 ? void 0 : onSearch(Object.assign(Object.assign({}, formRef.current.getValues()), params));
+        };
+        formRef.current.setData('initialValues', initialValues);
+        formRef.current.setData('values', initialValues);
+        formRef.current.on('search', _search);
+        return () => {
+            formRef.current.off('search', _search);
+        };
+    }, []);
+    // const _getText = (key) => {
+    //   return getText(key, language || getLanguage())
+    // }
+    const _onSearch = () => {
+        onSearch === null || onSearch === void 0 ? void 0 : onSearch(formRef.current.getValues());
     };
-    formRef.current.setData('initialValues', initialValues);
-    formRef.current.setData('values', initialValues);
-    formRef.current.on('search', _search);
-    return function () {
-      formRef.current.off('search', _search);
+    const _onReset = () => {
+        formRef.current.setValues(Object.assign({}, initialValues));
+        onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
+        setInitialValues(Object.assign({}, initialValues));
     };
-  }, []);
-  // const _getText = (key) => {
-  //   return getText(key, language || getLanguage())
-  // }
-  var _onSearch = function _onSearch() {
-    onSearch === null || onSearch === void 0 ? void 0 : onSearch(formRef.current.getValues());
-  };
-  var _onReset = function _onReset() {
-    formRef.current.setValues(Object.assign({}, initialValues));
-    onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
-    setInitialValues(Object.assign({}, initialValues));
-  };
-  var _onFieldChange = function _onFieldChange(name, value) {
-    var values = formRef.current.getValues();
-    var newValues = Object.assign(Object.assign({}, values), _defineProperty({}, name, value));
-    var changedInfo = {
-      name: name,
-      value: value,
-      preValue: values === null || values === void 0 ? void 0 : values[name]
+    const _onFieldChange = (name, value, ...rest) => {
+        const values = formRef.current.getValues();
+        const newValues = Object.assign(Object.assign({}, values), { [name]: value });
+        const changedInfo = { name, value, preValue: values === null || values === void 0 ? void 0 : values[name] };
+        formRef.current.setData('values', newValues);
+        onChange && onChange(newValues, changedInfo, ...rest);
     };
-    formRef.current.setData('values', newValues);
-    for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-      rest[_key - 2] = arguments[_key];
-    }
-    onChange && onChange.apply(void 0, [newValues, changedInfo].concat(rest));
-  };
-  var _onCompositionFieldChange = function _onCompositionFieldChange(value, deleteKeys, needSearch, isReset) {
-    var values = formRef.current.getValues();
-    var newValues = Object.assign(Object.assign({}, values), value);
-    var changeKeys = Object.keys(newValues);
-    if (deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) {
-      deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.forEach(function (key) {
-        if ((values === null || values === void 0 ? void 0 : values[key]) || (values === null || values === void 0 ? void 0 : values[key]) === 0 || (values === null || values === void 0 ? void 0 : values[key]) === false) {
-          delete newValues[key];
+    const _onCompositionFieldChange = (value, deleteKeys, needSearch, isReset) => {
+        const values = formRef.current.getValues();
+        const newValues = Object.assign(Object.assign({}, values), value);
+        const changeKeys = Object.keys(newValues);
+        if (deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) {
+            deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.forEach((key) => {
+                if ((values === null || values === void 0 ? void 0 : values[key]) || (values === null || values === void 0 ? void 0 : values[key]) === 0 || (values === null || values === void 0 ? void 0 : values[key]) === false) {
+                    delete newValues[key];
+                }
+            });
         }
-      });
-    }
-    formRef.current.setData('values', newValues);
-    if (isReset) {
-      return;
-    } else if ((deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) === 1) {
-      // 删除一定要搜索
-      if (onSearch) {
-        onSearch(newValues, true);
-      } else {
-        onChange(newValues, {
-          name: deleteKeys[0]
-        });
-      }
-    } else if (needSearch && !hasOnChange) {
-      formRef.current.emit('search', Object.assign(Object.assign({}, newValues), {
-        current: 1
-      }));
-    } else if (onChange) {
-      changeKeys.forEach(function (key) {
-        if (JSON.stringify(value[key]) !== JSON.stringify(values[key])) {
-          var changedInfo = {
-            name: key,
-            value: value[key],
-            preValue: values === null || values === void 0 ? void 0 : values[key]
-          };
-          onChange(newValues, changedInfo);
-        }
-      });
-    }
-  };
-  var _useMemo = (0, _react.useMemo)(function () {
-      var _a;
-      var groupFields = [];
-      var outFields = [];
-      var otherFields = [];
-      var rightChildren = [];
-      var compositionInitValues = {};
-      _react["default"].Children.map(children, function (child) {
-        var _a, _b;
-        if (child) {
-          if (((_a = child.props) === null || _a === void 0 ? void 0 : _a.align) === 'right') {
-            rightChildren.push(child);
+        formRef.current.setData('values', newValues);
+        if (isReset) {
             return;
-          } else if (((_b = child.props) === null || _b === void 0 ? void 0 : _b.isGroup) === false) {
-            outFields.push(child);
-          } else {
-            groupFields.push(child);
-          }
-          otherFields.push(child);
         }
-      });
-      if (groupFields.length <= minGroupCount) {
-        groupFields = [];
-        outFields = otherFields;
-      } else {
-        // 初始值
-        for (var i = 0; i < groupFields.length; i++) {
-          var name = (_a = groupFields[i].props) === null || _a === void 0 ? void 0 : _a.name;
-          if (initialValues[name] !== undefined) {
-            compositionInitValues[name] = initialValues[name];
-          }
+        else if ((deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) === 1) {
+            // 删除一定要搜索
+            if (onSearch) {
+                onSearch(newValues, true);
+            }
+            else {
+                onChange(newValues, { name: deleteKeys[0] });
+            }
+        }
+        else if (needSearch && !hasOnChange) {
+            formRef.current.emit('search', Object.assign(Object.assign({}, newValues), { current: 1 }));
+        }
+        else if (onChange) {
+            changeKeys.forEach((key) => {
+                if (JSON.stringify(value[key]) !== JSON.stringify(values[key])) {
+                    const changedInfo = { name: key, value: value[key], preValue: values === null || values === void 0 ? void 0 : values[key] };
+                    onChange(newValues, changedInfo);
+                }
+            });
+        }
+    };
+    const [groupFields, outFields, rightChildren, compositionInitValues] = useMemo(() => {
+        var _a;
+        let groupFields = [];
+        let outFields = [];
+        let otherFields = [];
+        const rightChildren = [];
+        const compositionInitValues = {};
+        React.Children.map(children, (child) => {
+            var _a, _b;
+            if (child) {
+                if (((_a = child.props) === null || _a === void 0 ? void 0 : _a.align) === 'right') {
+                    rightChildren.push(child);
+                    return;
+                }
+                else if (((_b = child.props) === null || _b === void 0 ? void 0 : _b.isGroup) === false) {
+                    outFields.push(child);
+                }
+                else {
+                    groupFields.push(child);
+                }
+                otherFields.push(child);
+            }
+        });
+        if (groupFields.length <= minGroupCount) {
+            groupFields = [];
+            outFields = otherFields;
         }
-      }
-      return [(0, _flatten2["default"])(groupFields.map(function (it) {
-        if (it.props.type === 'selectInput') {
-          var _ref2 = it.props || {},
-            _name = _ref2.name,
-            props = _ref2.props;
-          var _ref3 = props || {},
-            _ref3$options = _ref3.options,
-            options = _ref3$options === void 0 ? [] : _ref3$options;
-          return options.map(function (_ref4) {
-            var label = _ref4.label,
-              value = _ref4.value;
-            return {
-              props: {
-                pName: _name,
-                cName: value,
-                name: "".concat(_name, ".").concat(value),
-                title: label,
-                type: 'otherInput',
-                props: {}
-              }
-            };
-          });
-        } else {
-          return it;
+        else {
+            // 初始值
+            for (let i = 0; i < groupFields.length; i++) {
+                const name = (_a = groupFields[i].props) === null || _a === void 0 ? void 0 : _a.name;
+                if (initialValues[name] !== undefined) {
+                    compositionInitValues[name] = initialValues[name];
+                }
+            }
         }
-      })), outFields, rightChildren, Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined];
-    }, [children, minGroupCount, initialValues]),
-    _useMemo2 = _slicedToArray(_useMemo, 4),
-    groupFields = _useMemo2[0],
-    outFields = _useMemo2[1],
-    rightChildren = _useMemo2[2],
-    compositionInitValues = _useMemo2[3];
-  var isGroupMode = groupFields.length > 0;
-  var hasOutField = outFields.length > 0;
-  var showExtra = rightChildren.length > 0 || extraActions;
-  console.log(groupFields);
-  return _react["default"].createElement("div", {
-    className: (0, _classnames["default"])(clsPrefix, className, _defineProperty({}, "".concat(clsPrefix, "-inline"), inline))
-  }, _react["default"].createElement(_form["default"], {
-    layout: "inline"
-  }, _react["default"].createElement("div", {
-    className: "".concat(clsPrefix, "-top")
-  }, _react["default"].createElement("div", {
-    className: "".concat(clsPrefix, "-top-body")
-  }, outFields.map(function (child, i) {
-    var _a;
-    return _react["default"].cloneElement(child, {
-      form: formRef.current,
-      initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_a = child.props) === null || _a === void 0 ? void 0 : _a.name],
-      onChange: _onFieldChange,
-      key: i
-    });
-  }), isGroupMode && (!hasOutField || inline) && _react["default"].createElement(_Composition["default"], {
-    clsPrefix: clsPrefix,
-    fieldItems: groupFields,
-    initialValues: compositionInitValues,
-    _onReset: _onReset,
-    _onSearch: _onSearch,
-    onChange: _onCompositionFieldChange,
-    form: formRef.current,
-    compositionShowReset: compositionShowReset,
-    defaultSearchField: defaultSearchField,
-    defaultSearchPlaceholder: defaultSearchPlaceholder
-  }), renderActions ? renderActions() : _react["default"].createElement(_react["default"].Fragment, null)), showExtra && _react["default"].createElement("div", {
-    className: "".concat(clsPrefix, "-extra")
-  }, rightChildren, extraActions)), isGroupMode && hasOutField && !inline && _react["default"].createElement("div", {
-    className: "".concat(clsPrefix, "-bottom")
-  }, _react["default"].createElement(_Composition["default"], {
-    clsPrefix: clsPrefix,
-    fieldItems: groupFields,
-    initialValues: compositionInitValues,
-    _onReset: _onReset,
-    _onSearch: _onSearch,
-    onChange: _onCompositionFieldChange,
-    form: formRef.current,
-    compositionShowReset: compositionShowReset,
-    defaultSearchField: defaultSearchField,
-    defaultSearchPlaceholder: defaultSearchPlaceholder
-  }))));
+        return [
+            flatten(groupFields.map((it) => {
+                if (it.props.type === 'selectInput') {
+                    const { name, props } = it.props || {};
+                    const { options = [] } = props || {};
+                    return options.map(({ label, value }) => ({
+                        props: {
+                            pName: name,
+                            cName: value,
+                            name: `${name}.${value}`,
+                            title: label,
+                            type: 'otherInput',
+                            props: {},
+                        },
+                    }));
+                }
+                else {
+                    return it;
+                }
+            })),
+            outFields,
+            rightChildren,
+            Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined,
+        ];
+    }, [children, minGroupCount, initialValues]);
+    const isGroupMode = groupFields.length > 0;
+    const hasOutField = outFields.length > 0;
+    const showExtra = rightChildren.length > 0 || extraActions;
+    console.log(groupFields);
+    return (React.createElement("div", { className: cn(clsPrefix, className, { [`${clsPrefix}-inline`]: inline }) },
+        React.createElement(Form, { layout: "inline" },
+            React.createElement("div", { className: `${clsPrefix}-top` },
+                React.createElement("div", { className: `${clsPrefix}-top-body` },
+                    outFields.map((child, i) => {
+                        var _a;
+                        return React.cloneElement(child, {
+                            form: formRef.current,
+                            initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_a = child.props) === null || _a === void 0 ? void 0 : _a.name],
+                            onChange: _onFieldChange,
+                            key: i,
+                        });
+                    }),
+                    isGroupMode && (!hasOutField || inline) && (React.createElement(Composition, { clsPrefix: clsPrefix, fieldItems: groupFields, initialValues: compositionInitValues, _onReset: _onReset, _onSearch: _onSearch, onChange: _onCompositionFieldChange, form: formRef.current, compositionShowReset: compositionShowReset, defaultSearchField: defaultSearchField, defaultSearchPlaceholder: defaultSearchPlaceholder })),
+                    renderActions ? (renderActions()) : (React.createElement(React.Fragment, null))),
+                showExtra && (React.createElement("div", { className: `${clsPrefix}-extra` },
+                    rightChildren,
+                    extraActions))),
+            isGroupMode && hasOutField && !inline && (React.createElement("div", { className: `${clsPrefix}-bottom` },
+                React.createElement(Composition, { clsPrefix: clsPrefix, fieldItems: groupFields, initialValues: compositionInitValues, _onReset: _onReset, _onSearch: _onSearch, onChange: _onCompositionFieldChange, form: formRef.current, compositionShowReset: compositionShowReset, defaultSearchField: defaultSearchField, defaultSearchPlaceholder: defaultSearchPlaceholder }))))));
 });
-QueryForm.Field = _Field["default"];
-QueryForm.useForm = _useForm["default"];
-QueryForm.createForm = _createActions["default"];
-var _default = exports["default"] = QueryForm;
+QueryForm.Field = Field;
+QueryForm.useForm = useForm;
+QueryForm.createForm = createActions;
+export default QueryForm;
+//# sourceMappingURL=index.js.map

package/es/query-form/useForm.js

@@ -1,13 +1,7 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = useForm;
-var _react = require("react");
-var _createActions = _interopRequireDefault(require("./createActions"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function useForm() {
-  var form = (0, _react.useRef)((0, _createActions["default"])());
-  return [form.current];
-}
+import { useRef } from 'react';
+import createActions from './createActions';
+export default function useForm() {
+    const form = useRef(createActions());
+    return [form.current];
+}
+//# sourceMappingURL=useForm.js.map