tntd 2.8.0-beta.7 → 2.8.0-beta.9

package/es/drawer/drawer.js

@@ -6,28 +6,123 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
-import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
-import classNames from 'classnames';
-import React from 'react';
 import { ConfigConsumer } from 'antd/es/config-provider';
 import { default as AntdDrawer } from 'antd/es/drawer';
+import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
+import classNames from 'classnames';
+import React, { useEffect } from 'react';
+import { Button } from '../button';
+import Icon from '../icon';
+const DefaultFooter = ({
+  locale,
+  onClose,
+  onSubmit,
+  onCancel,
+  onOk,
+  okText,
+  okType,
+  cancelText,
+  confirmLoading,
+  okButtonProps,
+  cancelButtonProps,
+  cancelType
+}) => {
+  return React.createElement(React.Fragment, null, React.createElement(Button, Object.assign({
+    onClick: onCancel || onClose,
+    style: {
+      marginRight: 8
+    },
+    type: cancelType || 'default'
+  }, cancelButtonProps), cancelText || (locale === null || locale === void 0 ? void 0 : locale.cancelText)), React.createElement(Button, Object.assign({
+    onClick: onOk || onSubmit,
+    type: okType || 'primary',
+    loading: confirmLoading
+  }, okButtonProps), okText || (locale === null || locale === void 0 ? void 0 : locale.okText)));
+};
 export const Drawer = _a => {
   var {
-      closable,
-      className
+      closable = true,
+      className,
+      footer,
+      showFooter,
+      onClose,
+      onSubmit,
+      onCancel,
+      onOk,
+      okText = '',
+      cancelText = '',
+      locale,
+      okType = 'primary',
+      cancelType = 'default',
+      confirmLoading = false,
+      okButtonProps = {},
+      cancelButtonProps = {},
+      clickOnBlankToClose = false
     } = _a,
-    rest = __rest(_a, ["closable", "className"]);
+    rest = __rest(_a, ["closable", "className", "footer", "showFooter", "onClose", "onSubmit", "onCancel", "onOk", "okText", "cancelText", "locale", "okType", "cancelType", "confirmLoading", "okButtonProps", "cancelButtonProps", "clickOnBlankToClose"]);
+  const drawerDom = React.useRef(null);
+  const _onCancel = onCancel || onClose;
+  useEffect(() => {
+    if (clickOnBlankToClose) {
+      const handleOutsideClick = event => {
+        const drawer = drawerDom.current;
+        const targetElement = event.target;
+        let isInDrawer = false;
+        if (drawer && targetElement) {
+          isInDrawer = drawer.contains(targetElement) || targetElement === drawer;
+        }
+        drawerDom.current = null;
+        if (rest.visible && !isInDrawer && _onCancel) {
+          _onCancel();
+        }
+      };
+      document.removeEventListener('click', handleOutsideClick);
+      document.addEventListener('click', handleOutsideClick);
+      return () => {
+        document.removeEventListener('click', handleOutsideClick);
+      };
+    }
+  }, [rest.visible, clickOnBlankToClose, _onCancel]);
   return React.createElement(ConfigConsumer, null, ({
     getPrefixCls
   }) => {
     const prefixCls = getPrefixCls('drawer');
     return React.createElement(LocaleReceiver, {
-      componentName: "Drawer"
-    }, () => React.createElement(AntdDrawer, Object.assign({
-      className: classNames(prefixCls, 'tntd-drawer', className, {
-        [`${prefixCls}-contain-closable`]: closable !== false
-      }),
-      closable: closable
-    }, rest)));
+      componentName: "Drawer",
+      defaultLocale: locale
+    }, locale => {
+      return React.createElement("div", {
+        onClick: event => {
+          drawerDom.current = event.target;
+        }
+      }, React.createElement(AntdDrawer, Object.assign({
+        className: classNames(prefixCls, 'tnt-drawer', 'tntd-drawer', className, {
+          [`${prefixCls}-contain-closable`]: closable !== false,
+          [`${prefixCls}-footer`]: showFooter || footer
+        }),
+        closable: false,
+        onClose: onClose,
+        width: 480
+      }, rest), React.createElement(React.Fragment, null, closable !== false && React.createElement(Icon, {
+        type: "close",
+        className: `${prefixCls}-close`,
+        onClick: onClose
+      }), rest.children, React.createElement("div", {
+        className: `${prefixCls}-footer-style`
+      }, !footer ? showFooter && React.createElement(DefaultFooter, {
+        confirmLoading: confirmLoading,
+        okButtonProps: okButtonProps,
+        cancelButtonProps: cancelButtonProps,
+        okType: okType,
+        locale: locale,
+        okText: okText,
+        cancelType: cancelType,
+        cancelText: cancelText,
+        onClose: onClose,
+        onSubmit: onSubmit,
+        onOk: onOk,
+        onCancel: onCancel
+      }) : footer))));
+    });
   });
 };

package/es/drawer/drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.js","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":";;;;;;;;;;;AASA,OAAO,cAAc,MAAM,wCAAwC,CAAA;AACnE,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,KAAa,MAAM,OAAO,CAAA;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEtD,MAAM,CAAC,MAAM,MAAM,GAAwB,CAAC,EAAgC,EAAE,EAAE;QAApC,EAAE,QAAQ,EAAE,SAAS,OAAW,EAAN,IAAI,cAA9B,yBAAgC,CAAF;IAAO,OAAA,CAC/E,oBAAC,cAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;QACxC,OAAO,CACL,oBAAC,cAAc,IAAC,aAAa,EAAC,QAAQ,IACnC,GAAG,EAAE,CAAC,CACL,oBAAC,UAAU,kBACT,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE;gBACzD,CAAC,GAAG,SAAS,mBAAmB,CAAC,EAAE,QAAQ,KAAK,KAAK;aACtD,CAAC,EACF,QAAQ,EAAE,QAAQ,IACd,IAAI,EACR,CACH,CACc,CAClB,CAAA;IACH,CAAC,CACc,CAClB,CAAA;CAAA,CAAA","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2023-03-08 16:45:46\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2023-03-08 18:56:20\n * @FilePath: /tntd/packages/tntd/src/drawer/drawer.tsx\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport type { DrawerProps as AntdDrawerProps } from 'antd/es/drawer'\nimport LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver'\nimport classNames from 'classnames'\nimport React, { FC } from 'react'\n\nimport { ConfigConsumer } from 'antd/es/config-provider'\nimport { default as AntdDrawer } from 'antd/es/drawer'\n\nexport const Drawer: FC<AntdDrawerProps> = ({ closable, className, ...rest }) => (\n  <ConfigConsumer>\n    {({ getPrefixCls }) => {\n      const prefixCls = getPrefixCls('drawer')\n      return (\n        <LocaleReceiver componentName=\"Drawer\">\n          {() => (\n            <AntdDrawer\n              className={classNames(prefixCls, 'tntd-drawer', className, {\n                [`${prefixCls}-contain-closable`]: closable !== false,\n              })}\n              closable={closable}\n              {...rest}\n            />\n          )}\n        </LocaleReceiver>\n      )\n    }}\n  </ConfigConsumer>\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 { ButtonType } 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  cancelType,\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?: ButtonType\n  cancelType: ButtonType\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={cancelType || 'default'}\n        {...cancelButtonProps}\n      >\n        {cancelText || locale?.cancelText}\n      </Button>\n      <Button\n        onClick={onOk || onSubmit}\n        type={okType || 'primary'}\n        loading={confirmLoading}\n        {...okButtonProps}\n      >\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  onCancel?: () => void\n  onOk?: () => void\n  okText?: string\n  cancelText?: string\n  locale?: {\n    okText?: string\n    cancelText?: string\n  }\n  okType?: ButtonType\n  cancelType?: ButtonType\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  onCancel,\n  onOk,\n  okText = '',\n  cancelText = '',\n  locale,\n  okType = 'primary',\n  cancelType = 'default',\n  confirmLoading = false,\n  okButtonProps = {},\n  cancelButtonProps = {},\n  clickOnBlankToClose = false,\n  ...rest\n}) => {\n  const drawerDom = React.useRef<EventTarget | null>(null)\n  const _onCancel = onCancel || onClose\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 && _onCancel) {\n          _onCancel()\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, _onCancel])\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', 'tntd-drawer', className, {\n                      [`${prefixCls}-contain-closable`]: closable !== false,\n                      [`${prefixCls}-footer`]: showFooter || footer,\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                      <div className={`${prefixCls}-footer-style`}>\n                        {!footer\n                          ? showFooter && (\n                              <DefaultFooter\n                                confirmLoading={confirmLoading}\n                                okButtonProps={okButtonProps}\n                                cancelButtonProps={cancelButtonProps}\n                                okType={okType}\n                                locale={locale}\n                                okText={okText}\n                                cancelType={cancelType}\n                                cancelText={cancelText}\n                                onClose={onClose}\n                                onSubmit={onSubmit}\n                                onOk={onOk}\n                                onCancel={onCancel}\n                              />\n                            )\n                          : footer}\n                      </div>\n                    </>\n                  </AntdDrawer>\n                </div>\n              )\n            }}\n          </LocaleReceiver>\n        )\n      }}\n    </ConfigConsumer>\n  )\n}\n"]}

package/es/drawer/index.js

@@ -1,5 +1,5 @@
 import './style';
 import { Drawer } from './drawer';
-import './drawer.less';
+import './index.less';
 export * from 'antd/es/drawer';
 export default Drawer;

package/es/drawer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/drawer/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,OAAO,eAAe,CAAA;AACtB,cAAc,gBAAgB,CAAA;AAE9B,eAAe,MAAM,CAAA","sourcesContent":["import './style'\nimport { Drawer } from './drawer'\n\nimport './drawer.less'\nexport * from 'antd/es/drawer'\n\nexport default Drawer\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/drawer/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,OAAO,cAAc,CAAA;AACrB,cAAc,gBAAgB,CAAA;AAE9B,eAAe,MAAM,CAAA","sourcesContent":["import './style'\nimport { Drawer } from './drawer'\n\nimport './index.less'\nexport * from 'antd/es/drawer'\n\nexport default Drawer\n"]}

package/es/drawer/index.less

@@ -0,0 +1,154 @@
+@drawer-prefix-cls: ~'@{ant-prefix}-drawer';
+
+
+.tnt-drawer.@{drawer-prefix-cls} {
+    &-top {
+        .@{drawer-prefix-cls}-wrapper-body {
+            margin-top: 48px;
+        }
+
+        .@{drawer-prefix-cls}-content-wrapper {
+            height: 480px !important;
+        }
+    }
+
+    &-bottom {
+        .@{drawer-prefix-cls}-content-wrapper {
+            height: 480px !important;
+        }
+    }
+
+    .@{drawer-prefix-cls}-wrapper-body {
+        margin-top: 48px;
+        max-height: ~'calc(100vh - 50px)';
+    }
+
+    &-footer {
+        .@{drawer-prefix-cls}-header {
+            border-bottom: none;
+            position: absolute;
+            right: 0;
+            top: 0;
+            background: #fff;
+            width: 100%;
+        }
+
+        .@{drawer-prefix-cls}-wrapper-body {
+            max-height: ~'calc(100vh - 98px)' !important;
+            margin-top: 48px !important;
+            margin-bottom: 48px !important;
+        }
+
+    }
+
+    .@{drawer-prefix-cls}-title {
+        font-size: 16px !important;
+        font-weight: 500 !important;
+    }
+
+    .@{drawer-prefix-cls}-close {
+        color: fade(@text-color, 50%);
+        width: 62px;
+        top: -4px;
+
+
+        position: absolute;
+        top: -2px;
+        right: 0;
+        z-index: 10;
+        display: block;
+        width: 48px;
+        height: 48px;
+        padding: 0;
+        color: rgba(23, 35, 61, 0.8);
+        font-weight: 700;
+        font-size: 20px;
+        font-style: normal;
+        line-height: 56px;
+        text-align: center;
+        text-transform: none;
+        text-decoration: none;
+        background: transparent;
+        border: 0;
+        outline: 0;
+        cursor: pointer;
+        transition: color 0.3s;
+        text-rendering: auto;
+    }
+
+
+    .@{drawer-prefix-cls}-contain-closable {
+        .@{drawer-prefix-cls}-header {
+            padding: 12px 36px 12px 20px;
+        }
+    }
+
+    &-right {
+        .@{drawer-prefix-cls}-content {
+            border-radius: @border-radius-base 0px 0px @border-radius-base;
+            background: #F8F9FB;
+        }
+    }
+
+    &-left {
+        .@{drawer-prefix-cls}-content {
+            border-radius: 0px @border-radius-base @border-radius-base 0px;
+            background: #F8F9FB;
+        }
+    }
+
+    &-top {
+        .@{drawer-prefix-cls}-content {
+            border-radius: 0px 0px @border-radius-base @border-radius-base;
+            background: #F8F9FB;
+            padding-top: 48px;
+        }
+
+        .@{drawer-prefix-cls}-wrapper-body {
+            margin-top: 0px !important;
+        }
+    }
+
+    &-bottom {
+        .@{drawer-prefix-cls}-content {
+            border-radius: @border-radius-base @border-radius-base 0px 0px;
+            background: #F8F9FB;
+            padding-top: 48px;
+        }
+
+        .@{drawer-prefix-cls}-wrapper-body {
+            margin-top: 0px !important;
+        }
+    }
+
+
+    .@{drawer-prefix-cls}-header {
+        padding: 13px 24px;
+        border-bottom: none;
+        position: absolute;
+        right: 0;
+        top: 0;
+        width: 100%;
+        background: #fff;
+    }
+
+    .@{drawer-prefix-cls}-body {
+        padding: @padding-lg !important;
+
+    }
+
+
+    .@{drawer-prefix-cls}-wrapper-body {
+
+        .@{drawer-prefix-cls}-footer-style {
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            width: 100%;
+            padding: 8px 24px;
+            background: #fff;
+            text-align: right;
+        }
+
+    }
+}

package/es/drawer/style/drawer.less

@@ -157,7 +157,7 @@
     padding: 0;
     color: @text-color-secondary;
     font-weight: 700;
-    font-size: 20px;
+    font-size: @font-size-lg;
     font-style: normal;
     line-height: 56px;
     text-align: center;
@@ -169,9 +169,7 @@
     cursor: pointer;
     transition: color @animation-duration-slow;
     text-rendering: auto;
-    .tntd-anticon {
-      font-size: 20px;
-    }
+
     &:focus,
     &:hover {
       color: @icon-color-hover;

package/es/input/style/mixin.less

@@ -170,8 +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;
         background-color: inherit;

package/es/locale/en_US.js

@@ -50,6 +50,10 @@ const en_US = _merge(sourceLocale, {
   TntdSecondPage: {
     back: 'Back'
   },
-  ColorPicker: {}
+  ColorPicker: {},
+  Drawer: {
+    okText: 'Submit',
+    cancelText: 'Cancel'
+  }
 });
 export default en_US;

package/es/locale/en_US.js.map

@@ -1 +1 @@
-{"version":3,"file":"en_US.js","sourceRoot":"","sources":["../../src/locale/en_US.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,YAAY;QAChC,gBAAgB,EAAE,SAAS;QAC3B,KAAK,EAAE,4BAA4B;KACpC;IACD,KAAK,EAAE;QACL,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,eAAe;QAC7B,mBAAmB,EAAE,sBAAsB;QAC3C,cAAc,EAAE,iBAAiB;QACjC,SAAS,EAAE,uBAAuB;QAClC,MAAM,EAAE,SAAS;KAClB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE;YACJ,UAAU,EAAE,aAAa;YACzB,EAAE,EAAE,IAAI;YACR,UAAU,EAAE,aAAa;SAC1B;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;KACb;IACD,SAAS,EAAE;QACT,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,yCAAyC;KACjD;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,SAAS;KAClB;IACD,UAAU,EAAE;QACV,MAAM,EAAE,SAAS;KAClB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,YAAY;KACnB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,MAAM;KACb;IACD,WAAW,EAAE,EAAE;CAChB,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2023-11-01 17:14:46\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2023-11-03 17:02:30\n * @FilePath: /tntd/packages/tntd/src/locale/en_US.ts\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport sourceLocale from 'antd/es/locale/en_US'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst en_US = merge(sourceLocale, {\n  Table: {\n    loadingDescription: 'loading...',\n    emptyDescription: 'No data',\n    total: 'Totally ${total} Record(s)',\n  },\n  Empty: {\n    noGraphData: 'No data',\n    noPermission: 'No permission',\n    createdSuccessfully: 'Created successfully',\n    creationFailed: 'Creation failed',\n    noNetwork: 'Network not connected',\n    noData: 'No data',\n  },\n  Calendar: {\n    lang: {\n      timeSelect: 'Select time',\n      ok: 'OK',\n      dateSelect: 'Select date',\n    },\n  },\n  Handle: {\n    more: 'More',\n  },\n  Exception: {\n    '403': \"Sorry, we don't have access to this page\",\n    '404': 'Sorry, there are no results on this page',\n    '500': \"I'm sorry, the server reported an error\",\n  },\n  TntdCascader: {\n    noData: 'No data',\n  },\n  TntdSelect: {\n    noData: 'No data',\n  },\n  PageLoading: {\n    text: 'loading...',\n  },\n  TntdSecondPage: {\n    back: 'Back',\n  },\n  ColorPicker: {},\n})\n\nexport default en_US\n"]}
+{"version":3,"file":"en_US.js","sourceRoot":"","sources":["../../src/locale/en_US.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,YAAY;QAChC,gBAAgB,EAAE,SAAS;QAC3B,KAAK,EAAE,4BAA4B;KACpC;IACD,KAAK,EAAE;QACL,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,eAAe;QAC7B,mBAAmB,EAAE,sBAAsB;QAC3C,cAAc,EAAE,iBAAiB;QACjC,SAAS,EAAE,uBAAuB;QAClC,MAAM,EAAE,SAAS;KAClB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE;YACJ,UAAU,EAAE,aAAa;YACzB,EAAE,EAAE,IAAI;YACR,UAAU,EAAE,aAAa;SAC1B;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;KACb;IACD,SAAS,EAAE;QACT,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,0CAA0C;QACjD,KAAK,EAAE,yCAAyC;KACjD;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,SAAS;KAClB;IACD,UAAU,EAAE;QACV,MAAM,EAAE,SAAS;KAClB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,YAAY;KACnB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,MAAM;KACb;IACD,WAAW,EAAE,EAAE;IACf,MAAM,EAAE;QACN,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,QAAQ;KACrB;CACF,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["/*\n * @Author: 周泽飞 zefei.zhou@tongdun.net\n * @Date: 2023-11-01 17:14:46\n * @LastEditors: 周泽飞 zefei.zhou@tongdun.net\n * @LastEditTime: 2023-11-03 17:02:30\n * @FilePath: /tntd/packages/tntd/src/locale/en_US.ts\n * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\n */\nimport sourceLocale from 'antd/es/locale/en_US'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst en_US = merge(sourceLocale, {\n  Table: {\n    loadingDescription: 'loading...',\n    emptyDescription: 'No data',\n    total: 'Totally ${total} Record(s)',\n  },\n  Empty: {\n    noGraphData: 'No data',\n    noPermission: 'No permission',\n    createdSuccessfully: 'Created successfully',\n    creationFailed: 'Creation failed',\n    noNetwork: 'Network not connected',\n    noData: 'No data',\n  },\n  Calendar: {\n    lang: {\n      timeSelect: 'Select time',\n      ok: 'OK',\n      dateSelect: 'Select date',\n    },\n  },\n  Handle: {\n    more: 'More',\n  },\n  Exception: {\n    '403': \"Sorry, we don't have access to this page\",\n    '404': 'Sorry, there are no results on this page',\n    '500': \"I'm sorry, the server reported an error\",\n  },\n  TntdCascader: {\n    noData: 'No data',\n  },\n  TntdSelect: {\n    noData: 'No data',\n  },\n  PageLoading: {\n    text: 'loading...',\n  },\n  TntdSecondPage: {\n    back: 'Back',\n  },\n  ColorPicker: {},\n  Drawer: {\n    okText: 'Submit',\n    cancelText: 'Cancel',\n  },\n})\n\nexport default en_US\n"]}

package/es/locale/zh_CN.js

@@ -35,6 +35,10 @@ const zh_CN = _merge(sourceLocale, {
   TntdSecondPage: {
     back: '返回'
   },
-  ColorPicker: {}
+  ColorPicker: {},
+  Drawer: {
+    okText: '确定',
+    cancelText: '取消'
+  }
 });
 export default zh_CN;

package/es/locale/zh_CN.js.map

@@ -1 +1 @@
-{"version":3,"file":"zh_CN.js","sourceRoot":"","sources":["../../src/locale/zh_CN.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,UAAU;QAC9B,gBAAgB,EAAE,MAAM;QACxB,KAAK,EAAE,gBAAgB;KACxB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,mBAAmB,EAAE,MAAM;QAC3B,cAAc,EAAE,MAAM;QACtB,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,MAAM;KACf;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI;KACX;IACD,SAAS,EAAE;QACT,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,WAAW;KACnB;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM;KACf;IACD,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;KACf;IACD,UAAU,EAAE;QACV,MAAM,EAAE,MAAM;KACf;IACD,cAAc,EAAE;QACd,IAAI,EAAE,IAAI;KACX;IACD,WAAW,EAAE,EAAE;CAChB,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["import sourceLocale from 'antd/es/locale/zh_CN'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst zh_CN = merge(sourceLocale, {\n  Table: {\n    loadingDescription: '数据加载中...',\n    emptyDescription: '暂无数据',\n    total: '共 ${total} 条记录',\n  },\n  Empty: {\n    noGraphData: '暂无图表',\n    noPermission: '暂无权限',\n    createdSuccessfully: '创建成功',\n    creationFailed: '创建失败',\n    noNetwork: '网络未连接',\n    noData: '暂无数据',\n  },\n  Handle: {\n    more: '更多',\n  },\n  Exception: {\n    '403': '很抱歉，暂无该页面访问权限',\n    '404': '很抱歉，本页暂无结果',\n    '500': '很抱歉，服务器报错',\n  },\n  TntdCascader: {\n    noData: '暂无数据',\n  },\n  PageLoading: {\n    text: '加载中...',\n  },\n  TntdSelect: {\n    noData: '暂无数据',\n  },\n  TntdSecondPage: {\n    back: '返回',\n  },\n  ColorPicker: {},\n})\n\nexport default zh_CN\n"]}
+{"version":3,"file":"zh_CN.js","sourceRoot":"","sources":["../../src/locale/zh_CN.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE9B,yCAAyC;AACzC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE;IAChC,KAAK,EAAE;QACL,kBAAkB,EAAE,UAAU;QAC9B,gBAAgB,EAAE,MAAM;QACxB,KAAK,EAAE,gBAAgB;KACxB;IACD,KAAK,EAAE;QACL,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,mBAAmB,EAAE,MAAM;QAC3B,cAAc,EAAE,MAAM;QACtB,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,MAAM;KACf;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI;KACX;IACD,SAAS,EAAE;QACT,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,WAAW;KACnB;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM;KACf;IACD,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;KACf;IACD,UAAU,EAAE;QACV,MAAM,EAAE,MAAM;KACf;IACD,cAAc,EAAE;QACd,IAAI,EAAE,IAAI;KACX;IACD,WAAW,EAAE,EAAE;IACf,MAAM,EAAE;QACN,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;KACjB;CACF,CAAC,CAAA;AAEF,eAAe,KAAK,CAAA","sourcesContent":["import sourceLocale from 'antd/es/locale/zh_CN'\n\nimport { merge } from 'lodash'\n\n// 覆盖原始的语言包，以便在使用 LocalReceiver 时获取正确的语言包\nconst zh_CN = merge(sourceLocale, {\n  Table: {\n    loadingDescription: '数据加载中...',\n    emptyDescription: '暂无数据',\n    total: '共 ${total} 条记录',\n  },\n  Empty: {\n    noGraphData: '暂无图表',\n    noPermission: '暂无权限',\n    createdSuccessfully: '创建成功',\n    creationFailed: '创建失败',\n    noNetwork: '网络未连接',\n    noData: '暂无数据',\n  },\n  Handle: {\n    more: '更多',\n  },\n  Exception: {\n    '403': '很抱歉，暂无该页面访问权限',\n    '404': '很抱歉，本页暂无结果',\n    '500': '很抱歉，服务器报错',\n  },\n  TntdCascader: {\n    noData: '暂无数据',\n  },\n  PageLoading: {\n    text: '加载中...',\n  },\n  TntdSelect: {\n    noData: '暂无数据',\n  },\n  TntdSecondPage: {\n    back: '返回',\n  },\n  ColorPicker: {},\n  Drawer: {\n    okText: '确定',\n    cancelText: '取消',\n  },\n})\n\nexport default zh_CN\n"]}

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/table-container/index.less

@@ -3,7 +3,7 @@
     background: #fff;
     box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
     padding: 20px 16px 16px 16px;
-    height: calc(-84px + 100vh) !important;
+    max-height: calc(-84px + 100vh) !important;
     overflow-y: auto;
 
     .tnt-querylistscene-content {

package/es/tabs-container/index.js

@@ -1,3 +1,4 @@
+import React from 'react';
 import cn from 'classnames';
 import './index.less';
 export default ((WrappedComponent, options = {}) => {

package/es/tabs-container/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tabs-container/index.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,cAAc,CAAC;AAEtB,eAAe,CAAC,gBAAgB,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC9C,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAC3C,MAAM,cAAc,GAAG,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;IAE9E,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACd,6BAAK,SAAS,EAAE,EAAE,CAAC,sBAAsB,EAAE,cAAc,GAAG,cAAc,EAAE,SAAS,CAAC;QAClF,oBAAC,gBAAgB,oBAAK,KAAK,EAAM,OAAO,EAAI,CAC1C,CACT,CAAC;AACN,CAAC,CAAC","sourcesContent":["import cn from 'classnames'\n\nimport './index.less';\n\nexport default (WrappedComponent, options = {}) => {\n    const { version, className = '' } = options\n    const currentVersion = version || localStorage.getItem('app_version') || 'v2';\n\n    return (props) => (\n        <div className={cn('tnt-tabs-v-container', 'tnt-current-' + currentVersion, className)}>\n            <WrappedComponent {...props} {...options} />\n        </div>\n    );\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tabs-container/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,cAAc,CAAC;AAEtB,eAAe,CAAC,gBAAgB,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;IAC9C,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAC3C,MAAM,cAAc,GAAG,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC;IAE9E,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACd,6BAAK,SAAS,EAAE,EAAE,CAAC,sBAAsB,EAAE,cAAc,GAAG,cAAc,EAAE,SAAS,CAAC;QAClF,oBAAC,gBAAgB,oBAAK,KAAK,EAAM,OAAO,EAAI,CAC1C,CACT,CAAC;AACN,CAAC,CAAC","sourcesContent":["import React from 'react'\nimport cn from 'classnames'\n\nimport './index.less';\n\nexport default (WrappedComponent, options = {}) => {\n    const { version, className = '' } = options\n    const currentVersion = version || localStorage.getItem('app_version') || 'v2';\n\n    return (props) => (\n        <div className={cn('tnt-tabs-v-container', 'tnt-current-' + currentVersion, className)}>\n            <WrappedComponent {...props} {...options} />\n        </div>\n    );\n};\n"]}

package/es/tabs-container/index.less

@@ -12,7 +12,7 @@
         }
         .ant-tabs-nav .ant-tabs-tab {
             padding: 9px 15px 10px;
-            margin-right: 0;
+            // margin-right: 0;
         }
         .ant-tabs-nav-wrap,
         .ant-tabs-nav-container {
@@ -22,7 +22,7 @@
             bottom: 0;
         }
         .tnt-querylistscene-content {
-            height: calc(100vh - 90px);
+            max-height: calc(100vh - 90px);
             overflow: hidden auto;
         }
     }
@@ -42,7 +42,7 @@
             }
         }
         .tnt-querylistscene-content {
-            height: calc(100vh - 131px);
+            max-height: calc(100vh - 131px);
             overflow: hidden auto;
             background-color: transparent;
             padding: 20px 16px 16px 16px;

package/lib/drawer/drawer.d.ts

@@ -1,4 +1,27 @@
 import type { DrawerProps as AntdDrawerProps } from 'antd/lib/drawer';
-import { FC } from 'react';
-export declare const Drawer: FC<AntdDrawerProps>;
+import type { BaseButtonProps } from 'antd/lib/button/button';
+import type { ButtonType } from '../button/button';
+import React, { FC } from 'react';
+interface CustomDrawerProps extends AntdDrawerProps {
+    footer?: React.ReactNode;
+    showFooter?: boolean;
+    onClose?: () => void;
+    onSubmit?: () => void;
+    onCancel?: () => void;
+    onOk?: () => void;
+    okText?: string;
+    cancelText?: string;
+    locale?: {
+        okText?: string;
+        cancelText?: string;
+    };
+    okType?: ButtonType;
+    cancelType?: ButtonType;
+    confirmLoading?: boolean;
+    okButtonProps?: BaseButtonProps;
+    cancelButtonProps?: BaseButtonProps;
+    clickOnBlankToClose: boolean;
+}
+export declare const Drawer: FC<CustomDrawerProps>;
+export {};
 //# sourceMappingURL=drawer.d.ts.map

package/lib/drawer/drawer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.d.ts","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGpE,OAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAKjC,eAAO,MAAM,MAAM,EAAE,EAAE,CAAC,eAAe,CAmBtC,CAAA"}
+{"version":3,"file":"drawer.d.ts","sourceRoot":"","sources":["../../src/drawer/drawer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAqB,MAAM,OAAO,CAAA;AAuDpD,UAAU,iBAAkB,SAAQ,eAAe;IACjD,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,aAAa,CAAC,EAAE,eAAe,CAAA;IAC/B,iBAAiB,CAAC,EAAE,eAAe,CAAA;IACnC,mBAAmB,EAAE,OAAO,CAAA;CAC7B;AAED,eAAO,MAAM,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAwGxC,CAAA"}