Browse Source

fix(nc-gui): revise datetime extraction regex

pull/5642/head
Wing-Kam Wong 1 year ago
parent
commit
3035ed69bc
  1. 4
      packages/nc-gui/components/virtual-cell/Formula.vue
  2. 2
      packages/nc-gui/composables/useMultiSelect/index.ts

4
packages/nc-gui/components/virtual-cell/Formula.vue

@ -20,8 +20,8 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning, activ
const renderResult = (result: string) => { const renderResult = (result: string) => {
// convert all date time values to local time // convert all date time values to local time
// the input is always YYYY-MM-DD hh:mm:ss+00:00 // the input is always YYYY-MM-DD hh:mm:ss+xx:yy
return result.replace(/\b(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+00:00)\b/g, (d) => { return result.replace(/\b(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+\d{2}:\d{2})\b/g, (d) => {
// TODO(timezone): retrieve the format from the corresponding column meta // TODO(timezone): retrieve the format from the corresponding column meta
// assume hh:mm at this moment // assume hh:mm at this moment
return dayjs(d).utc().local().format('YYYY-MM-DD HH:mm') return dayjs(d).utc().local().format('YYYY-MM-DD HH:mm')

2
packages/nc-gui/composables/useMultiSelect/index.ts

@ -117,7 +117,7 @@ export function useMultiSelect(
} }
if (columnObj.uidt === UITypes.Formula) { if (columnObj.uidt === UITypes.Formula) {
textToCopy = textToCopy.replace(/\b(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+00:00)\b/g, (d: string) => { textToCopy = textToCopy.replace(/\b(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+\d{2}:\d{2})\b/g, (d: string) => {
// TODO(timezone): retrieve the format from the corresponding column meta // TODO(timezone): retrieve the format from the corresponding column meta
// assume hh:mm at this moment // assume hh:mm at this moment
return dayjs(d).utc().local().format('YYYY-MM-DD HH:mm') return dayjs(d).utc().local().format('YYYY-MM-DD HH:mm')

Loading…
Cancel
Save