diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index 692c3f667c..72c980072e 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -7,6 +7,7 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { + AAlert: typeof import('ant-design-vue/es')['Alert'] AAnchorLink: typeof import('ant-design-vue/es')['AnchorLink'] AAutoComplete: typeof import('ant-design-vue/es')['AutoComplete'] AButton: typeof import('ant-design-vue/es')['Button'] @@ -15,6 +16,7 @@ declare module '@vue/runtime-core' { ACol: typeof import('ant-design-vue/es')['Col'] ACollapse: typeof import('ant-design-vue/es')['Collapse'] ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel'] + ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADivider: typeof import('ant-design-vue/es')['Divider'] ADropdown: typeof import('ant-design-vue/es')['Dropdown'] AForm: typeof import('ant-design-vue/es')['Form'] @@ -51,6 +53,7 @@ declare module '@vue/runtime-core' { ATag: typeof import('ant-design-vue/es')['Tag'] ATextarea: typeof import('ant-design-vue/es')['Textarea'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] + ATypographyText: typeof import('ant-design-vue/es')['TypographyText'] ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle'] AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/packages/nc-gui-v2/components/cell/DatePicker.vue b/packages/nc-gui-v2/components/cell/DatePicker.vue index d461974693..b259bdfe3e 100644 --- a/packages/nc-gui-v2/components/cell/DatePicker.vue +++ b/packages/nc-gui-v2/components/cell/DatePicker.vue @@ -1,91 +1,60 @@ - + diff --git a/packages/nc-gui-v2/package-lock.json b/packages/nc-gui-v2/package-lock.json index c578963671..b80358c982 100644 --- a/packages/nc-gui-v2/package-lock.json +++ b/packages/nc-gui-v2/package-lock.json @@ -10478,14 +10478,15 @@ } }, "node_modules/@intlify/bundle-utils": { - "version": "2.2.2", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-3.1.0.tgz", + "integrity": "sha512-ghlJ0kR2cCQ8D+poKknC0Xx0ncOt3J3os7CcIAqqIWVF7k6AtGoCDnIru+YzlZcvFRNmP9wEZ7jKliojCdAWNg==", "dev": true, - "license": "MIT", "dependencies": { - "@intlify/message-compiler": "^9.1.0", - "@intlify/shared": "^9.1.0", + "@intlify/message-compiler": "next", + "@intlify/shared": "next", "jsonc-eslint-parser": "^1.0.1", - "source-map": "^0.6.1", + "source-map": "0.6.1", "yaml-eslint-parser": "^0.3.2" }, "engines": { @@ -10500,6 +10501,28 @@ } } }, + "node_modules/@intlify/bundle-utils/node_modules/@intlify/message-compiler": { + "version": "9.2.0-beta.40", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.0-beta.40.tgz", + "integrity": "sha512-6QWTSYewmkew4nsRqgkwTVuGFKzxVCOK8EXsPt15N+tN1g+OYjC3PfGA2dPB6cVkNxqA9mV/hNK02uHPWU9t0A==", + "dev": true, + "dependencies": { + "@intlify/shared": "9.2.0-beta.40", + "source-map": "0.6.1" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@intlify/bundle-utils/node_modules/@intlify/shared": { + "version": "9.2.0-beta.40", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.0-beta.40.tgz", + "integrity": "sha512-xWz+SFjgt/LfaSbbHVn+V7gmvX4ZNP3cIFta790GWZ/tEgwJeC3tkV7i45iUbZ4ZimOerFgKH05b7qvJlKb6RQ==", + "dev": true, + "engines": { + "node": ">= 14" + } + }, "node_modules/@intlify/bundle-utils/node_modules/acorn": { "version": "7.4.1", "dev": true, @@ -10686,6 +10709,15 @@ } } }, + "node_modules/@intlify/vite-plugin-vue-i18n/node_modules/@intlify/shared": { + "version": "9.2.0-beta.40", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.0-beta.40.tgz", + "integrity": "sha512-xWz+SFjgt/LfaSbbHVn+V7gmvX4ZNP3cIFta790GWZ/tEgwJeC3tkV7i45iUbZ4ZimOerFgKH05b7qvJlKb6RQ==", + "dev": true, + "engines": { + "node": ">= 14" + } + }, "node_modules/@intlify/vite-plugin-vue-i18n/node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -23075,16 +23107,34 @@ } }, "@intlify/bundle-utils": { - "version": "2.2.2", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-3.1.0.tgz", + "integrity": "sha512-ghlJ0kR2cCQ8D+poKknC0Xx0ncOt3J3os7CcIAqqIWVF7k6AtGoCDnIru+YzlZcvFRNmP9wEZ7jKliojCdAWNg==", "dev": true, "requires": { - "@intlify/message-compiler": "^9.1.0", - "@intlify/shared": "^9.1.0", + "@intlify/message-compiler": "next", + "@intlify/shared": "next", "jsonc-eslint-parser": "^1.0.1", - "source-map": "^0.6.1", + "source-map": "0.6.1", "yaml-eslint-parser": "^0.3.2" }, "dependencies": { + "@intlify/message-compiler": { + "version": "9.2.0-beta.40", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.0-beta.40.tgz", + "integrity": "sha512-6QWTSYewmkew4nsRqgkwTVuGFKzxVCOK8EXsPt15N+tN1g+OYjC3PfGA2dPB6cVkNxqA9mV/hNK02uHPWU9t0A==", + "dev": true, + "requires": { + "@intlify/shared": "9.2.0-beta.40", + "source-map": "0.6.1" + } + }, + "@intlify/shared": { + "version": "9.2.0-beta.40", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.0-beta.40.tgz", + "integrity": "sha512-xWz+SFjgt/LfaSbbHVn+V7gmvX4ZNP3cIFta790GWZ/tEgwJeC3tkV7i45iUbZ4ZimOerFgKH05b7qvJlKb6RQ==", + "dev": true + }, "acorn": { "version": "7.4.1", "dev": true @@ -23195,6 +23245,12 @@ "source-map": "0.6.1" }, "dependencies": { + "@intlify/shared": { + "version": "9.2.0-beta.40", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.0-beta.40.tgz", + "integrity": "sha512-xWz+SFjgt/LfaSbbHVn+V7gmvX4ZNP3cIFta790GWZ/tEgwJeC3tkV7i45iUbZ4ZimOerFgKH05b7qvJlKb6RQ==", + "dev": true + }, "source-map": { "version": "0.6.1", "dev": true diff --git a/packages/nc-gui-v2/utils/dateTimeUtils.ts b/packages/nc-gui-v2/utils/dateTimeUtils.ts index e545ee290c..5f66d396df 100644 --- a/packages/nc-gui-v2/utils/dateTimeUtils.ts +++ b/packages/nc-gui-v2/utils/dateTimeUtils.ts @@ -2,8 +2,11 @@ import dayjs from 'dayjs' import relativeTime from 'dayjs/plugin/relativeTime' import utc from 'dayjs/plugin/utc' +import customParseFormat from 'dayjs/plugin/customParseFormat' + dayjs.extend(utc) dayjs.extend(relativeTime) +dayjs.extend(customParseFormat) export const timeAgo = (date: any) => { return dayjs.utc(date).fromNow()