From 647d482a901058ccd6a8b87eb0c03e18f4d9843d Mon Sep 17 00:00:00 2001 From: chenos Date: Thu, 27 Oct 2022 12:09:56 +0800 Subject: [PATCH] feat: support show lunar day (#972) * feat: support show lunar day * fix: update yarn.lock * fix: types error Co-authored-by: Dunqing --- packages/core/client/package.json | 1 + .../block-provider/CalendarBlockProvider.tsx | 4 +- packages/core/client/src/locale/zh_CN.ts | 1 + .../antd/calendar/Calendar.Designer.tsx | 31 ++-- .../antd/calendar/Calendar.tsx | 28 +++- .../schema-component/antd/calendar/style.less | 30 ++-- .../antd/form-item/FormItem.tsx | 2 +- .../src/schema-settings/SchemaSettings.tsx | 7 + yarn.lock | 135 ++++++++++-------- 9 files changed, 161 insertions(+), 78 deletions(-) diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 7fae4ec12..05bbd73f3 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -43,6 +43,7 @@ "react-quill": "^1.3.5", "react-router-dom": "^5.2.0", "react-to-print": "^2.14.7", + "solarlunar-es": "^1.0.9", "use-deep-compare-effect": "^1.8.1" }, "peerDependencies": { diff --git a/packages/core/client/src/block-provider/CalendarBlockProvider.tsx b/packages/core/client/src/block-provider/CalendarBlockProvider.tsx index 6571b66dc..7a54e1719 100644 --- a/packages/core/client/src/block-provider/CalendarBlockProvider.tsx +++ b/packages/core/client/src/block-provider/CalendarBlockProvider.tsx @@ -7,7 +7,7 @@ import { BlockProvider, useBlockRequestContext } from './BlockProvider'; export const CalendarBlockContext = createContext({}); const InternalCalendarBlockProvider = (props) => { - const { fieldNames } = props; + const { fieldNames, showLunar } = props; const field = useField(); const { resource, service } = useBlockRequestContext(); if (service.loading) { @@ -20,6 +20,7 @@ const InternalCalendarBlockProvider = (props) => { service, resource, fieldNames, + showLunar, }} > {props.children} @@ -49,5 +50,6 @@ export const useCalendarBlockProps = () => { }, [ctx?.service?.loading]); return { fieldNames: ctx.fieldNames, + showLunar: ctx.showLunar, }; }; diff --git a/packages/core/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts index 4c63c1f46..91a9ecdda 100644 --- a/packages/core/client/src/locale/zh_CN.ts +++ b/packages/core/client/src/locale/zh_CN.ts @@ -314,6 +314,7 @@ export default { "Configure calendar": "配置日历", "Title field": "标题字段", + "Show lunar": "展示农历", "Start date field": "开始日期字段", "End date field": "结束日期字段", "Navigate": "分页", diff --git a/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx b/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx index 4247e6032..98c7d2071 100644 --- a/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/calendar/Calendar.Designer.tsx @@ -12,15 +12,15 @@ const useOptions = (type = 'string') => { const compile = useCompile(); const { fields } = useCollection(); const options = fields - ?.filter((field) => field.type === type) - ?.map((field) => { - return { - value: field.name, - label: compile(field?.uiSchema?.title), - }; - }); + ?.filter((field) => field.type === type) + ?.map((field) => { + return { + value: field.name, + label: compile(field?.uiSchema?.title), + }; + }); return options; -} +}; export const CalendarDesigner = () => { const field = useField(); @@ -59,6 +59,21 @@ export const CalendarDesigner = () => { dn.refresh(); }} /> + { + field.decoratorProps.showLunar = v; + fieldSchema['x-decorator-props']['showLunar'] = v; + dn.emit('patch', { + schema: { + ['x-uid']: fieldSchema['x-uid'], + 'x-decorator-props': field.decoratorProps, + }, + }); + dn.refresh(); + }} + /> { + if (!drilldownView) { + return {label}; + } + + const lunarElement = useMemo(() => { + if (!showLunar) { + return; + } + const md = moment(date); + const result = solarLunar.solar2lunar(md.year(), md.month() + 1, md.date()); + const lunarDay = typeof result !== 'number' ? result.lunarFestival || result.term || result.dayCn : result; + return {lunarDay}; + }, [date, showLunar]); + + return ( + + {label} + {lunarElement} + + ); +}; + function Toolbar(props: ToolbarProps) { const fieldSchema = useFieldSchema(); const toolBarSchema: Schema = useMemo( @@ -105,10 +129,11 @@ const CalendarRecordViewer = (props) => { }; export const Calendar: any = observer((props: any) => { - const { dataSource, fieldNames } = useProps(props); + const { dataSource, fieldNames, showLunar } = useProps(props); const events = useEvents(dataSource, fieldNames); const [visible, setVisible] = useState(false); const [record, setRecord] = useState({}); + return (
@@ -148,6 +173,7 @@ export const Calendar: any = observer((props: any) => { defaultDate={new Date()} components={{ toolbar: Toolbar, + dateHeader: (props) => , }} localizer={localizer} /> diff --git a/packages/core/client/src/schema-component/antd/calendar/style.less b/packages/core/client/src/schema-component/antd/calendar/style.less index aefe3d99d..8ca9367e5 100644 --- a/packages/core/client/src/schema-component/antd/calendar/style.less +++ b/packages/core/client/src/schema-component/antd/calendar/style.less @@ -74,7 +74,6 @@ button.rbc-input::-moz-focus-inner { text-overflow: ellipsis; white-space: nowrap; padding: 4px 12px; - text-align: right; vertical-align: middle; // font-weight: 500; min-height: 32px; @@ -338,24 +337,39 @@ button.rbc-input::-moz-focus-inner { // cursor: pointer; flex: 1 1 0; min-width: 0; - padding-right: 12px; + padding-left: 12px; padding-top: 4px; - text-align: right; } -.rbc-date-cell.rbc-now a { +.rbc-date-cell.rbc-now span { // font-weight: bold; color: #1890ff; } -.rbc-date-cell > a, -.rbc-date-cell > a:active, -.rbc-date-cell > a:visited { +.rbc-date-cell a, +.rbc-date-cell a:active, +.rbc-date-cell a:visited { color: inherit; text-decoration: none; } -.rbc-date-cell > a:hover { +.rbc-date-cell a:hover { color: #1890ff; } +.rbc-date-cell .rbc-date-solar { + font-weight: 500; +} + +.rbc-date-cell .rbc-date-lunar { + padding-left: 12px; +} + +.rbc-date-cell:not(.rbc-off-range) .rbc-date-lunar { + color: #aaa +} + +.rbc-date-cell .rbc-date-lunar:hover { + color: inherit +} + .rbc-row-bg { display: flex; flex-direction: row; diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx index 3f0d1a4a1..879d43ea8 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx @@ -189,7 +189,7 @@ FormItem.Designer = (props) => { { const schema = { ['x-uid']: fieldSchema['x-uid'], diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx index 4ec2587a7..d1b40a128 100644 --- a/packages/core/client/src/schema-settings/SchemaSettings.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx @@ -60,6 +60,7 @@ type SchemaSettingsNested = { Item?: React.FC; Divider?: React.FC; Popup?: React.FC; + SwitchItem?: React.FC; [key: string]: any; }; @@ -429,6 +430,12 @@ SchemaSettings.SelectItem = (props) => { ); }; +interface SwitchItemProps extends Omit { + title: string; + checked?: boolean; + onChange?: (v: boolean) => void; +} + SchemaSettings.SwitchItem = (props) => { const { title, onChange, ...others } = props; const [checked, setChecked] = useState(!!props.checked); diff --git a/yarn.lock b/yarn.lock index dac615128..43fb1b1ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,7 +4,7 @@ "@alicloud/credentials@^2": version "2.2.3" - resolved "https://registry.yarnpkg.com/@alicloud/credentials/-/credentials-2.2.3.tgz#6c479082e3f627311e2537c0552e3e87a8ecd671" + resolved "https://registry.npmjs.org/@alicloud%2fcredentials/-/credentials-2.2.3.tgz#6c479082e3f627311e2537c0552e3e87a8ecd671" integrity sha512-h98BZimKCQ5xKiFCdWa2OMYaenEP6g5Fndm/l0zp8iuYWOShnvEwBPFmHyHmwpb60KwEJp0LILl1WiBTS+5a1w== dependencies: "@alicloud/tea-typescript" "^1.5.3" @@ -14,7 +14,7 @@ "@alicloud/dysmsapi20170525@2.0.17": version "2.0.17" - resolved "https://registry.yarnpkg.com/@alicloud/dysmsapi20170525/-/dysmsapi20170525-2.0.17.tgz#a350a443f52456b823772345dd57cc5fe2e6c8da" + resolved "https://registry.npmjs.org/@alicloud%2fdysmsapi20170525/-/dysmsapi20170525-2.0.17.tgz#a350a443f52456b823772345dd57cc5fe2e6c8da" integrity sha512-bgA4eIYJdZrKFSkCh/DGiMVnrO/O4/izpgecWiR+Cn0pxZkA3T0olYvE32+SLxJH/oBhdX6JTfuxtjnzvLKSug== dependencies: "@alicloud/endpoint-util" "^0.0.1" @@ -25,7 +25,7 @@ "@alicloud/endpoint-util@^0.0.1": version "0.0.1" - resolved "https://registry.yarnpkg.com/@alicloud/endpoint-util/-/endpoint-util-0.0.1.tgz#b237f5e04e373abb54c42119377b30bd6afb1a7c" + resolved "https://registry.npmjs.org/@alicloud%2fendpoint-util/-/endpoint-util-0.0.1.tgz#b237f5e04e373abb54c42119377b30bd6afb1a7c" integrity sha512-+pH7/KEXup84cHzIL6UJAaPqETvln4yXlD9JzlrqioyCSaWxbug5FUobsiI6fuUOpw5WwoB3fWAtGbFnJ1K3Yg== dependencies: "@alicloud/tea-typescript" "^1.5.1" @@ -33,15 +33,15 @@ "@alicloud/gateway-spi@^0.0.8": version "0.0.8" - resolved "https://registry.yarnpkg.com/@alicloud/gateway-spi/-/gateway-spi-0.0.8.tgz#1d251986ed40d8b98690dcac8128fec0c56f0f53" + resolved "https://registry.npmjs.org/@alicloud%2fgateway-spi/-/gateway-spi-0.0.8.tgz#1d251986ed40d8b98690dcac8128fec0c56f0f53" integrity sha512-KM7fu5asjxZPmrz9sJGHJeSU+cNQNOxW+SFmgmAIrITui5hXL2LB+KNRuzWmlwPjnuA2X3/keq9h6++S9jcV5g== dependencies: "@alicloud/credentials" "^2" "@alicloud/tea-typescript" "^1.7.1" -"@alicloud/openapi-client@0.4.1", "@alicloud/openapi-client@^0.4.1": +"@alicloud/openapi-client@0.4.1": version "0.4.1" - resolved "https://registry.yarnpkg.com/@alicloud/openapi-client/-/openapi-client-0.4.1.tgz#8e55a3bdfee17a00c2ec3d10feaf7bfd0eff7502" + resolved "https://registry.npmjs.org/@alicloud%2fopenapi-client/-/openapi-client-0.4.1.tgz#8e55a3bdfee17a00c2ec3d10feaf7bfd0eff7502" integrity sha512-FNGQ9kmGi0AuNFX9yj7DDbMn8CB4TvihIIQ3ONNhLZF8Hj2asau7NiqVoftJX3F/JFq9qzJWeVbvboSM9Zq5kA== dependencies: "@alicloud/credentials" "^2" @@ -50,9 +50,21 @@ "@alicloud/tea-typescript" "^1.7.1" "@alicloud/tea-util" "^1.4.0" +"@alicloud/openapi-client@^0.4.1": + version "0.4.3" + resolved "https://registry.npmjs.org/@alicloud%2fopenapi-client/-/openapi-client-0.4.3.tgz#622bda48895ab6403505a1869fc0a9de20df3dbd" + integrity sha512-3eH3zj2IslFX/s5lCe7bf03GEImlfAgN50miDcWOFLPnyyRVKQDJeUvAuoDHBZx0i+TS8LlOB80gF5cGWx2uyA== + dependencies: + "@alicloud/credentials" "^2" + "@alicloud/gateway-spi" "^0.0.8" + "@alicloud/openapi-util" "^0.2.9" + "@alicloud/tea-typescript" "^1.7.1" + "@alicloud/tea-util" "^1.4.4" + "@alicloud/tea-xml" "0.0.2" + "@alicloud/openapi-util@^0.2.7", "@alicloud/openapi-util@^0.2.9": version "0.2.9" - resolved "https://registry.yarnpkg.com/@alicloud/openapi-util/-/openapi-util-0.2.9.tgz#2379cd81f993dcab32066a2b892ddcbdd266d51c" + resolved "https://registry.npmjs.org/@alicloud%2fopenapi-util/-/openapi-util-0.2.9.tgz#2379cd81f993dcab32066a2b892ddcbdd266d51c" integrity sha512-GUEYtX3lDv+WaZoDFCb0h9aZ8+IlajnSAxSHjiITbNtjCpZbA/vfd7Z/ST9YaPoT34nGqDNKiQTjqpLhaKtYBw== dependencies: "@alicloud/tea-typescript" "^1.7.1" @@ -60,22 +72,31 @@ kitx "^2.1.0" sm3 "^1.0.3" -"@alicloud/tea-typescript@^1.5.1", "@alicloud/tea-typescript@^1.5.3", "@alicloud/tea-typescript@^1.7.1": - version "1.7.5" - resolved "https://registry.yarnpkg.com/@alicloud/tea-typescript/-/tea-typescript-1.7.5.tgz#d8afa092f79e545ebe2aa89fd70acb0efad2aed1" - integrity sha512-YyRMQaR+zURKBYkA+ckzS/m/5FH6x5P2oihCXLNZ6y0zmeRZPBfl8Rmr+mfPdCQA8ujkRDUn0zvj8M5kd7T0MQ== +"@alicloud/tea-typescript@^1", "@alicloud/tea-typescript@^1.5.1", "@alicloud/tea-typescript@^1.5.3", "@alicloud/tea-typescript@^1.7.1": + version "1.8.0" + resolved "https://registry.npmjs.org/@alicloud%2ftea-typescript/-/tea-typescript-1.8.0.tgz#aa9b04b6ee53e1b22aa51e224a950ea5bcd966e9" + integrity sha512-CWXWaquauJf0sW30mgJRVu9aaXyBth5uMBCUc+5vKTK1zlgf3hIqRUjJZbjlwHwQ5y9anwcu18r48nOZb7l2QQ== dependencies: "@types/node" "^12.0.2" httpx "^2.2.6" "@alicloud/tea-util@1.4.4", "@alicloud/tea-util@^1.3.0", "@alicloud/tea-util@^1.4.0", "@alicloud/tea-util@^1.4.4": version "1.4.4" - resolved "https://registry.yarnpkg.com/@alicloud/tea-util/-/tea-util-1.4.4.tgz#d70efe2d401bdd6e2fc2c5b69bbfff3db733e844" + resolved "https://registry.npmjs.org/@alicloud%2ftea-util/-/tea-util-1.4.4.tgz#d70efe2d401bdd6e2fc2c5b69bbfff3db733e844" integrity sha512-uD2lMmVMSdcmv2rHTzfp2eW4OkyFig/qwBClz3Vh65qd+j6d+bjwGI1M6AnqNg9gL0yhF1Kb2Um8ljA14w1SRw== dependencies: "@alicloud/tea-typescript" "^1.5.1" kitx "^2.0.0" +"@alicloud/tea-xml@0.0.2": + version "0.0.2" + resolved "https://registry.npmjs.org/@alicloud%2ftea-xml/-/tea-xml-0.0.2.tgz#7c97a38255d5e4f009c437facd3a2afc0ef17f45" + integrity sha512-Xs7v5y7YSNSDDYmiDWAC0/013VWPjS3dQU4KezSLva9VGiTVPaL3S7Nk4NrTmAYCG6MKcrRj/nGEDIWL5KRoPg== + dependencies: + "@alicloud/tea-typescript" "^1" + "@types/xml2js" "^0.4.5" + xml2js "^0.4.22" + "@ampproject/remapping@^2.1.0": version "2.2.0" resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" @@ -4992,7 +5013,7 @@ "@types/cache-manager@^4.0.2": version "4.0.2" - resolved "https://registry.npmmirror.com/@types/cache-manager/-/cache-manager-4.0.2.tgz#5e76dd9e7881c23f332c2f48e5f326bd05ba9ac9" + resolved "https://registry.npmjs.org/@types%2fcache-manager/-/cache-manager-4.0.2.tgz#5e76dd9e7881c23f332c2f48e5f326bd05ba9ac9" integrity sha512-fT5FMdzsiSX0AbgnS5gDvHl2Nco0h5zYyjwDQy4yPC7Ww6DeGMVKPRqIZtg9HOXDV2kkc18SL1B0N8f0BecrCA== "@types/connect@*": @@ -5264,13 +5285,13 @@ "@types/node@^12.0.2": version "12.20.55" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" + resolved "https://registry.npmjs.org/@types%2fnode/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== "@types/node@^14": - version "14.18.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.23.tgz#70f5f20b0b1b38f696848c1d3647bb95694e615e" - integrity sha512-MhbCWN18R4GhO8ewQWAFK4TGQdBpXWByukz7cWyJmXhvRuCIaM/oWytGPqVmDzgEnnaIc9ss6HbU5mUi+vyZPA== + version "14.18.32" + resolved "https://registry.npmjs.org/@types%2fnode/-/node-14.18.32.tgz#8074f7106731f1a12ba993fe8bad86ee73905014" + integrity sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow== "@types/node@^14.14.28": version "14.17.34" @@ -5331,14 +5352,7 @@ resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@^16.9.8": - version "16.9.16" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.16.tgz#c591f2ed1c6f32e9759dfa6eb4abfd8041f29e39" - integrity sha512-Oqc0RY4fggGA3ltEgyPLc3IV9T73IGoWjkONbsyJ3ZBn+UPPCYpU2ec0i3cEbJuEdZtkqcCF2l1zf2pBdgUGSg== - dependencies: - "@types/react" "^16" - -"@types/react-dom@^17.0.0": +"@types/react-dom@^16.9.8", "@types/react-dom@^17.0.0": version "17.0.11" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466" integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q== @@ -5398,7 +5412,7 @@ "@types/history" "*" "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.11", "@types/react@^17.0.0": +"@types/react@*", "@types/react@>=16.9.11", "@types/react@^16.9.43", "@types/react@^17.0.0": version "17.0.34" resolved "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz#797b66d359b692e3f19991b6b07e4b0c706c0102" integrity sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg== @@ -5407,15 +5421,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^16", "@types/react@^16.9.43": - version "16.14.32" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.32.tgz#d4e4fe5ece3c27fcb4608b1f4a614f7dec881392" - integrity sha512-hvEy4vGVADbtj/U6+CA5SRC5QFIjdxD7JslAie8EuAYZwhYY9bgforpXNyF1VFzhnkEOesDy1278t1wdjN74cw== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - "@types/resolve@1.17.1": version "1.17.1" resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" @@ -5500,6 +5505,13 @@ resolved "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= +"@types/xml2js@^0.4.5": + version "0.4.11" + resolved "https://registry.npmjs.org/@types%2fxml2js/-/xml2js-0.4.11.tgz#bf46a84ecc12c41159a7bd9cf51ae84129af0e79" + integrity sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" @@ -6106,7 +6118,7 @@ ajv-errors@^1.0.0: ajv-formats@^1.5.1: version "1.6.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-1.6.1.tgz#35c7cdcd2a12d509171c37bac32f2e8eb010a536" + resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-1.6.1.tgz#35c7cdcd2a12d509171c37bac32f2e8eb010a536" integrity sha512-4CjkH20If1lhR5CGtqkrVg3bbOtFEG80X9v6jDOIUhbzzbB+UzPBGy8GQhUNVZ0yvMHdMpawCOcy5ydGMsagGQ== dependencies: ajv "^7.0.0" @@ -6128,7 +6140,7 @@ ajv@6.12.6, ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@ ajv@^7.0.0, ajv@^7.0.3: version "7.2.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.2.4.tgz#8e239d4d56cf884bccca8cca362f508446dc160f" + resolved "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz#8e239d4d56cf884bccca8cca362f508446dc160f" integrity sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A== dependencies: fast-deep-equal "^3.1.1" @@ -6771,7 +6783,7 @@ atob@^2.1.2: atomically@^1.7.0: version "1.7.0" - resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" + resolved "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== autoprefixer@9.6.0: @@ -7502,14 +7514,14 @@ cache-content-type@^1.0.0: cache-manager-fs-hash@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/cache-manager-fs-hash/-/cache-manager-fs-hash-1.0.0.tgz#9a3f3fa239c48c54fc6b00575032b72c07dcad99" + resolved "https://registry.npmjs.org/cache-manager-fs-hash/-/cache-manager-fs-hash-1.0.0.tgz#9a3f3fa239c48c54fc6b00575032b72c07dcad99" integrity sha512-fK2vEAhWh7IAzBP+JwUEJkng0OPOxw3ji86SjQS5SWdLx2Cytku6xFNoQK32pedtuae/wBl/jA/X4abiAYHS/Q== dependencies: lockfile "^1.0.4" cache-manager@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/cache-manager/-/cache-manager-4.1.0.tgz#aa986421f1c975a862d6de88edb9ab1d30f4bd39" + resolved "https://registry.npmjs.org/cache-manager/-/cache-manager-4.1.0.tgz#aa986421f1c975a862d6de88edb9ab1d30f4bd39" integrity sha512-ZGM6dLxrP65bfOZmcviWMadUOCICqpLs92+P/S5tj8onz+k+tB7Gr+SAgOUHCQtfm2gYEQDHiKeul4+tYPOJ8A== dependencies: async "3.2.3" @@ -8298,7 +8310,7 @@ concurrently@^7.0.0: conf@^9.0.0: version "9.0.2" - resolved "https://registry.yarnpkg.com/conf/-/conf-9.0.2.tgz#943589602b1ce274d9234265314336a698972bc5" + resolved "https://registry.npmjs.org/conf/-/conf-9.0.2.tgz#943589602b1ce274d9234265314336a698972bc5" integrity sha512-rLSiilO85qHgaTBIIHQpsv8z+NnVfZq3cKuYNCXN1AOqPzced0GWZEe/A517VldRLyQYXUMyV+vszavE2jSAqw== dependencies: ajv "^7.0.3" @@ -8595,7 +8607,7 @@ core-util-is@^1.0.2, core-util-is@~1.0.0: cos-nodejs-sdk-v5@^2.11.14: version "2.11.14" - resolved "https://registry.yarnpkg.com/cos-nodejs-sdk-v5/-/cos-nodejs-sdk-v5-2.11.14.tgz#9179a751d2f5e229422335609f688e0d1c786c5e" + resolved "https://registry.npmjs.org/cos-nodejs-sdk-v5/-/cos-nodejs-sdk-v5-2.11.14.tgz#9179a751d2f5e229422335609f688e0d1c786c5e" integrity sha512-PCkGa1tJikjIr42GqihTnefZntPHp64so55E2rcSYzim6nUCrJdcFM9eBLU3rMS4Nz11mBjhSPqyQJq+avfHqg== dependencies: conf "^9.0.0" @@ -8712,9 +8724,9 @@ croner@~4.1.92: integrity sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ== cronstrue@^2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.11.0.tgz#18ff1b95a836b9b4e06854f796db2dc8fa98ce41" - integrity sha512-iIBCSis5yqtFYWtJAmNOiwDveFWWIn+8uV5UYuPHYu/Aeu5CSSJepSbaHMyfc+pPFgnsCcGzfPQEo7LSGmWbTg== + version "2.14.0" + resolved "https://registry.npmjs.org/cronstrue/-/cronstrue-2.14.0.tgz#7dcbebc9befc6fbc584403cc9c52b10772308a1e" + integrity sha512-rUTXOwOYrw7o4iV+Wg7fUXjMXDuqAMnhU007LrvaGbfVx73aiZz2e5SYjsAt6Q7ML2/z7Gq3qTncy3GKO9MLSQ== cross-env@^7.0.3: version "7.0.3" @@ -9160,7 +9172,7 @@ dayjs@~1.8.24, dayjs@~1.8.25: debounce-fn@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" + resolved "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== dependencies: mimic-fn "^3.0.0" @@ -12066,7 +12078,7 @@ https-proxy-agent@5, https-proxy-agent@^5.0.0: httpx@^2.2.0, httpx@^2.2.6: version "2.2.7" - resolved "https://registry.yarnpkg.com/httpx/-/httpx-2.2.7.tgz#1e34198146e32ca3305a66c11209559e1cbeba09" + resolved "https://registry.npmjs.org/httpx/-/httpx-2.2.7.tgz#1e34198146e32ca3305a66c11209559e1cbeba09" integrity sha512-Wjh2JOAah0pdczfqL8NC5378G7jMt0Zcpn8U+yyxAiejjlagzSTQgJHuVvka2VNPQlKfoGehYRc79WKq9E4gDw== dependencies: "@types/node" "^14" @@ -14078,12 +14090,12 @@ json-schema-traverse@^0.4.1: json-schema-traverse@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== json-schema-typed@^7.0.3: version "7.0.3" - resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" + resolved "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== json-schema@0.2.3: @@ -14281,7 +14293,7 @@ kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: kitx@^2.0.0, kitx@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/kitx/-/kitx-2.1.0.tgz#fc7fbf78eb6ed7a5a3fd2d7afb3011e29d0e44c8" + resolved "https://registry.npmjs.org/kitx/-/kitx-2.1.0.tgz#fc7fbf78eb6ed7a5a3fd2d7afb3011e29d0e44c8" integrity sha512-C/5v9MtIX7aHGOjwn5BmrrbNkJSf7i0R5mRzmh13GSAdRqQ7bYQo/Su2pTYNylFicqKNTVX3HML9k1u8k51+pQ== dependencies: "@types/node" "^12.0.2" @@ -14609,7 +14621,7 @@ locate-path@^6.0.0: lockfile@^1.0.4: version "1.0.4" - resolved "https://registry.npmmirror.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" + resolved "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA== dependencies: signal-exit "^3.0.2" @@ -14648,7 +14660,7 @@ lodash.clone@4.5.0, lodash.clone@^4.3.2: lodash.clonedeep@^4.5.0: version "4.5.0" - resolved "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== lodash.debounce@^4.0.8: @@ -14852,7 +14864,7 @@ lru-cache@^6.0.0: lru-cache@^7.10.1: version "7.14.0" - resolved "https://registry.npmmirror.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== luxon@^1.28.0: @@ -15455,7 +15467,7 @@ mimic-fn@^2.1.0: mimic-fn@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" + resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== mimic-response@^1.0.0, mimic-response@^1.0.1: @@ -15663,7 +15675,7 @@ moment-timezone@^0.5.31: moment@2.x: version "2.29.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== "moment@>= 2.9.0", moment@^2.24.0, moment@^2.25.3, moment@^2.26.0: @@ -15705,7 +15717,7 @@ multer-aliyun-oss@2.1.1: multer-cos@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/multer-cos/-/multer-cos-1.0.3.tgz#f8998b9a16d2e6e2d3f00cd811ef0bcf14e804b6" + resolved "https://registry.npmjs.org/multer-cos/-/multer-cos-1.0.3.tgz#f8998b9a16d2e6e2d3f00cd811ef0bcf14e804b6" integrity sha512-KD1/ZUHcmjYtsPHlosOsned8u6a1xYgUYmnU0659rRue4fjVSbEBo6BKyI2N6BbUNHAWMz18NUb9a5Gn5GcgvQ== multer-s3@^2.10.0: @@ -19848,7 +19860,7 @@ require-directory@^2.1.1: require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== require-in-the-middle@^5.0.0: @@ -20651,7 +20663,7 @@ slide@^1.1.6: sm3@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/sm3/-/sm3-1.0.3.tgz#0051f0cc948c983944843136e7baa244eec5cd49" + resolved "https://registry.npmjs.org/sm3/-/sm3-1.0.3.tgz#0051f0cc948c983944843136e7baa244eec5cd49" integrity sha512-KyFkIfr8QBlFG3uc3NaljaXdYcsbRy1KrSfc4tsQV8jW68jAktGeOcifu530Vx/5LC+PULHT0Rv8LiI8Gw+c1g== smart-buffer@^4.1.0: @@ -20715,6 +20727,11 @@ socks@^2.3.3, socks@^2.6.1: ip "^1.1.5" smart-buffer "^4.1.0" +solarlunar-es@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/solarlunar-es/-/solarlunar-es-1.0.9.tgz#fdd29efbf28afa0f649f19732c9ed01a2dd3c7b7" + integrity sha512-Phsk53NMRexjZkXmL6Q9l1UOtJ0GPt+/KUu+mCZkGIV9GlXpYxwjjh4hGhSd7j7k/PrVtX5Uh7/iW5R7fJ+STg== + sort-keys@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" @@ -23251,7 +23268,7 @@ xml2js@0.4.19: sax ">=0.6.0" xmlbuilder "~9.0.1" -xml2js@^0.4.16, xml2js@^0.4.19: +xml2js@^0.4.16, xml2js@^0.4.19, xml2js@^0.4.22: version "0.4.23" resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==