tntd 3.0.0-beta.7 → 3.0.0-beta.8

package/es/drawer/drawer.js

@@ -17,6 +17,8 @@ const DefaultFooter = ({
   locale,
   onClose,
   onSubmit,
+  onCancel,
+  onOk,
   okText,
   okType,
   cancelText,
@@ -25,13 +27,13 @@ const DefaultFooter = ({
   cancelButtonProps
 }) => {
   return React.createElement(React.Fragment, null, React.createElement(Button, Object.assign({
-    onClick: onClose,
+    onClick: onCancel || onClose,
     style: {
       marginRight: 8
     },
     type: 'tertiary'
   }, cancelButtonProps), cancelText || (locale === null || locale === void 0 ? void 0 : locale.cancelText)), React.createElement(Button, Object.assign({
-    onClick: onSubmit,
+    onClick: onOk || onSubmit,
     type: okType,
     loading: confirmLoading
   }, okButtonProps), okText || (locale === null || locale === void 0 ? void 0 : locale.okText)));

package/es/drawer/drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from 'antd/es/config-provider'\nimport type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer'\nimport { default as AntdDrawer } from 'antd/es/drawer'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport type { BaseButtonProps } from 'antd/es/button/button'\nimport type { TntButtonType } from '../button/button'\n\nimport React, { FC, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onClose,\n  onSubmit,\n  okText,\n  okType,\n  cancelText,\n  confirmLoading,\n  okButtonProps,\n  cancelButtonProps,\n}: {\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  onClose?: () => void\n  onSubmit?: () => void\n  okText: string\n  cancelText: string\n  okType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button onClick={onClose} style={{ marginRight: 8 }} type={'tertiary'} {...cancelButtonProps}>\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button onClick={onSubmit} type={okType} loading={confirmLoading} {...okButtonProps}>\n        {okText || locale?.okText}\n      </Button>\n    </>\n  )\n}\n\ninterface CustomDrawerProps extends AntdDrawerProps {\n  footer?: React.ReactNode\n  showFooter?: boolean\n  onClose?: () => void\n  onSubmit?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  onSubmit,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n\n  useEffect(() => {\n    if (clickOnBlankToClose) {\n      const handleOutsideClick = (event: Event) => {\n        const drawer = drawerDom.current as Node\n        const targetElement = event.target as Node\n\n        let isInDrawer = false\n        if (drawer && targetElement) {\n          isInDrawer = drawer.contains(targetElement as Node) || targetElement === drawer\n        }\n        drawerDom.current = null\n        if (rest.visible && !isInDrawer && onClose) {\n          onClose()\n        }\n      }\n      document.removeEventListener('click', handleOutsideClick)\n      document.addEventListener('click', handleOutsideClick)\n      return () => {\n        document.removeEventListener('click', handleOutsideClick)\n      }\n    }\n  }, [rest.visible, clickOnBlankToClose, onClose])\n\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('drawer')\n        return (\n          <LocaleReceiver componentName=\"Drawer\" defaultLocale={locale}>\n            {(locale) => {\n              return (\n                <div\n                  onClick={(event: React.MouseEvent<HTMLDivElement>) => {\n                    drawerDom.current = event.target\n                  }}\n                >\n                  <AntdDrawer\n                    className={classNames(prefixCls, 'tnt-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-footer`]: showFooter,\n                    })}\n                    closable={false}\n                    onClose={onClose}\n                    width={480}\n                    {...rest}\n                  >\n                    <>\n                      {closable !== false && (\n                        <Icon type=\"close\" className={`${prefixCls}-close`} onClick={onClose} />\n                      )}\n                      {rest.children}\n                      {showFooter && (\n                        <div className={`${prefixCls}-footer-style`}>\n                          {showFooter && !footer ? (\n                            <DefaultFooter\n                              confirmLoading={confirmLoading}\n                              okButtonProps={okButtonProps}\n                              cancelButtonProps={cancelButtonProps}\n                              okType={okType}\n                              locale={locale}\n                              okText={okText}\n                              cancelText={cancelText}\n                              onClose={onClose}\n                              onSubmit={onSubmit}\n                            />\n                          ) : (\n                            footer\n                          )}\n                        </div>\n                      )}\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}
+{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"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","sourcesContent":["import { ConfigConsumer } from 'antd/es/config-provider'\nimport type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer'\nimport { default as AntdDrawer } from 'antd/es/drawer'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport type { BaseButtonProps } from 'antd/es/button/button'\nimport type { TntButtonType } from '../button/button'\n\nimport React, { FC, useEffect, useRef } from 'react'\nimport { Button } from '../button'\nimport Icon from '../icon'\nconst DefaultFooter = ({\n  locale,\n  onClose,\n  onSubmit,\n  onCancel,\n  onOk,\n  okText,\n  okType,\n  cancelText,\n  confirmLoading,\n  okButtonProps,\n  cancelButtonProps,\n}: {\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  onClose?: () => void\n  onSubmit?: () => void\n  onCancel?: () => void\n  onOk?: () => void\n  okText: string\n  cancelText: string\n  okType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n}) => {\n  return (\n    <>\n      <Button\n        onClick={onCancel || onClose}\n        style={{ marginRight: 8 }}\n        type={'tertiary'}\n        {...cancelButtonProps}\n      >\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button onClick={onOk || onSubmit} type={okType} loading={confirmLoading} {...okButtonProps}>\n        {okText || locale?.okText}\n      </Button>\n    </>\n  )\n}\n\ninterface CustomDrawerProps extends AntdDrawerProps {\n  footer?: React.ReactNode\n  showFooter?: boolean\n  onClose?: () => void\n  onSubmit?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: TntButtonType\n  confirmLoading?: boolean\n  okButtonProps?: BaseButtonProps\n  cancelButtonProps?: BaseButtonProps\n  clickOnBlankToClose: boolean\n}\n\nexport const Drawer: FC<CustomDrawerProps> = ({\n  closable = true,\n  className,\n  footer,\n  showFooter,\n  onClose,\n  onSubmit,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n\n  useEffect(() => {\n    if (clickOnBlankToClose) {\n      const handleOutsideClick = (event: Event) => {\n        const drawer = drawerDom.current as Node\n        const targetElement = event.target as Node\n\n        let isInDrawer = false\n        if (drawer && targetElement) {\n          isInDrawer = drawer.contains(targetElement as Node) || targetElement === drawer\n        }\n        drawerDom.current = null\n        if (rest.visible && !isInDrawer && onClose) {\n          onClose()\n        }\n      }\n      document.removeEventListener('click', handleOutsideClick)\n      document.addEventListener('click', handleOutsideClick)\n      return () => {\n        document.removeEventListener('click', handleOutsideClick)\n      }\n    }\n  }, [rest.visible, clickOnBlankToClose, onClose])\n\n  return (\n    <ConfigConsumer>\n      {({ getPrefixCls }) => {\n        const prefixCls = getPrefixCls('drawer')\n        return (\n          <LocaleReceiver componentName=\"Drawer\" defaultLocale={locale}>\n            {(locale) => {\n              return (\n                <div\n                  onClick={(event: React.MouseEvent<HTMLDivElement>) => {\n                    drawerDom.current = event.target\n                  }}\n                >\n                  <AntdDrawer\n                    className={classNames(prefixCls, 'tnt-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-footer`]: showFooter,\n                    })}\n                    closable={false}\n                    onClose={onClose}\n                    width={480}\n                    {...rest}\n                  >\n                    <>\n                      {closable !== false && (\n                        <Icon type=\"close\" className={`${prefixCls}-close`} onClick={onClose} />\n                      )}\n                      {rest.children}\n                      {showFooter && (\n                        <div className={`${prefixCls}-footer-style`}>\n                          {showFooter && !footer ? (\n                            <DefaultFooter\n                              confirmLoading={confirmLoading}\n                              okButtonProps={okButtonProps}\n                              cancelButtonProps={cancelButtonProps}\n                              okType={okType}\n                              locale={locale}\n                              okText={okText}\n                              cancelText={cancelText}\n                              onClose={onClose}\n                              onSubmit={onSubmit}\n                            />\n                          ) : (\n                            footer\n                          )}\n                        </div>\n                      )}\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}

package/es/handle/index.js

@@ -8,7 +8,7 @@ var __rest = this && this.__rest || function (s, e) {
 };
 import React, { Fragment } from 'react';
 import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
-import Icon from '../tntd-icon';
+import Icon from '../icon';
 import { doUpperTitle } from "../utils/lang";
 import Divider from '../divider';
 import Dropdown from '../dropdown';
@@ -22,13 +22,13 @@ export default (props => {
     const _a = props || {},
       {
         children = [],
-        type,
-        num = 3,
+        type = "icon",
+        num = 6,
         lang,
-        divider = true,
-        lessOneMoreFit,
+        divider = false,
+        lessOneMoreFit = true,
         popConfirmHandle,
-        isIconBtn,
+        isIconBtn = true,
         stopPropagation = true,
         upperCaseIgnore = [],
         unUpperConverted = false
@@ -128,11 +128,14 @@ export default (props => {
           e.stopPropagation();
         }
       }
-    }, rest), preChildPart, !!(lastChildPart === null || lastChildPart === void 0 ? void 0 : lastChildPart.length) && React.createElement(Dropdown, {
+    }, rest, {
+      className: `tnt-handle-wrap ${(rest === null || rest === void 0 ? void 0 : rest.className) || ''}`
+    }), preChildPart, !!(lastChildPart === null || lastChildPart === void 0 ? void 0 : lastChildPart.length) && React.createElement(Dropdown, {
       overlay: menu(lastChildPart || []),
       arrow: true
     }, type === 'icon' ? React.createElement(Icon, {
-      type: "more"
+      type: "more",
+      className: 'tnt-handle-more'
     }) : React.createElement("a", {
       className: "ant-dropdown-more"
     }, locale === null || locale === void 0 ? void 0 : locale.more, React.createElement("i", {

package/es/handle/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handle/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { Fragment } from 'react'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport Icon from '../tntd-icon'\nimport {doUpperTitle} from \"../utils/lang\"\nimport Divider from '../divider'\nimport Dropdown from '../dropdown'\nimport Menu from '../menu'\nimport './index.less'\n\nconst clsPrefix = 'tntd-more-menus'\n\n\nexport default (props) => {\n  return (\n    <LocaleReceiver componentName=\"Handle\">\n      {(locale, localeCode) => {\n        const {\n            children = [],\n            type,\n            num = 3,\n            lang,\n            divider = true,\n            lessOneMoreFit,\n            popConfirmHandle,\n            isIconBtn,\n            stopPropagation=true,\n            upperCaseIgnore=[],\n            unUpperConverted=false,\n            ...rest\n        } = props || {}\n\n        // 非中文\n        let isCn = lang === 'cn'\n        if (!lang) {\n          isCn = localeCode === 'zh-cn'\n        }\n\n\n\n        let newChildren = []\n        if (Array.isArray(children)) {\n          newChildren = children?.filter((item) => !!item) || []\n        } else if (children) {\n          newChildren.push(children)\n        }\n\n\n        // 非中文 且非 icon图标\n        if(!unUpperConverted && !isCn  && !isIconBtn ){\n            newChildren?.forEach((v,i)=>{\n                newChildren[i] = React.cloneElement(v, {\n                    ...(v?.props || {}),\n                   children: doUpperTitle(v.props.children, upperCaseIgnore)\n                })\n            })\n        }\n\n        // 子元素大于1个，且不是 icon元素\n        const specialSceneDefaultShow = newChildren?.length > 1 && !isIconBtn\n\n        if (specialSceneDefaultShow && (!isCn || popConfirmHandle)) {\n          newChildren?.forEach((v, i) => {\n            const { type, props } = v\n            if (\n              type?.name === 'Popconfirm' ||\n              (props.hasOwnProperty('onConfirm') && typeof props?.onConfirm === 'function')\n            ) {\n              let placement = {}\n              if (\n                !isCn ||\n                (num &&\n                  !isNaN(num) &&\n                  i + 1 > num &&\n                  !(lessOneMoreFit && newChildren.length - num === 1))\n              ) {\n                placement = {\n                  placement: 'left',\n                }\n              }\n              newChildren[i] = React.cloneElement(v, {\n                overlayStyle: { width: 180 },\n                ...(v?.props || {}),\n                onClick: (e) => e.stopPropagation(),\n                ...placement,\n                trigger: 'hover',\n                getPopupContainer: (trigger) => trigger.parentNode,\n              })\n            }\n          })\n        }\n\n        let [preChildPart, lastChildPart] = [newChildren, null]\n\n        // 只有1个时不适配\n        if (lessOneMoreFit && newChildren.length - num === 1) {\n          preChildPart = newChildren\n        } else if (newChildren && num && !isNaN(num) && newChildren.length > num) {\n          preChildPart = newChildren.slice(0, num)\n          lastChildPart = newChildren.slice(num)\n        }\n\n        if (divider && preChildPart) {\n          const preChildLen = preChildPart.length\n          preChildPart = preChildPart.map((dom, i) => (\n            <Fragment key={i}>\n              {dom}\n              {!(\n                (i === preChildLen - 1 && !lastChildPart?.length) // 没有更多 且 是最后一个时 不显示 Divider\n              ) && <Divider type=\"vertical\" />}\n            </Fragment>\n          ))\n        }\n        const menu = (childArr)=>(\n            <Menu className=\"org-pop-opera-btn\">\n                {\n                    childArr?.map(\n                        (child,i) => (\n                            <Menu.Item key={i}>\n                                {child}\n                            </Menu.Item>\n                        )\n                    )\n                }\n            </Menu>\n        );\n\n\n        if(!isCn && specialSceneDefaultShow ){\n            return (\n                <Dropdown overlay={menu(newChildren||[])} arrow onClick={(e)=>{\n                    if(stopPropagation){\n                        e.stopPropagation()\n                    }\n                }}>\n                    {\n                        type === 'icon' ?\n                            <Icon type=\"more\" /> :\n                            <a className=\"ant-dropdown-more\">\n                                {locale?.more}\n                                <i className={`${clsPrefix}-dropdown-icon`}>\n                                    <Icon type=\"down\" />\n                                </i>\n                            </a>\n                    }\n                </Dropdown>\n            );\n        }\n\n        return (\n          <div\n            onClick={(e) => {\n                if(stopPropagation){\n                    e.stopPropagation()\n                }\n            }}\n            {...rest}\n          >\n            {preChildPart}\n            {!!lastChildPart?.length && (\n              <Dropdown overlay={menu(lastChildPart || [])} arrow>\n                {type === 'icon' ? (\n                  <Icon type=\"more\" />\n                ) : (\n                  <a className=\"ant-dropdown-more\">\n                    {locale?.more}\n                    <i className={`${clsPrefix}-dropdown-icon`}>\n                      <Icon type=\"down\" />\n                    </i>\n                  </a>\n                )}\n              </Dropdown>\n            )}\n          </div>\n        )\n      }}\n    </LocaleReceiver>\n  )\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handle/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { Fragment } from 'react'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport Icon from '../icon'\nimport {doUpperTitle} from \"../utils/lang\"\nimport Divider from '../divider'\nimport Dropdown from '../dropdown'\nimport Menu from '../menu'\nimport './index.less'\n\nconst clsPrefix = 'tntd-more-menus'\n\n\nexport default (props) => {\n  return (\n    <LocaleReceiver componentName=\"Handle\">\n      {(locale, localeCode) => {\n        const {\n            children = [],\n            type=\"icon\",\n            num = 6,\n            lang,\n            divider = false,\n            lessOneMoreFit=true,\n            popConfirmHandle,\n            isIconBtn=true,\n            stopPropagation=true,\n            upperCaseIgnore=[],\n            unUpperConverted=false,\n            ...rest\n        } = props || {}\n\n        // 非中文\n        let isCn = lang === 'cn'\n        if (!lang) {\n          isCn = localeCode === 'zh-cn'\n        }\n\n\n\n        let newChildren = []\n        if (Array.isArray(children)) {\n          newChildren = children?.filter((item) => !!item) || []\n        } else if (children) {\n          newChildren.push(children)\n        }\n\n\n        // 非中文 且非 icon图标\n        if(!unUpperConverted && !isCn  && !isIconBtn ){\n            newChildren?.forEach((v,i)=>{\n                newChildren[i] = React.cloneElement(v, {\n                    ...(v?.props || {}),\n                   children: doUpperTitle(v.props.children, upperCaseIgnore)\n                })\n            })\n        }\n\n        // 子元素大于1个，且不是 icon元素\n        const specialSceneDefaultShow = newChildren?.length > 1 && !isIconBtn\n\n        if (specialSceneDefaultShow && (!isCn || popConfirmHandle)) {\n          newChildren?.forEach((v, i) => {\n            const { type, props } = v\n            if (\n              type?.name === 'Popconfirm' ||\n              (props.hasOwnProperty('onConfirm') && typeof props?.onConfirm === 'function')\n            ) {\n              let placement = {}\n              if (\n                !isCn ||\n                (num &&\n                  !isNaN(num) &&\n                  i + 1 > num &&\n                  !(lessOneMoreFit && newChildren.length - num === 1))\n              ) {\n                placement = {\n                  placement: 'left',\n                }\n              }\n              newChildren[i] = React.cloneElement(v, {\n                overlayStyle: { width: 180 },\n                ...(v?.props || {}),\n                onClick: (e) => e.stopPropagation(),\n                ...placement,\n                trigger: 'hover',\n                getPopupContainer: (trigger) => trigger.parentNode,\n              })\n            }\n          })\n        }\n\n        let [preChildPart, lastChildPart] = [newChildren, null]\n\n        // 只有1个时不适配\n        if (lessOneMoreFit && newChildren.length - num === 1) {\n          preChildPart = newChildren\n        } else if (newChildren && num && !isNaN(num) && newChildren.length > num) {\n          preChildPart = newChildren.slice(0, num)\n          lastChildPart = newChildren.slice(num)\n        }\n\n        if (divider && preChildPart) {\n          const preChildLen = preChildPart.length\n          preChildPart = preChildPart.map((dom, i) => (\n            <Fragment key={i}>\n              {dom}\n              {!(\n                (i === preChildLen - 1 && !lastChildPart?.length) // 没有更多 且 是最后一个时 不显示 Divider\n              ) && <Divider type=\"vertical\" />}\n            </Fragment>\n          ))\n        }\n        const menu = (childArr)=>(\n            <Menu className=\"org-pop-opera-btn\">\n                {\n                    childArr?.map(\n                        (child,i) => (\n                            <Menu.Item key={i}>\n                                {child}\n                            </Menu.Item>\n                        )\n                    )\n                }\n            </Menu>\n        );\n\n\n        if(!isCn && specialSceneDefaultShow ){\n            return (\n                <Dropdown overlay={menu(newChildren||[])} arrow onClick={(e)=>{\n                    if(stopPropagation){\n                        e.stopPropagation()\n                    }\n                }}>\n                    {\n                        type === 'icon' ?\n                            <Icon type=\"more\" /> :\n                            <a className=\"ant-dropdown-more\">\n                                {locale?.more}\n                                <i className={`${clsPrefix}-dropdown-icon`}>\n                                    <Icon type=\"down\" />\n                                </i>\n                            </a>\n                    }\n                </Dropdown>\n            );\n        }\n\n        return (\n          <div\n            onClick={(e) => {\n                if(stopPropagation){\n                    e.stopPropagation()\n                }\n            }}\n            {...rest}\n            className={`tnt-handle-wrap ${rest?.className||''}`}\n          >\n            {preChildPart}\n            {!!lastChildPart?.length && (\n              <Dropdown overlay={menu(lastChildPart || [])} arrow>\n                {type === 'icon' ? (\n                    <Icon type=\"more\" className='tnt-handle-more'/>\n                ) : (\n                  <a className=\"ant-dropdown-more\">\n                    {locale?.more}\n                    <i className={`${clsPrefix}-dropdown-icon`}>\n                      <Icon type=\"down\" />\n                    </i>\n                  </a>\n                )}\n              </Dropdown>\n            )}\n          </div>\n        )\n      }}\n    </LocaleReceiver>\n  )\n}\n"]}

package/es/handle/index.less

@@ -7,3 +7,19 @@
     margin-left: 2px;
   }
 }
+.tnt-handle-wrap{
+    >*:not(:last-of-type){
+        margin-right: 8px;
+    }
+    >*.tntd-anticon{
+        font-size: 20px;
+        &.icon-disabled,&.disabled{
+            cursor: not-allowed;
+            pointer-events: auto;
+            color: @disabled-color;
+        }
+    }
+}
+.tnt-handle-more{
+    font-size: 20px;
+}

package/es/input/style/mixin.less

@@ -170,7 +170,7 @@
 
     // Reset Select's style in addon
     .@{ant-prefix}-select {
-      margin: calc(1px - @input-padding-vertical-base) (-@input-padding-horizontal-base);
+      margin: calc(-1px - @input-padding-vertical-base) (-@input-padding-horizontal-base);
 
       .@{ant-prefix}-select-selection {
         margin: -1px;

package/es/page-loading/index.js

@@ -12,14 +12,18 @@ import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
 import './index.less';
 export default (props => {
   const {
-      className
+      className,
+      version
     } = props,
-    other = __rest(props, ["className"]);
+    other = __rest(props, ["className", "version"]);
+  const currentVersion = version || localStorage.getItem('app_version') || 'v2';
   return React.createElement(LocaleReceiver, {
     componentName: "PageLoading"
   }, (locale, localeCode) => {
     return React.createElement("div", Object.assign({
-      className: cn('tnt-page-loading-container', className)
-    }, other), React.createElement("span", null, locale.text));
+      className: cn('tnt-page-loading-container', 'tnt-current-' + currentVersion, className)
+    }, other), React.createElement("div", {
+      className: "tnt-page-loading-bg"
+    }, React.createElement("span", null, locale.text)));
   });
 });

package/es/page-loading/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/page-loading/index.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,YAAY,CAAA;AAC3B,OAAO,cAAc,MAAM,wCAAwC,CAAA;AAEnE,OAAO,cAAc,CAAA;AAErB,eAAe,CAAC,KAAK,EAAE,EAAE;IACrB,MAAM,EAAE,SAAS,KAAe,KAAK,EAAf,KAAK,UAAK,KAAK,EAA/B,aAAuB,CAAQ,CAAA;IACrC,OAAO,CACH,oBAAC,cAAc,IAAC,aAAa,EAAC,aAAa,IACxC,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE;QACtB,OAAO,CACH,2CAAK,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,SAAS,CAAC,IAAM,KAAK;YACtE,kCAAO,MAAM,CAAC,IAAI,CAAQ,CACxB,CACL,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACP,CAAC,CAAC","sourcesContent":["import React from 'react'\nimport cn from 'classnames'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\n\nimport './index.less'\n\nexport default (props) => {\n    const { className, ...other } = props\n    return (\n        <LocaleReceiver componentName=\"PageLoading\">\n          {(locale, localeCode) => {\n            return (\n                <div className={cn('tnt-page-loading-container', className)} {...other}>\n                <span>{locale.text}</span>\n            </div>\n            )\n          }}\n        </LocaleReceiver>\n      ) \n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/page-loading/index.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,YAAY,CAAA;AAC3B,OAAO,cAAc,MAAM,wCAAwC,CAAA;AAEnE,OAAO,cAAc,CAAA;AAErB,eAAe,CAAC,KAAK,EAAE,EAAE;IACvB,MAAM,EAAE,SAAS,EAAE,OAAO,KAAe,KAAK,EAAf,KAAK,UAAK,KAAK,EAAxC,wBAAgC,CAAQ,CAAA;IAC9C,MAAM,cAAc,GAAG,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,CAAA;IAC7E,OAAO,CACL,oBAAC,cAAc,IAAC,aAAa,EAAC,aAAa,IACxC,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE;QACtB,OAAO,CACL,2CAAK,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,cAAc,GAAG,cAAc,EAAE,SAAS,CAAC,IAAM,KAAK;YACrG,6BAAK,SAAS,EAAC,qBAAqB;gBAClC,kCAAO,MAAM,CAAC,IAAI,CAAQ,CACtB,CACF,CACP,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CAAC","sourcesContent":["import React from 'react'\nimport cn from 'classnames'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\n\nimport './index.less'\n\nexport default (props) => {\n  const { className, version, ...other } = props\n  const currentVersion = version || localStorage.getItem('app_version') || 'v2'\n  return (\n    <LocaleReceiver componentName=\"PageLoading\">\n      {(locale, localeCode) => {\n        return (\n          <div className={cn('tnt-page-loading-container', 'tnt-current-' + currentVersion, className)} {...other}>\n            <div className=\"tnt-page-loading-bg\">\n              <span>{locale.text}</span>\n            </div>\n          </div>\n        )\n      }}\n    </LocaleReceiver>\n  )\n};\n"]}

package/es/page-loading/index.less

@@ -1,22 +1,38 @@
 .tnt-page-loading-container {
-    position: fixed;
-    top: 140px;
-    left: 50%;
-    width: 70px;
-    height: 70px;
-    background-size: 100% 100%;
-    transform: translate(-50%, 0);
-    background-repeat: no-repeat;
-    background-image: url("./loading.gif");
-    z-index: 99999999999;
-    text-align: center;
-    span {
+    position: relative;
+    &.tnt-current-v2 {
+        height: calc(-50px + 100vh) !important;
+    }   
+    &.tnt-current-v3 {
+        height: calc(-60px + 100vh) !important;
+    }
+    .tnt-page-loading-bg {
         position: absolute;
+        top: 45%;
         left: 50%;
-        bottom: 0;
-        transform: translate(-50%, 0);
-        width: 100%;
-        font-size: 12px;
-        color: #17233D;
+        width: 70px;
+        height: 70px;
+        background-size: 100% 100%;
+        transform: translate(-50%, -50%);
+        background-repeat: no-repeat;
+        background-image: url("./loading.gif");
+        z-index: 99999999999;
+        text-align: center;
+        span {
+            position: absolute;
+            left: 50%;
+            bottom: 0;
+            transform: translate(-50%, 0);
+            width: 100%;
+            font-size: 12px;
+            color: #17233D;
+        }
+    }
+}
+.tnt-themeS2,.tnt-themeS3 {
+    .tnt-current-v3.tnt-page-loading-container {
+        span {
+            color: #fff;
+        }
     }
 }

package/es/query-form/Field/Composition/FieldPopover.js

@@ -8,68 +8,84 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
 import Popover from '../../../popover';
 import SelectOpt from './Select';
 import { highlightSubstring, getLabelFromOptions } from './utils';
 import fieldsMap, { getFieldWidth } from '../fieldsMap';
 import './FieldPopover.less';
 const isInput = type => ['input', 'string', 'search', 'number', 'inputNumber'].includes(type);
-export default (_a => {
+const FieldPopover = (_a, ref) => {
   var {
       visible,
       setVisible,
       searchText,
       children,
       value,
+      regex,
+      fieldItems,
+      propItem,
+      setFieldItem,
       onChange,
-      options,
+      form,
       locale,
-      searchTarget,
-      setSearchTarget,
       clsPrefix
     } = _a,
-    props = __rest(_a, ["visible", "setVisible", "searchText", "children", "value", "onChange", "options", "locale", "searchTarget", "setSearchTarget", "clsPrefix"]);
-  const [dataItem, setDataItem] = useState(null);
-  const onPropsClick = propItem => {
+    props = __rest(_a, ["visible", "setVisible", "searchText", "children", "value", "regex", "fieldItems", "propItem", "setFieldItem", "onChange", "form", "locale", "clsPrefix"]);
+  const [searchTarget, setSearchTarget] = useState(undefined);
+  const [popoverContent, setPopoverContent] = useState(false);
+  const onPropsClick = props => {
+    const {
+      type = 'input'
+    } = props || {};
     const copyValue = _cloneDeep(value);
-    if (!(copyValue === null || copyValue === void 0 ? void 0 : copyValue.find(v => v.key === propItem.name))) {
+    if (!(copyValue === null || copyValue === void 0 ? void 0 : copyValue.find(v => v.key === props.name))) {
       copyValue.push({
-        key: propItem.name,
-        value: propItem.type === 'array' ? [] : '',
-        label: (propItem.propsTitle || propItem.title || propItem.name) + ':'
+        key: props.name,
+        value: type === 'array' ? [] : '',
+        closable: false,
+        label: (props.propsTitle || props.title || props.name) + ':'
       });
     }
-    if (isInput(propItem.type)) {
-      const target = copyValue.find(v => v.key === propItem.name);
+    setFieldItem(props);
+    if (isInput(type)) {
+      const target = copyValue.find(v => v.key === props.name);
       onChange(target, true);
       close();
       return;
     }
-    setDataItem(propItem);
+    setVisible(true);
+    setPopoverContent(true);
     onChange(copyValue);
   };
+  useImperativeHandle(ref, () => ({
+    onPropsClick
+  }));
   const onSelectChange = (v, isMultiple) => {
     var _a, _b, _c, _d, _e, _f, _g;
+    const {
+      props: fieldProps
+    } = propItem || (v === null || v === void 0 ? void 0 : v.propItem) || {}; // 直接搜索拿v.xx的值
     const copyValue = _cloneDeep(value || []);
     let index;
-    if (v.dataItem) {
+    if (v === null || v === void 0 ? void 0 : v.propItem) {
       const _index = copyValue.findIndex(vv => {
         var _a;
-        return vv.key === ((_a = v.dataItem) === null || _a === void 0 ? void 0 : _a.name);
+        return vv.key === ((_a = v.propItem) === null || _a === void 0 ? void 0 : _a.name);
       });
       if (_index > -1) {
         index = _index;
       } else {
         copyValue.push({
-          key: (_a = v.dataItem) === null || _a === void 0 ? void 0 : _a.name,
+          key: (_a = v.propItem) === null || _a === void 0 ? void 0 : _a.name,
           value: isMultiple ? [] : '',
-          label: (((_b = v.dataItem) === null || _b === void 0 ? void 0 : _b.propsTitle) || ((_c = v.dataItem) === null || _c === void 0 ? void 0 : _c.title) || ((_d = v.dataItem) === null || _d === void 0 ? void 0 : _d.name)) + ':'
+          label: (((_b = v.propItem) === null || _b === void 0 ? void 0 : _b.propsTitle) || ((_c = v.propItem) === null || _c === void 0 ? void 0 : _c.title) || ((_d = v.propItem) === null || _d === void 0 ? void 0 : _d.name)) + ':'
         });
         index = copyValue.length - 1;
       }
+      setFieldItem(v.propItem);
     } else {
-      index = copyValue.findIndex(v => v.key === (dataItem === null || dataItem === void 0 ? void 0 : dataItem.name));
+      index = copyValue.findIndex(v => v.key === (propItem === null || propItem === void 0 ? void 0 : propItem.name));
     }
     if (isMultiple) {
       if (!((_f = (_e = copyValue[index]) === null || _e === void 0 ? void 0 : _e.value) === null || _f === void 0 ? void 0 : _f.length)) {
@@ -83,7 +99,7 @@ export default (_a => {
           copyValue[index].label = result;
         } else {
           copyValue[index].value.push(v.value);
-          copyValue[index].label += '|' + (v === null || v === void 0 ? void 0 : v.label);
+          copyValue[index].label += ' | ' + (v === null || v === void 0 ? void 0 : v.label);
         }
       }
     } else {
@@ -91,7 +107,9 @@ export default (_a => {
       copyValue[index].label = copyValue[index].label.match(/(.*:)/)[0] + (v === null || v === void 0 ? void 0 : v.label);
       close();
     }
+    copyValue[index].closable = true;
     onChange(copyValue, false, true);
+    (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.onChange) && fieldProps.onChange(copyValue[index].value);
   };
   const onFieldChange = (...args) => {
     var _a, _b;
@@ -100,14 +118,12 @@ export default (_a => {
       component,
       props: fieldProps,
       setLabel
-    } = dataItem || {};
+    } = propItem || {};
     const {
-      onChange: onChangeCustom,
       options
     } = fieldProps || {};
-    onChangeCustom && onChangeCustom(...args);
     const copyValue = _cloneDeep(value);
-    const index = copyValue.findIndex(v => v.key === (dataItem === null || dataItem === void 0 ? void 0 : dataItem.name));
+    const index = copyValue.findIndex(v => v.key === (propItem === null || propItem === void 0 ? void 0 : propItem.name));
     copyValue[index].value = args[0];
     if (type === 'date') {
       copyValue[index].label = copyValue[index].label.match(/(.*:)/)[0] + args[1];
@@ -134,23 +150,26 @@ export default (_a => {
       }
       close();
     }
+    copyValue[index].closable = true;
     onChange(copyValue, false, true);
-    // close()
+    (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.onChange) && fieldProps.onChange(copyValue[index].value);
   };
   const close = () => {
     setVisible(false);
+    setPopoverContent(false);
   };
-  const handleVisibleChange = visible => {
-    setVisible(visible);
+  const handleVisibleChange = () => {
+    if (!visible && !regex.test(searchText)) {
+      setVisible(true);
+    } else {
+      close();
+    }
   };
-  useEffect(() => {
-    setDataItem(null);
-  }, [visible]);
   useEffect(() => {
     let bool1 = false,
       bool2 = false;
-    if (searchText) {
-      options === null || options === void 0 ? void 0 : options.forEach(v => {
+    if (searchText && !propItem) {
+      fieldItems === null || fieldItems === void 0 ? void 0 : fieldItems.forEach(v => {
         const {
           name,
           propsTitle,
@@ -166,7 +185,7 @@ export default (_a => {
         const fieldNames = props === null || props === void 0 ? void 0 : props.fieldNames;
         const target = sOptions === null || sOptions === void 0 ? void 0 : sOptions.find(item => {
           const labelKey = (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label';
-          const label = item instanceof Object ? item[labelKey] : item;
+          const label = item instanceof Object ? item[labelKey] : item + '';
           return (label === null || label === void 0 ? void 0 : label.indexOf(searchText)) > -1;
         });
         if (target) {
@@ -178,13 +197,13 @@ export default (_a => {
         propsValue: bool2
       });
     } else {
-      setSearchTarget(null);
+      setSearchTarget(undefined);
     }
-  }, [options, searchText]);
+  }, [fieldItems, searchText, propItem]);
   const renderFirstOptions = menu => {
     return React.createElement("div", null, (!searchText || (searchTarget === null || searchTarget === void 0 ? void 0 : searchTarget.propsTitle)) && React.createElement("label", null, locale.propTitle), React.createElement("ul", {
       className: "ant-select-dropdown-menu"
-    }, options === null || options === void 0 ? void 0 : options.map(v => {
+    }, fieldItems === null || fieldItems === void 0 ? void 0 : fieldItems.map(v => {
       const {
         name,
         propsTitle,
@@ -209,7 +228,7 @@ export default (_a => {
             }
           }));
         }
-        return '';
+        return null;
       }
       return React.createElement("li", {
         className: "ant-select-dropdown-menu-item",
@@ -222,7 +241,7 @@ export default (_a => {
       }, _propsTitle);
     })), searchText && React.createElement("div", null, (searchTarget === null || searchTarget === void 0 ? void 0 : searchTarget.propsValue) && React.createElement("label", null, locale.propValue), React.createElement("ul", {
       className: "ant-select-dropdown-menu"
-    }, options === null || options === void 0 ? void 0 : options.map(v => {
+    }, fieldItems === null || fieldItems === void 0 ? void 0 : fieldItems.map(v => {
       const {
         name,
         propsTitle,
@@ -231,11 +250,13 @@ export default (_a => {
       } = v.props || {};
       const target = value === null || value === void 0 ? void 0 : value.find(v => v.key === name);
       if (type === 'select' && props && props.options && props.options.length > 0) {
-        return React.createElement(SelectOpt, Object.assign({}, props, {
+        return React.createElement(SelectOpt, Object.assign({
+          key: name
+        }, props, {
           searchText: searchText,
+          propItem: v.props,
           onChange: onSelectChange,
-          value: target === null || target === void 0 ? void 0 : target.value,
-          dataItem: v.props
+          value: target === null || target === void 0 ? void 0 : target.value
         }));
       }
       return;
@@ -251,34 +272,37 @@ export default (_a => {
       className,
       component,
       props: fieldProps
-    } = dataItem || {};
+    } = propItem || {};
     const target = value === null || value === void 0 ? void 0 : value.find(v => v.key === name);
     const Field = component || fieldsMap[type];
     return React.createElement("div", {
       onClick: e => e.stopPropagation(),
       className: className
     }, React.createElement("label", null, propsTitle || title || name), type === 'select' ? React.createElement(SelectOpt, Object.assign({}, fieldProps, {
+      propItem: propItem,
       onChange: onSelectChange,
       value: target === null || target === void 0 ? void 0 : target.value
     })) : React.createElement("div", {
       className: `${clsPrefix}-field-popover-content`,
       onClick: e => e.stopPropagation()
     }, React.createElement(Field, Object.assign({
+      form: form,
       value: target === null || target === void 0 ? void 0 : target.value
     }, fieldProps, {
       style: Object.assign(Object.assign({}, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style), {
         width: ((_a = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style) === null || _a === void 0 ? void 0 : _a.width) || getFieldWidth(type)
       }),
+      close: close,
       onChange: onFieldChange
     }))));
   };
   return React.createElement(Popover, Object.assign({
     trigger: "click",
-    // onClick={(e) =>  e.stopPropagation()}
     visible: visible,
     placement: "bottom",
     overlayClassName: `${clsPrefix}-field-popover`,
-    content: !dataItem ? renderFirstOptions() : renderSecondOptions(),
+    content: !popoverContent ? renderFirstOptions() : renderSecondOptions(),
     onVisibleChange: handleVisibleChange
   }, props), children);
-});
+};
+export default forwardRef(FieldPopover);