tntd 3.0.11 → 3.0.12-beta.1

package/lib/query-form-v3/index.js

@@ -0,0 +1,206 @@
+"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 _react = _interopRequireWildcard(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _createActions = _interopRequireDefault(require("./createActions"));
+var _Field = _interopRequireDefault(require("./Field"));
+var _Composition = _interopRequireDefault(require("./Field/Composition"));
+var _useForm = _interopRequireDefault(require("./useForm"));
+var _button = _interopRequireDefault(require("../button"));
+var _form = _interopRequireDefault(require("../form"));
+var _prevLocale = require("../prev-locale");
+require("./index.less");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+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 _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; }
+var clsPrefix = 'tnt-queryform';
+function QueryForm(_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,
+    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;
+  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.useEffect)(function () {
+    var _search = function _search() {
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[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 function () {
+      formRef.current.off('search', _search);
+    };
+  }, []);
+  var _getText = function _getText(key) {
+    return (0, _prevLocale.getText)(key, language || (0, _prevLocale.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]
+    };
+    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) {
+    var _a;
+    var values = formRef.current.getValues();
+    var newValues = Object.assign(Object.assign({}, values), value);
+    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]) {
+          delete newValues[key];
+        }
+      });
+    }
+    formRef.current.setData('values', newValues);
+    if (onChange) {
+      (_a = Object.keys(values)) === null || _a === void 0 ? void 0 : _a.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);
+        }
+      });
+      if (needSearch) {
+        formRef.current.emit('search', newValues);
+      }
+    }
+  };
+  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);
+            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];
+          }
+        }
+      }
+      return [groupFields, outFields, rightChildren, compositionInitValues];
+    }, [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;
+  return _react["default"].createElement("div", {
+    className: (0, _classnames["default"])(clsPrefix, _defineProperty({}, className, className))
+  }, _react["default"].createElement(_form["default"], {
+    layout: "inline"
+  }, _react["default"].createElement("div", {
+    className: "".concat(clsPrefix, "-top")
+  }, _react["default"].createElement("div", {
+    className: "".concat(clsPrefix, "-top-body")
+  }, hasOutField ? 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 ? _react["default"].createElement(_Composition["default"], {
+    clsPrefix: clsPrefix,
+    fieldItems: groupFields,
+    initialValues: compositionInitValues,
+    onChange: _onCompositionFieldChange,
+    form: formRef.current
+  }) : null, renderActions ? renderActions() : _react["default"].createElement(_react["default"].Fragment, null, showSearch && _react["default"].createElement(_button["default"], {
+    type: "primary",
+    onClick: _onSearch
+  }, _getText('search')), showReset && _react["default"].createElement(_button["default"], {
+    onClick: _onReset
+  }, _getText('reset')))), showExtra && _react["default"].createElement("div", {
+    className: "".concat(clsPrefix, "-extra")
+  }, rightChildren, extraActions)), isGroupMode && hasOutField && _react["default"].createElement("div", {
+    className: "".concat(clsPrefix, "-bottom")
+  }, _react["default"].createElement(_Composition["default"], {
+    clsPrefix: clsPrefix,
+    fieldItems: groupFields,
+    initialValues: compositionInitValues,
+    onChange: _onCompositionFieldChange,
+    form: formRef.current
+  }))));
+}
+QueryForm.Field = _Field["default"];
+QueryForm.useForm = _useForm["default"];
+QueryForm.createForm = _createActions["default"];
+var _default = exports["default"] = QueryForm;

package/lib/query-form-v3/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-form-v3/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useMemo, useRef, useEffect, useState } from 'react'\nimport cn from 'classnames'\nimport createActions from './createActions'\nimport Field from './Field'\nimport Composition from './Field/Composition'\nimport useForm from './useForm'\nimport Button from '../button'\nimport Form from '../form'\nimport { getLanguage, getText } from '../prev-locale'\n\nimport './index.less'\n\nconst clsPrefix = 'tnt-queryform'\n\nfunction QueryForm({\n  form,\n  className = '',\n  initialValues: _initialValues,\n  language,\n  onSearch,\n  onReset,\n  onChange,\n  renderActions,\n  extraActions,\n  children,\n  showSearch = false,\n  showReset = false,\n  showFieldCount = 3,\n  minGroupCount = 3, // 最小聚合个数\n}) {\n  const [initialValues, setInitialValues] = useState(_initialValues || {})\n  const formRef = useRef(form || createActions())\n\n  useEffect(() => {\n    const _search = (params = {}) => {\n      onSearch({\n        ...formRef.current.getValues(),\n        ...params,\n      })\n    }\n    formRef.current.setData('initialValues', initialValues)\n    formRef.current.setData('values', initialValues)\n    formRef.current.on('search', _search)\n    return () => {\n      formRef.current.off('search', _search)\n    }\n  }, [])\n\n  const _getText = (key) => {\n    return getText(key, language || getLanguage())\n  }\n  const _onSearch = () => {\n    onSearch?.(formRef.current.getValues())\n  }\n\n  const _onReset = () => {\n    formRef.current.setValues({ ...initialValues })\n    onReset?.(initialValues)\n    setInitialValues({ ...initialValues })\n  }\n\n  const _onFieldChange = (name, value, ...rest) => {\n    const values = formRef.current.getValues()\n    const newValues = {\n      ...values,\n      [name]: value,\n    }\n    const changedInfo = { name, value, preValue: values?.[name] }\n    formRef.current.setData('values', newValues)\n    onChange && onChange(newValues, changedInfo, ...rest)\n  }\n\n  const _onCompositionFieldChange = (value, deleteKeys, needSearch) => {\n    const values = formRef.current.getValues()\n    const newValues = {\n      ...values,\n      ...value,\n    }\n    if (deleteKeys?.length) {\n      deleteKeys?.forEach((key) => {\n        if (values?.[key]) {\n          delete newValues[key]\n        }\n      })\n    }\n    formRef.current.setData('values', newValues)\n    if (onChange) {\n      Object.keys(values)?.forEach((key) => {\n        if (JSON.stringify(value[key]) !== JSON.stringify(values[key] || '')) {\n          const changedInfo = { name: key, value: value[key], preValue: values?.[key] }\n          onChange(newValues, changedInfo)\n        }\n      })\n      if(needSearch) {\n        formRef.current.emit('search', newValues)\n      }\n    }\n  }\n\n  const [groupFields, outFields, rightChildren, compositionInitValues] = useMemo(() => {\n    let groupFields = []\n    let outFields = []\n    let otherFields = []\n    const rightChildren = []\n    const compositionInitValues = {}\n    React.Children.map(children, (child) => {\n      if (child) {\n        if (child.props?.align === 'right') {\n          rightChildren.push(child)\n          return\n        } else if (child.props?.isGroup === false) {\n          outFields.push(child)\n        } else {\n          groupFields.push(child)\n        }\n        otherFields.push(child)\n      }\n    })\n    if (groupFields.length <= minGroupCount) {\n      groupFields = []\n      outFields = otherFields\n    } else {\n      // 初始值\n      for (let i = 0; i < groupFields.length; i++) {\n        const name = groupFields[i].props?.name\n        if (initialValues[name] !== undefined) {\n          compositionInitValues[name] = initialValues[name]\n        }\n      }\n    }\n    return [groupFields, outFields, rightChildren, compositionInitValues]\n  }, [children, minGroupCount, initialValues])\n\n  const isGroupMode = groupFields.length > 0\n  const hasOutField = outFields.length > 0\n  const showExtra = rightChildren.length > 0 || extraActions\n\n  return (\n    <div className={cn(clsPrefix, { [className]: className })}>\n      <Form layout=\"inline\">\n        <div className={`${clsPrefix}-top`}>\n          <div className={`${clsPrefix}-top-body`}>\n            {hasOutField ? (\n              outFields.map((child, i) =>\n                React.cloneElement(child, {\n                  form: formRef.current,\n                  initialValue: initialValues?.[child.props?.name],\n                  onChange: _onFieldChange,\n                  key: i,\n                })\n              )\n            ) : isGroupMode ? (\n              <Composition\n                clsPrefix={clsPrefix}\n                fieldItems={groupFields}\n                initialValues={compositionInitValues}\n                onChange={_onCompositionFieldChange}\n                form={formRef.current}\n              />\n            ) : null}\n\n            {renderActions ? (\n              renderActions()\n            ) : (\n              <>\n                {showSearch && (\n                  <Button type=\"primary\" onClick={_onSearch}>\n                    {_getText('search')}\n                  </Button>\n                )}\n                {showReset && <Button onClick={_onReset}>{_getText('reset')}</Button>}\n              </>\n            )}\n          </div>\n          {showExtra && (\n            <div className={`${clsPrefix}-extra`}>\n              {rightChildren}\n              {extraActions}\n            </div>\n          )}\n        </div>\n        {isGroupMode && hasOutField && (\n          <div className={`${clsPrefix}-bottom`}>\n            <Composition\n              clsPrefix={clsPrefix}\n              fieldItems={groupFields}\n              initialValues={compositionInitValues}\n              onChange={_onCompositionFieldChange}\n              form={formRef.current}\n            />\n          </div>\n        )}\n      </Form>\n    </div>\n  )\n}\n\nQueryForm.Field = Field\nQueryForm.useForm = useForm\nQueryForm.createForm = createActions\n\nexport default QueryForm\n"]}

package/lib/query-form-v3/index.less

@@ -0,0 +1,91 @@
+.tnt-queryform {
+  &-top {
+    display: flex;
+    flex: 1;
+    &-body {
+      flex: 1;
+      .ant-btn {
+        margin-right: 10px;
+      }
+    }
+  }
+
+  &-extra {
+    & > * {
+      margin-left: 10px;
+    }
+  }
+
+  .ant-form {
+    // margin-bottom: @margin-sm;
+    &.ant-form-inline {
+      flex-wrap: unset;
+      position: relative;
+    }
+
+    &.ant-form-inline .ant-form-item {
+      margin-right: 10px;
+      margin-bottom: @margin-sm;
+      display: inline-block;
+    }
+
+    .ant-form-item-control {
+      // min-width: 160px;
+      line-height: unset;
+      .ant-calendar-picker-input {
+        padding: 0 @padding-sm;
+      }
+      .ant-form-item-children {
+        & > .ant-input,
+        & > .ant-input-affix-wrapper {
+          width: 160px;
+          // width: 200px;
+        }
+      }
+    }
+  }
+
+  &-drawer {
+    margin-top: @margin-xxl;
+    &.large-size {
+      margin-top: 60px;
+    }
+
+    &.ant-drawer.ant-drawer-open {
+      .ant-drawer-mask {
+        opacity: 0;
+        background: unset;
+      }
+    }
+    .ant-drawer-body {
+      .ant-form-item {
+        display: block;
+        margin-right: 0;
+        margin-bottom: @margin-md;
+        width: 100%;
+      }
+      .ant-form-item-label {
+        display: block;
+        text-align: left;
+        line-height: 22px;
+        margin-bottom: 10px;
+      }
+      .ant-form-item-control-wrapper,
+      .ant-form-item-control,
+      .ant-calendar-picker,
+      .ant-input {
+        min-width: 100%;
+        width: 100%;
+      }
+
+      & > .ant-btn {
+        display: block;
+        width: 100%;
+        margin-bottom: 10px;
+        &.ant-btn-primary {
+          margin-top: @margin-md;
+        }
+      }
+    }
+  }
+}

package/lib/query-form-v3/useForm.d.ts

@@ -0,0 +1,13 @@
+export default function useForm(): {
+    setData(key: any, value: any): void;
+    getData(key: any): void;
+    setValues(values: any): void;
+    getValues(): {};
+    resetValues(): void;
+    setValue(name: any, value: any): void;
+    getValue(name: any): any;
+    on: (eventName: any, callback: any) => void;
+    emit: (...args: any[]) => void;
+    off: (...args: any[]) => void;
+}[];
+//# sourceMappingURL=useForm.d.ts.map

package/lib/query-form-v3/useForm.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useForm.d.ts","sourceRoot":"","sources":["../../src/query-form-v3/useForm.js"],"names":[],"mappings":"AAGA;;;;;;;;;;;IAIC"}

package/lib/query-form-v3/useForm.js

@@ -0,0 +1,13 @@
+"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];
+}

package/lib/query-form-v3/useForm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/query-form-v3/useForm.js"],"names":[],"mappings":";;;;;AAAA,iCAA8B;AAC9B,oEAA2C;AAE3C,SAAwB,OAAO;IAC7B,MAAM,IAAI,GAAG,IAAA,cAAM,EAAC,IAAA,uBAAa,GAAE,CAAC,CAAA;IAEpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACvB,CAAC;AAJD,0BAIC","sourcesContent":["import { useRef } from 'react'\nimport createActions from './createActions'\n\nexport default function useForm() {\n  const form = useRef(createActions())\n\n  return [form.current]\n}\n"]}

package/lib/query-list-scene/QueryForm.d.ts

@@ -5,13 +5,13 @@ declare class QueryForm extends React.PureComponent<any, any, any> {
     componentDidMount(): void;
     onSearch: (searchObj: any) => void;
     onReset: () => void;
-    onChange: (newValues: any, changedInfo: any, ...rest: any[]) => void;
+    onChange: (newValues: any, changedInfo: any) => void;
     setFormData: (data: any, needSearch: any) => void;
     resetFormData: (needSearch: any) => void;
     componentWillUnmount(): void;
 }
 declare namespace QueryForm {
-    const Field: typeof import("../query-form/Field").default;
+    const Field: typeof import("../query-form-v3/Field").default;
 }
 export default QueryForm;
 import React from "react";

package/lib/query-list-scene/QueryForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryForm.d.ts","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":"AAMA;IACE,wBAQC;IAJC,UAAqC;IAMvC,4BAeC;IAED,0BAcC;IAED,mCAWC;IAED,oBAOC;IAED,qEAKC;IAED,kDAKC;IAED,yCAKC;IAED,6BAKC;CACF"}
+{"version":3,"file":"QueryForm.d.ts","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":"AAUA;IACE,wBAQC;IAJC,UAAqC;IAMvC,4BAeC;IAED,0BAcC;IAED,mCAWC;IAED,oBAOC;IAED,qDAKC;IAED,kDAKC;IAED,yCAKC;IAED,6BAKC;CACF"}

package/lib/query-list-scene/QueryForm.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _queryForm = _interopRequireDefault(require("../query-form"));
+var _queryFormV = _interopRequireDefault(require("../query-form-v3"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
@@ -29,7 +29,12 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
+
+// import FormV2 from '../query-form'
+
 var clsPrefix = 'tnt-querylistscene-queryform';
+// const Form = !!localStorage.getItem('query-form') ? FormV3 : FormV2
+var Form = _queryFormV["default"];
 var QueryForm = exports["default"] = /*#__PURE__*/function (_React$PureComponent) {
   function QueryForm(props) {
     var _this;
@@ -78,10 +83,7 @@ var QueryForm = exports["default"] = /*#__PURE__*/function (_React$PureComponent
           onChange = _this$props3.onChange,
           actions = _this$props3.actions;
         actions.setFormData(newValues, false);
-        for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-          rest[_key - 2] = arguments[_key];
-        }
-        onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [newValues, changedInfo].concat(rest));
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValues, changedInfo);
       }
     });
     Object.defineProperty(_this, "setFormData", {
@@ -109,7 +111,7 @@ var QueryForm = exports["default"] = /*#__PURE__*/function (_React$PureComponent
     });
     var actions = props.actions,
       form = props.form;
-    _this.form = form || _queryForm["default"].createForm();
+    _this.form = form || Form.createForm();
     actions.on('setFormData', _this.setFormData);
     actions.on('resetFormData', _this.resetFormData);
     return _this;
@@ -125,7 +127,7 @@ var QueryForm = exports["default"] = /*#__PURE__*/function (_React$PureComponent
         extralActions = _a.extralActions,
         qlsProps = _a.qlsProps,
         props = __rest(_a, ["className", "actions", "extraActions", "extralActions", "qlsProps"]);
-      return _react["default"].createElement(_queryForm["default"], Object.assign({}, props, {
+      return _react["default"].createElement(Form, Object.assign({}, props, {
         form: this.form,
         className: (0, _classnames["default"])(clsPrefix, className),
         // 前期拼写错误，导致需要兼容错误的api
@@ -159,4 +161,4 @@ var QueryForm = exports["default"] = /*#__PURE__*/function (_React$PureComponent
     }
   }]);
 }(_react["default"].PureComponent);
-QueryForm.Field = _queryForm["default"].Field;
+QueryForm.Field = Form.Field;

package/lib/query-list-scene/QueryForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryForm.js","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,4DAAmC;AACnC,+DAAgC;AAEhC,MAAM,SAAS,GAAG,8BAA8B,CAAA;AAEhD,MAAqB,SAAU,SAAQ,eAAK,CAAC,aAAa;IACxD,YAAY,KAAK;QACf,KAAK,CAAC,KAAK,CAAC,CAAA;QA0Cd;;;;mBAAW,CAAC,SAAS,EAAE,EAAE;gBACvB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACxC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;gBACpC,MAAM,MAAM,iDAAQ,MAAM,GAAK,CAAC,SAAS,IAAI,EAAE,CAAC,KAAE,OAAO,EAAE,CAAC,GAAE,CAAA;gBAE9D,gCAAgC;gBAChC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;gBACnC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC1B,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAA;oBAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBAChC,CAAC,CAAC,CAAA;YACJ,CAAC;WAAA;QAED;;;;mBAAU,GAAG,EAAE;gBACb,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAEtD,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;gBAEzC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,aAAa,CAAC,CAAA;gBACxB,IAAI,CAAC,QAAQ,EAAE,CAAA;YACjB,CAAC;WAAA;QAED;;;;mBAAW,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,EAAE;gBAC7C,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAExC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;gBACrC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,CAAA;YAC7C,CAAC;WAAA;QAED;;;;mBAAc,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE;gBACjC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAC9B,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;gBACjC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACzB,UAAU,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAA;YAC/B,CAAC;WAAA;QAED;;;;mBAAgB,CAAC,UAAU,EAAE,EAAE;gBAC7B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAE7C,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;gBAC9C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAA;YACzB,CAAC;WAAA;QAlFC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;QAE/B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,oBAAI,CAAC,UAAU,EAAE,CAAA;QAErC,OAAO,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3C,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IACjD,CAAC;IAED,MAAM;QACJ,MAAM,KAA0E,IAAI,CAAC,KAAK,EAApF,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,OAAyB,EAApB,KAAK,cAArE,qEAAuE,CAAa,CAAA;QAE1F,OAAO,CACL,8BAAC,oBAAI,oBACC,KAAK,IACT,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,SAAS,EAAE,IAAA,oBAAU,EAAC,SAAS,EAAE,SAAS,CAAC;YAC3C,sBAAsB;YACtB,YAAY,EAAE,YAAY,IAAI,aAAa,EAC3C,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,OAAO,EAAE,IAAI,CAAC,OAAO,IACrB,CACH,CAAA;IACH,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAEpE,IAAI,QAAQ,CAAC,MAAM,IAAI,MAAM,EAAE;YAC7B,OAAO,CAAC,WAAW,iCAEZ,aAAa,GACb,OAAO,CAAC,WAAW,EAAE,GAE1B,KAAK,CACN,CAAA;SACF;aAAM;YACL,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;SAC3C;IACH,CAAC;IA6CD,oBAAoB;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAE9B,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACvD,OAAO,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IAC7D,CAAC;CACF;AA7FD,4BA6FC;AAED,SAAS,CAAC,KAAK,GAAG,oBAAI,CAAC,KAAK,CAAA","sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\nimport Form from '../query-form'\n\nconst clsPrefix = 'tnt-querylistscene-queryform'\n\nexport default class QueryForm extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    const { actions, form } = props\n\n    this.form = form || Form.createForm()\n\n    actions.on('setFormData', this.setFormData)\n    actions.on('resetFormData', this.resetFormData)\n  }\n\n  render() {\n    const { className, actions, extraActions, extralActions, qlsProps, ...props } = this.props\n\n    return (\n      <Form\n        {...props}\n        form={this.form}\n        className={classnames(clsPrefix, className)}\n        // 前期拼写错误，导致需要兼容错误的api\n        extraActions={extraActions || extralActions}\n        onChange={this.onChange}\n        onSearch={this.onSearch}\n        onReset={this.onReset}\n      />\n    )\n  }\n\n  componentDidMount() {\n    const { initialValues = {}, actions, qlsProps, memory } = this.props\n\n    if (qlsProps.memory || memory) {\n      actions.setFormData(\n        {\n          ...initialValues,\n          ...actions.getFormData(),\n        },\n        false\n      )\n    } else {\n      actions.setData('formData', initialValues)\n    }\n  }\n\n  onSearch = (searchObj) => {\n    const { onSearch, actions } = this.props\n    const values = actions.getFormData()\n    const params = { ...values, ...(searchObj || {}), current: 1 }\n\n    // memory 与 url解析setForm时 监听事件异步\n    actions.setData('formData', values)\n    Promise.resolve().then(() => {\n      onSearch && onSearch(params)\n      actions.emit('search', params)\n    })\n  }\n\n  onReset = () => {\n    const { initialValues, onReset, actions } = this.props\n\n    actions.setFormData(initialValues, false)\n\n    onReset?.(initialValues)\n    this.onSearch()\n  }\n\n  onChange = (newValues, changedInfo, ...rest) => {\n    const { onChange, actions } = this.props\n\n    actions.setFormData(newValues, false)\n    onChange?.(newValues, changedInfo, ...rest)\n  }\n\n  setFormData = (data, needSearch) => {\n    const { actions } = this.props\n    actions.setData('formData', data)\n    this.form.setValues(data)\n    needSearch && this.onSearch()\n  }\n\n  resetFormData = (needSearch) => {\n    const { initialValues, actions } = this.props\n\n    actions.setFormData(initialValues, needSearch)\n    this.form.resetValues()\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    actions.removeListener('setFormData', this.setFormData)\n    actions.removeListener('resetFormData', this.resetFormData)\n  }\n}\n\nQueryForm.Field = Form.Field\n"]}
+{"version":3,"file":"QueryForm.js","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\n// import FormV2 from '../query-form'\nimport FormV3 from '../query-form-v3'\n\nconst clsPrefix = 'tnt-querylistscene-queryform'\n\n// const Form = !!localStorage.getItem('query-form') ? FormV3 : FormV2\nconst Form = FormV3\n\nexport default class QueryForm extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    const { actions, form } = props\n\n    this.form = form || Form.createForm()\n\n    actions.on('setFormData', this.setFormData)\n    actions.on('resetFormData', this.resetFormData)\n  }\n\n  render() {\n    const { className, actions, extraActions, extralActions, qlsProps, ...props } = this.props\n\n    return (\n      <Form\n        {...props}\n        form={this.form}\n        className={classnames(clsPrefix, className)}\n        // 前期拼写错误，导致需要兼容错误的api\n        extraActions={extraActions || extralActions}\n        onChange={this.onChange}\n        onSearch={this.onSearch}\n        onReset={this.onReset}\n      />\n    )\n  }\n\n  componentDidMount() {\n    const { initialValues = {}, actions, qlsProps, memory } = this.props\n\n    if (qlsProps.memory || memory) {\n      actions.setFormData(\n        {\n          ...initialValues,\n          ...actions.getFormData(),\n        },\n        false\n      )\n    } else {\n      actions.setData('formData', initialValues)\n    }\n  }\n\n  onSearch = (searchObj) => {\n    const { onSearch, actions } = this.props\n    const values = actions.getFormData()\n    const params = { ...values, ...(searchObj || {}), current: 1 }\n\n    // memory 与 url解析setForm时 监听事件异步\n    actions.setData('formData', values)\n    Promise.resolve().then(() => {\n      onSearch && onSearch(params)\n      actions.emit('search', params)\n    })\n  }\n\n  onReset = () => {\n    const { initialValues, onReset, actions } = this.props\n\n    actions.setFormData(initialValues, false)\n\n    onReset?.(initialValues)\n    this.onSearch()\n  }\n\n  onChange = (newValues, changedInfo) => {\n    const { onChange, actions } = this.props\n\n    actions.setFormData(newValues, false)\n    onChange?.(newValues, changedInfo)\n  }\n\n  setFormData = (data, needSearch) => {\n    const { actions } = this.props\n    actions.setData('formData', data)\n    this.form.setValues(data)\n    needSearch && this.onSearch()\n  }\n\n  resetFormData = (needSearch) => {\n    const { initialValues, actions } = this.props\n\n    actions.setFormData(initialValues, needSearch)\n    this.form.resetValues()\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    actions.removeListener('setFormData', this.setFormData)\n    actions.removeListener('resetFormData', this.resetFormData)\n  }\n}\n\nQueryForm.Field = Form.Field\n"]}

package/lib/table/resizableTable/index.d.ts

@@ -4,7 +4,7 @@ interface ColumnType {
     width?: any;
 }
 interface MyComponentProps {
-    columns: ColumnType[];
+    columns?: ColumnType[];
     className?: string;
 }
 declare const _default: React.ForwardRefExoticComponent<MyComponentProps & React.RefAttributes<any>>;

package/lib/table/resizableTable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/table/resizableTable/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAA;AAKtE,OAAO,cAAc,CAAA;AAkCrB,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;;AAoDD,wBAAsC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/table/resizableTable/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAA;AAKtE,OAAO,cAAc,CAAA;AAkCrB,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,GAAG,CAAA;CACZ;AAED,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,UAAU,EAAE,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;;AAsDD,wBAAsC"}

package/lib/table/resizableTable/index.js

@@ -91,20 +91,23 @@ var MyComponent = function MyComponent(props, ref) {
     });
   };
   (0, _react.useEffect)(function () {
-    var curColumns = buildColumns(props.columns);
-    setColumns(curColumns || []);
+    if (Array.isArray(props === null || props === void 0 ? void 0 : props.columns)) {
+      var curColumns = buildColumns(props.columns);
+      setColumns(curColumns || []);
+    }
   }, [props === null || props === void 0 ? void 0 : props.columns]);
   (0, _react.useEffect)(function () {
     dataRef.current = columns;
   }, [columns]);
-  return _react["default"].createElement(_table.Table, Object.assign({}, props, {
+  return _react["default"].createElement(_table.Table, Object.assign({}, props, Array.isArray(props === null || props === void 0 ? void 0 : props.columns) ? {
+    columns: columns
+  } : {}, {
     className: (0, _classnames["default"])('tnt-resizable-table', _defineProperty({}, props.className, props.className)),
     components: {
       header: {
         cell: ResizableTitle
       }
-    },
-    columns: columns
+    }
   }));
 };
 var _default = exports["default"] = (0, _react.forwardRef)(MyComponent);

package/lib/table/resizableTable/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/table/resizableTable/index.tsx"],"names":[],"mappings":"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","sourcesContent":["import React, { useState, forwardRef, useRef, useEffect } from 'react'\nimport cn from 'classnames'\nimport { throttle } from 'lodash'\nimport { Resizable } from 'react-resizable'\nimport { Table } from '../table'\nimport './index.less'\n\nconst ResizableTitle = (\n  props: React.HTMLAttributes<any> & {\n    onResize: (e: React.SyntheticEvent<Element>, data: any) => void\n    width: number\n  }\n) => {\n  const { onResize, width, ...restProps } = props\n\n  if (!width) {\n    return <th {...restProps} />\n  }\n\n  return (\n    <Resizable\n      width={width}\n      height={0}\n      handle={\n        <span\n          className=\"react-resizable-handle\"\n          onClick={(e) => {\n            e.stopPropagation()\n          }}\n        />\n      }\n      onResize={onResize}\n      draggableOpts={{ enableUserSelectHack: false }}\n    >\n      <th {...restProps} />\n    </Resizable>\n  )\n}\n\ninterface ColumnType {\n  width?: any\n}\n\ninterface MyComponentProps {\n  columns: ColumnType[]\n  className?: string\n}\n\nconst MyComponent: React.ForwardRefRenderFunction<any, MyComponentProps> = (props, ref) => {\n  const [columns, setColumns] = useState<ColumnType[]>([])\n  const dataRef = useRef<ColumnType[]>([])\n\n  const handleResize = (index: number) =>\n    throttle((e, { size }) => {\n      const updatedColumns = dataRef.current || []\n      setColumns(\n        updatedColumns.map((column, idx) =>\n          idx === index ? { ...column, width: size.width } : column\n        )\n      )\n    }, 25)\n\n  const buildColumns = (columns: ColumnType[]) =>\n    columns?.map((column, index) => {\n      if (typeof column?.width === 'string' && column?.width?.includes('%')) {\n        return column\n      }\n      return {\n        ...column,\n        onHeaderCell: (column: ColumnType) => {\n          let width = column.width\n          if (typeof width === 'string' && !width.includes('%')) {\n            width = Number(width.replace(/[^\\d]/g, ''))\n          }\n          return { width, onResize: handleResize(index) }\n        },\n      }\n    })\n\n  useEffect(() => {\n    const curColumns = buildColumns(props.columns)\n    setColumns(curColumns || [])\n  }, [props?.columns])\n\n  useEffect(() => {\n    dataRef.current = columns\n  }, [columns])\n\n  return (\n    <Table\n      {...props}\n      className={cn('tnt-resizable-table', { [props.className!]: props.className })}\n      components={{ header: { cell: ResizableTitle } }}\n      columns={columns}\n    />\n  )\n}\n\nexport default forwardRef(MyComponent)\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/table/resizableTable/index.tsx"],"names":[],"mappings":"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","sourcesContent":["import React, { useState, forwardRef, useRef, useEffect } from 'react'\nimport cn from 'classnames'\nimport { throttle } from 'lodash'\nimport { Resizable } from 'react-resizable'\nimport { Table } from '../table'\nimport './index.less'\n\nconst ResizableTitle = (\n  props: React.HTMLAttributes<any> & {\n    onResize: (e: React.SyntheticEvent<Element>, data: any) => void\n    width: number\n  }\n) => {\n  const { onResize, width, ...restProps } = props\n\n  if (!width) {\n    return <th {...restProps} />\n  }\n\n  return (\n    <Resizable\n      width={width}\n      height={0}\n      handle={\n        <span\n          className=\"react-resizable-handle\"\n          onClick={(e) => {\n            e.stopPropagation()\n          }}\n        />\n      }\n      onResize={onResize}\n      draggableOpts={{ enableUserSelectHack: false }}\n    >\n      <th {...restProps} />\n    </Resizable>\n  )\n}\n\ninterface ColumnType {\n  width?: any\n}\n\ninterface MyComponentProps {\n  columns?: ColumnType[]\n  className?: string\n}\n\nconst MyComponent: React.ForwardRefRenderFunction<any, MyComponentProps> = (props, ref) => {\n  const [columns, setColumns] = useState<ColumnType[]>([])\n  const dataRef = useRef<ColumnType[]>([])\n\n  const handleResize = (index: number) =>\n    throttle((e, { size }) => {\n      const updatedColumns = dataRef.current || []\n      setColumns(\n        updatedColumns.map((column, idx) =>\n          idx === index ? { ...column, width: size.width } : column\n        )\n      )\n    }, 25)\n\n  const buildColumns = (columns: ColumnType[]) =>\n    columns?.map((column, index) => {\n      if (typeof column?.width === 'string' && column?.width?.includes('%')) {\n        return column\n      }\n      return {\n        ...column,\n        onHeaderCell: (column: ColumnType) => {\n          let width = column.width\n          if (typeof width === 'string' && !width.includes('%')) {\n            width = Number(width.replace(/[^\\d]/g, ''))\n          }\n          return { width, onResize: handleResize(index) }\n        },\n      }\n    })\n\n  useEffect(() => {\n    if (Array.isArray(props?.columns)) {\n      const curColumns = buildColumns(props.columns)\n      setColumns(curColumns || [])\n    }\n  }, [props?.columns])\n\n  useEffect(() => {\n    dataRef.current = columns\n  }, [columns])\n\n  return (\n    <Table\n      {...props}\n      {...(Array.isArray(props?.columns) ? { columns } : {})}\n      className={cn('tnt-resizable-table', { [props.className!]: props.className })}\n      components={{ header: { cell: ResizableTitle } }}\n    />\n  )\n}\n\nexport default forwardRef(MyComponent)\n"]}

package/lib/table/table-hoc.d.ts

@@ -1,7 +1,14 @@
 import React from 'react';
 import type { TableProps as AntdTableProps } from 'antd/lib/table';
-declare const Table: React.ForwardRefExoticComponent<Omit<AntdTableProps<any>, "locale"> & {
-    resizable?: boolean | undefined;
-} & React.RefAttributes<unknown>>;
+declare type CustomTableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {
+    resizable?: boolean;
+};
+declare const Table: {
+    (props: CustomTableProps<any>): React.JSX.Element;
+    Column: typeof import("antd/lib/table/Column").default;
+    ColumnGroup: typeof import("antd/lib/table/ColumnGroup").default;
+    displayName: string;
+    titleCaseUpper: (str: any, upperCaseIgnore?: any[]) => any;
+};
 export { Table };
 //# sourceMappingURL=table-hoc.d.ts.map

package/lib/table/table-hoc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-hoc.d.ts","sourceRoot":"","sources":["../../src/table/table-hoc.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AACzC,OAAO,KAAK,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,eAAe,CAAA;AAQjE,QAAA,MAAM,KAAK;;iCAQT,CAAA;AAEF,OAAO,EAAE,KAAK,EAAE,CAAA"}
+{"version":3,"file":"table-hoc.d.ts","sourceRoot":"","sources":["../../src/table/table-hoc.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,eAAe,CAAA;AAIjE,aAAK,gBAAgB,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IAC7D,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,QAAA,MAAM,KAAK;YAAW,iBAAiB,GAAG,CAAC;;;;;CAQ1C,CAAA;AAMD,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/lib/table/table-hoc.js

@@ -1,16 +1,13 @@
 "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.Table = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _table = require("./table");
 var _index = _interopRequireDefault(require("./resizableTable/index"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-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; }
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
   for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -19,16 +16,16 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
-var Table = exports.Table = (0, _react.forwardRef)(function (props, ref) {
+var Table = exports.Table = function Table(props) {
   var _props$resizable = props.resizable,
     resizable = _props$resizable === void 0 ? false : _props$resizable,
     restProps = __rest(props, ["resizable"]);
   if (resizable) {
-    return _react["default"].createElement(_index["default"], Object.assign({
-      columns: []
-    }, restProps, {
-      ref: ref
-    }));
+    return _react["default"].createElement(_index["default"], Object.assign({}, restProps));
   }
   return _react["default"].createElement(_table.Table, Object.assign({}, restProps));
-});
+};
+Table.Column = _table.Table.Column;
+Table.ColumnGroup = _table.Table.ColumnGroup;
+Table.displayName = 'Table';
+Table.titleCaseUpper = _table.Table.titleCaseUpper;

package/lib/table/table-hoc.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-hoc.js","sourceRoot":"","sources":["../../src/table/table-hoc.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AAEzC,mCAA4C;AAC5C,mEAAmD;AAMnD,MAAM,KAAK,GAAG,IAAA,kBAAU,EAAC,CAAC,KAA4B,EAAE,GAAQ,EAAE,EAAE;IAClE,MAAM,EAAE,SAAS,GAAG,KAAK,KAAmB,KAAK,EAAnB,SAAS,UAAK,KAAK,EAA3C,aAAmC,CAAQ,CAAA;IAEjD,IAAI,SAAS,EAAE;QACb,OAAO,8BAAC,eAAc,kBAAC,OAAO,EAAE,EAAE,IAAM,SAAS,IAAE,GAAG,EAAE,GAAG,IAAI,CAAA;KAChE;IAED,OAAO,8BAAC,aAAS,oBAAK,SAAS,EAAI,CAAA;AACrC,CAAC,CAAC,CAAA;AAEO,sBAAK","sourcesContent":["import React, { forwardRef } from 'react'\nimport type { TableProps as AntdTableProps } from 'antd/lib/table'\nimport { Table as AntdTable } from './table'\nimport ResizableTable from './resizableTable/index'\n\ntype CustomTableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {\n  resizable?: boolean\n}\n\nconst Table = forwardRef((props: CustomTableProps<any>, ref: any) => {\n  const { resizable = false, ...restProps } = props\n\n  if (resizable) {\n    return <ResizableTable columns={[]} {...restProps} ref={ref} />\n  }\n\n  return <AntdTable {...restProps} />\n})\n\nexport { Table }\n"]}
+{"version":3,"file":"table-hoc.js","sourceRoot":"","sources":["../../src/table/table-hoc.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,mCAA4C;AAC5C,mEAAmD;AAMnD,MAAM,KAAK,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7C,MAAM,EAAE,SAAS,GAAG,KAAK,KAAmB,KAAK,EAAnB,SAAS,UAAK,KAAK,EAA3C,aAAmC,CAAQ,CAAA;IAEjD,IAAI,SAAS,EAAE;QACb,OAAO,8BAAC,eAAc,oBAAK,SAAS,EAAI,CAAA;KACzC;IAED,OAAO,8BAAC,aAAS,oBAAK,SAAS,EAAI,CAAA;AACrC,CAAC,CAAA;AAMQ,sBAAK;AAJd,KAAK,CAAC,MAAM,GAAG,aAAS,CAAC,MAAM,CAAA;AAC/B,KAAK,CAAC,WAAW,GAAG,aAAS,CAAC,WAAW,CAAA;AACzC,KAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAC3B,KAAK,CAAC,cAAc,GAAG,aAAS,CAAC,cAAc,CAAA","sourcesContent":["import React from 'react'\nimport type { TableProps as AntdTableProps } from 'antd/lib/table'\nimport { Table as AntdTable } from './table'\nimport ResizableTable from './resizableTable/index'\n\ntype CustomTableProps<T> = Omit<AntdTableProps<T>, 'locale'> & {\n  resizable?: boolean\n}\n\nconst Table = (props: CustomTableProps<any>) => {\n  const { resizable = false, ...restProps } = props\n\n  if (resizable) {\n    return <ResizableTable {...restProps} />\n  }\n\n  return <AntdTable {...restProps} />\n}\n\nTable.Column = AntdTable.Column\nTable.ColumnGroup = AntdTable.ColumnGroup\nTable.displayName = 'Table'\nTable.titleCaseUpper = AntdTable.titleCaseUpper\nexport { Table }\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.11",
+    "version": "3.0.12-beta.1",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",