From 0fc33bb036bce75d0bde8644cff250db2d134f56 Mon Sep 17 00:00:00 2001 From: huyuyang Date: Wed, 27 Nov 2024 17:15:06 +0800 Subject: [PATCH 001/251] =?UTF-8?q?fix:=20=E9=AA=8C=E8=AF=81data-grid?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=88=97=E5=BC=80=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui-vue/demos/data-grid/basic.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-vue/demos/data-grid/basic.vue b/packages/ui-vue/demos/data-grid/basic.vue index e2b9c3d1525..253a7ba1c25 100644 --- a/packages/ui-vue/demos/data-grid/basic.vue +++ b/packages/ui-vue/demos/data-grid/basic.vue @@ -73,7 +73,7 @@ import { DataColumn } from '../../components/data-view'; // } // ] const columns: DataColumn[] = [ - { field: 'id', title: '标识', width: 60, resizable: true, + { field: 'id', title: '标识', width: 60, resizable:false, dataType: 'string', readonly: true }, { field: 'avatar', showEllipsis:true,filterable:true, title: '头像', width: 100, resizable: true, dataType: 'string', readonly: true }, -- Gitee From 3876d07bc5516ef8d9d206ecec5d3d57aa3b44dc Mon Sep 17 00:00:00 2001 From: huyuyang Date: Wed, 27 Nov 2024 19:41:30 +0800 Subject: [PATCH 002/251] =?UTF-8?q?config:=20=E8=B0=83=E6=95=B4=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E5=90=8E=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6css?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui-vue/scripts/commands/build.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/ui-vue/scripts/commands/build.js b/packages/ui-vue/scripts/commands/build.js index 57503d9b914..aaddc240c14 100644 --- a/packages/ui-vue/scripts/commands/build.js +++ b/packages/ui-vue/scripts/commands/build.js @@ -118,6 +118,12 @@ async function buildSeperately(componentName) { '@vue/shared': 'VueShared', 'bignumber.js': 'BigNumber', 'lodash-es': 'LodashES' + }, + assetFileNames: ({ names, type }) => { + if (type === 'asset' && /\.(css)$/i.test(names)) { + return 'index.[ext]'; + } + return '[name].[ext]'; } } } @@ -185,6 +191,12 @@ const buildLibs = async () => { 'bignumber.js': 'BigNumber', 'lodash-es': 'LodashES' } + }, + assetFileNames: ({ names, type }) => { + if (type === 'asset' && /\.(css)$/i.test(names)) { + return 'index.[ext]'; + } + return '[name].[ext]'; } } } -- Gitee From a7ac74525c3f21a463989ec918cfc9cff9f6a28c Mon Sep 17 00:00:00 2001 From: huyuyang Date: Wed, 27 Nov 2024 20:34:44 +0800 Subject: [PATCH 003/251] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddata-grid?= =?UTF-8?q?=E7=BB=84=E4=BB=B6,=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E6=98=BE=E7=A4=BA=E5=BC=80=E5=85=B3=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-view/composition/visualization/use-virtual-scroll.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-vue/components/data-view/composition/visualization/use-virtual-scroll.ts b/packages/ui-vue/components/data-view/composition/visualization/use-virtual-scroll.ts index 10831453756..e2f780f3923 100644 --- a/packages/ui-vue/components/data-view/composition/visualization/use-virtual-scroll.ts +++ b/packages/ui-vue/components/data-view/composition/visualization/use-virtual-scroll.ts @@ -103,7 +103,7 @@ export function useVirtualScroll( }); const shouldShowHorizontalScrollbar = computed(() => { - return gridViewWidth.value > viewPortWidth.value; + return Math.floor(gridViewWidth.value) > viewPortWidth.value; }); function updateOffsetY(deltaY: number) { -- Gitee From 33885670762c9e2a87aa8d1645a6ac52e7d9ac00 Mon Sep 17 00:00:00 2001 From: huyuyang Date: Thu, 28 Nov 2024 08:43:04 +0800 Subject: [PATCH 004/251] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9E=84?= =?UTF-8?q?=E5=BB=BApackage.json=E6=96=87=E4=BB=B6=E5=BC=95=E7=94=A8css?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui-vue/scripts/commands/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui-vue/scripts/commands/build.js b/packages/ui-vue/scripts/commands/build.js index aaddc240c14..b5823d5a4fa 100644 --- a/packages/ui-vue/scripts/commands/build.js +++ b/packages/ui-vue/scripts/commands/build.js @@ -27,7 +27,7 @@ const createPackageJson = async () => { packageObject.version = packageVersion; packageObject.main = './farris.all.umd.js'; packageObject.module = './farris.all.esm.js'; - packageObject.style = './style.css'; + packageObject.style = './index.css'; packageObject.dependencies = omit(packageObject.dependencies, 'vue'); packageObject.types = './types/index.d.ts'; const fileStr = JSON.stringify(omit(packageObject, 'scripts', 'devDependencies'), null, 2); @@ -141,7 +141,7 @@ async function buildSeperately(componentName) { "version": "${packageVersion}", "main": "index.umd.js", "module": "index.esm.js", - "style": "style.css", + "style": "index.css", "types": "../types/${componentName}/index.d.ts" }`; fsExtra.outputFile(`./package/components/${componentName}/package.json`, packageContent, 'utf-8'); -- Gitee From 4896809b124fd04ba4741b4e5fd3260a8f6a54a3 Mon Sep 17 00:00:00 2001 From: huyuyang Date: Thu, 28 Nov 2024 10:36:13 +0800 Subject: [PATCH 005/251] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E6=B0=B4=E5=B9=B3=E5=B1=85=E4=B8=AD=E9=97=AE?= =?UTF-8?q?=E9=A2=98;=E5=8F=8A=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-grid/src/components/data/data-area.component.tsx | 6 +++++- .../src/designer/column-header.design.component.tsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/ui-vue/components/data-grid/src/components/data/data-area.component.tsx b/packages/ui-vue/components/data-grid/src/components/data/data-area.component.tsx index 7eea4d194e4..25be6e63840 100644 --- a/packages/ui-vue/components/data-grid/src/components/data/data-area.component.tsx +++ b/packages/ui-vue/components/data-grid/src/components/data/data-area.component.tsx @@ -194,7 +194,11 @@ export default function ( onClick={(payload: MouseEvent) => onClickCell(payload, cell)} onKeyup={(payload: KeyboardEvent) => navigateOnKeyUp(payload, cell)}>
-
+
{ cell.data != null && context.slots.cellTemplate ? context.slots.cellTemplate({ cell, row: visualDataRow }) : diff --git a/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx b/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx index ee7555cbd47..63f5291b374 100644 --- a/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx +++ b/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx @@ -117,7 +117,7 @@ export default function ( } function renderGridHeaderCell(headerCell: HeaderCell, headerCells: HeaderCell[], columnIndex: number) { // const columnSchema=getColumnSchema(headerCell.field); - const columnSchema = headerCell.column; + let columnSchema = headerCell.column; return (
Date: Thu, 28 Nov 2024 10:39:35 +0800 Subject: [PATCH 006/251] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=E5=AE=9A?= =?UTF-8?q?=E4=B9=89const=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-grid/src/designer/column-header.design.component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx b/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx index 63f5291b374..ee7555cbd47 100644 --- a/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx +++ b/packages/ui-vue/components/data-grid/src/designer/column-header.design.component.tsx @@ -117,7 +117,7 @@ export default function ( } function renderGridHeaderCell(headerCell: HeaderCell, headerCells: HeaderCell[], columnIndex: number) { // const columnSchema=getColumnSchema(headerCell.field); - let columnSchema = headerCell.column; + const columnSchema = headerCell.column; return (
Date: Thu, 28 Nov 2024 13:35:53 +0800 Subject: [PATCH 007/251] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96tree-grid?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui-vue/components/data-view/composition/use-row.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/ui-vue/components/data-view/composition/use-row.ts b/packages/ui-vue/components/data-view/composition/use-row.ts index 0565d8cc3f5..b3c1efe9e47 100644 --- a/packages/ui-vue/components/data-view/composition/use-row.ts +++ b/packages/ui-vue/components/data-view/composition/use-row.ts @@ -88,11 +88,13 @@ export function useRow( } function onMouseoverRow($event: MouseEvent, dataItem: VisualData) { - hoverIndex.value = dataItem.index; + // 此处有性能问题 暂时注释掉 + // hoverIndex.value = dataItem.index; } function onMouseoutRow($event: MouseEvent, dataItem: VisualData) { - hoverIndex.value = -1; + // 此处有性能问题 暂时注释掉 + // hoverIndex.value = -1; } function sidebarRowClass(dataItem: VisualData) { -- Gitee From 9a8dc6fadfdbf43786faa25f8250da96d56b73c0 Mon Sep 17 00:00:00 2001 From: huyuyang Date: Thu, 28 Nov 2024 19:02:24 +0800 Subject: [PATCH 008/251] =?UTF-8?q?feature:=20combo-list=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BE=93=E5=85=A5=E5=80=BC=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo-list/src/combo-list.component.tsx | 1 + .../combo-list/src/combo-list.props.ts | 8 ++++- .../components/list-container.component.tsx | 30 ++++++++++++++++++- .../src/components/list-container.props.ts | 10 +++++-- .../combo-list/src/composition/use-search.ts | 0 .../header/search-header.component.tsx | 5 +++- .../list-view/src/composition/use-search.ts | 2 +- .../list-view/src/list-view.component.tsx | 7 +++-- .../list-view/src/list-view.props.ts | 4 ++- packages/ui-vue/demos/combo-list/search.vue | 21 +++++++++++-- 10 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 packages/ui-vue/components/combo-list/src/composition/use-search.ts diff --git a/packages/ui-vue/components/combo-list/src/combo-list.component.tsx b/packages/ui-vue/components/combo-list/src/combo-list.component.tsx index f4b3151c171..813de74ae35 100644 --- a/packages/ui-vue/components/combo-list/src/combo-list.component.tsx +++ b/packages/ui-vue/components/combo-list/src/combo-list.component.tsx @@ -135,6 +135,7 @@ export default defineComponent({ multiSelect={props.multiSelect} enableSearch={enableSearch.value} maxHeight={props.maxHeight} + enableHighlightSearch={props.enableHighlightSearch} width={props.fitEditor ? comboEditorWidth.value : undefined} onSelectionChange={onSelectionChange}> diff --git a/packages/ui-vue/components/combo-list/src/combo-list.props.ts b/packages/ui-vue/components/combo-list/src/combo-list.props.ts index cf505c4bcc3..82b3e9e3b11 100644 --- a/packages/ui-vue/components/combo-list/src/combo-list.props.ts +++ b/packages/ui-vue/components/combo-list/src/combo-list.props.ts @@ -217,7 +217,13 @@ export const comboListProps = { /** * 打开前 */ - beforeOpen: { type: Function as PropType, default: null } + beforeOpen: { type: Function as PropType, default: null }, + searchOption: { + type: Object as + PropType<((searchText: string, option: any) => boolean)>, default: false + }, + // 搜索启用高亮 + enableHighlightSearch: { type: Boolean, default: true }, } as Record; diff --git a/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx b/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx index 57c08469e93..4d6147b0428 100644 --- a/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx +++ b/packages/ui-vue/components/combo-list/src/components/list-container.component.tsx @@ -22,6 +22,7 @@ export default defineComponent({ props: listContainerProps, emits: ['selectionChange'], setup(props: ListContainerProps, context) { + const listViewRef = ref(); const dataSource = ref(props.dataSource); const selections = ref([]); const separator = ref(props.separator); @@ -55,6 +56,22 @@ export default defineComponent({ context.emit('selectionChange', selections.value); } + function onAfterSearch(text: string) { + // 如果启用高亮查询，不启用筛选 + if (props.enableHighlightSearch) { + return; + } + let dataResult: any[] = []; + if (typeof props.searchOption === 'function') { + dataResult = dataSource.value.filter(dataItem => props.searchOption(text, dataItem)); + } else { + dataResult = dataSource.value.filter(dataItem => dataItem[props.valueField].indexOf(text) > -1 || + dataItem[props.textField].indexOf(text) > -1); + } + + listViewRef.value.updateDataSource(dataResult); + } + watch( [() => props.selectedValues], ([newSelectedValues]) => { @@ -66,6 +83,7 @@ export default defineComponent({
diff --git a/packages/ui-vue/components/combo-list/src/components/list-container.props.ts b/packages/ui-vue/components/combo-list/src/components/list-container.props.ts index 2a3fc6e6885..87af9744e29 100644 --- a/packages/ui-vue/components/combo-list/src/components/list-container.props.ts +++ b/packages/ui-vue/components/combo-list/src/components/list-container.props.ts @@ -1,4 +1,4 @@ -import { ExtractPropTypes } from "vue"; +import { ExtractPropTypes, PropType } from "vue"; import { Option } from '../combo-list.props'; export const listContainerProps = { @@ -25,6 +25,12 @@ export const listContainerProps = { valueField: { type: String, default: 'id' }, /** 值变化事件 */ - onSelectionChange: { type: Function, default: () => { } } + onSelectionChange: { type: Function, default: () => { } }, + searchOption: { + type: Object as + PropType<((searchText: string, option: any) => boolean)>, default: false + }, + // 搜索启用高亮 + enableHighlightSearch: { type: Boolean, default: true }, }; export type ListContainerProps = ExtractPropTypes; diff --git a/packages/ui-vue/components/combo-list/src/composition/use-search.ts b/packages/ui-vue/components/combo-list/src/composition/use-search.ts new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/ui-vue/components/list-view/src/components/header/search-header.component.tsx b/packages/ui-vue/components/list-view/src/components/header/search-header.component.tsx index 3e464e0d8fc..0885556aa4d 100644 --- a/packages/ui-vue/components/list-view/src/components/header/search-header.component.tsx +++ b/packages/ui-vue/components/list-view/src/components/header/search-header.component.tsx @@ -18,7 +18,10 @@ export default function ( } watch(searchValue, (searchingText: string) => { - useSearchComposition.search(searchingText); + if(props.enableHighlightSearch){ + useSearchComposition.search(searchingText); + } + context.emit('afterSearch',searchingText); }); const searchFormGroupClass = computed(() => { diff --git a/packages/ui-vue/components/list-view/src/composition/use-search.ts b/packages/ui-vue/components/list-view/src/composition/use-search.ts index 440f5a676ad..21aaa41dead 100644 --- a/packages/ui-vue/components/list-view/src/composition/use-search.ts +++ b/packages/ui-vue/components/list-view/src/composition/use-search.ts @@ -5,7 +5,7 @@ declare const Highlight: any; export function useSearch( props: ListViewProps, - searchingTargetRef: Ref + searchingTargetRef: Ref, ) { function extractTextNodes(treeWalker: TreeWalker): Node[] { diff --git a/packages/ui-vue/components/list-view/src/list-view.component.tsx b/packages/ui-vue/components/list-view/src/list-view.component.tsx index 3164f56d124..36772701aeb 100644 --- a/packages/ui-vue/components/list-view/src/list-view.component.tsx +++ b/packages/ui-vue/components/list-view/src/list-view.component.tsx @@ -29,7 +29,8 @@ import getSearchHeader from './components/header/search-header.component'; export default defineComponent({ name: 'FListView', props: listViewProps, - emits: ['checkValuesChange', 'clickItem', 'selectionChange', 'removeItem', 'change', 'activeChange'] as (string[] & ThisType) | undefined, + emits: ['afterSearch', 'checkValuesChange', 'clickItem', + 'selectionChange', 'removeItem', 'change', 'activeChange'] as (string[] & ThisType) | undefined, setup(props: ListViewProps, context: SetupContext) { const listViewContentRef = ref(); const enablePagination = ref(true); @@ -43,9 +44,9 @@ export default defineComponent({ const useHierarchyCompostion = useHierarchy(props as DataViewOptions); const useGroupDataComposition = useGroupData(props as DataViewOptions, useIdentifyComposition); const usePaginationComposition = usePagination(props as DataViewOptions); - const dataView = useDataView(props as DataViewOptions, new Map(), useHierarchyCompostion, useIdentifyComposition,usePaginationComposition); + const dataView = useDataView(props as DataViewOptions, new Map(), useHierarchyCompostion, useIdentifyComposition, usePaginationComposition); const useSelectionComposition = useSelection(props as DataViewOptions, dataView, useIdentifyComposition, visibleDatas, context); - const useSearchComposition = useSearch(props, listViewContentRef); + const useSearchComposition = useSearch(props, listViewContentRef, visibleDatas); const visibleCapacity = computed(() => { return dataView.dataView.value.length; diff --git a/packages/ui-vue/components/list-view/src/list-view.props.ts b/packages/ui-vue/components/list-view/src/list-view.props.ts index 8780d827d2f..fabec0111bd 100644 --- a/packages/ui-vue/components/list-view/src/list-view.props.ts +++ b/packages/ui-vue/components/list-view/src/list-view.props.ts @@ -66,7 +66,9 @@ export const listViewProps = { } }, keepOrder: { type: Boolean, default: false }, - disableField: { type: String, default: 'disabled' } + disableField: { type: String, default: 'disabled' }, + // 搜索启用高亮 + enableHighlightSearch: { type: Boolean, default: true }, } as Record; export type ListViewProps = ExtractPropTypes; diff --git a/packages/ui-vue/demos/combo-list/search.vue b/packages/ui-vue/demos/combo-list/search.vue index fff79764ff2..d04e2954a37 100644 --- a/packages/ui-vue/demos/combo-list/search.vue +++ b/packages/ui-vue/demos/combo-list/search.vue @@ -23,9 +23,26 @@ for (let index = 0; index < 15; index++) {
- +
- + +
+
+
+
+
+
+
+ +
+
-- Gitee From 0cf3559bb086e1d733fe71b223151004a292c213 Mon Sep 17 00:00:00 2001 From: huyuyang Date: Thu, 28 Nov 2024 19:28:29 +0800 Subject: [PATCH 009/251] =?UTF-8?q?fix:=20data-grid=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E7=BC=96=E8=BE=91=E6=94=AF=E6=8C=81=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../date-picker-container.component.tsx | 8 ++-- packages/ui-vue/demos/data-grid/cell_edit.vue | 48 +++++++++++-------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx index 2214ad03dcc..34134a3bee9 100644 --- a/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx +++ b/packages/ui-vue/components/date-picker/src/components/date-picker-container/date-picker-container.component.tsx @@ -404,7 +404,7 @@ export default defineComponent({ selectedDate.value = currentDate; // 赋值时间 const dateAndTimeFormatList = valueFormat.value.split(' '); - const timeFormat = dateAndTimeFormatList[1]; + const timeFormat = dateAndTimeFormatList || 'HH:mm:ss'; const convertedDate = convertToDate(timeValue.value, timeFormat); if (selectedDate.value) { selectedDate.value.hour = convertedDate?.getHours() || 0; @@ -589,7 +589,7 @@ export default defineComponent({ function formatDate() { if (timeValue.value) { const dateAndTimeFormatList = valueFormat.value.split(' '); - const timeFormat = dateAndTimeFormatList[1]; + const timeFormat = dateAndTimeFormatList[1] || 'HH:mm:ss'; const convertedDate = convertToDate(timeValue.value, timeFormat); timeValue.value = convertToString(convertedDate, timeFormat); } @@ -598,7 +598,7 @@ export default defineComponent({ onMounted(() => { if (props.showTime) { const dateAndTimeFormatList = valueFormat.value.split(' '); - const timeFormat = dateAndTimeFormatList[1]; + const timeFormat = dateAndTimeFormatList[1] || 'HH:mm:ss'; timeValue.value = formatTo(dateValue.value, timeFormat); formatDate(); } @@ -607,7 +607,7 @@ export default defineComponent({ const onValueChangeHandler = (textValue: TimeValueText) => { timeValue.value = textValue.text; const dateAndTimeFormatList = valueFormat.value.split(' '); - const timeFormat = dateAndTimeFormatList[1]; + const timeFormat = dateAndTimeFormatList[1] || 'HH:mm:ss'; const convertedDate = convertToDate(timeValue.value, timeFormat); if (selectedDate.value) { selectedDate.value.hour = convertedDate?.getHours() || 0; diff --git a/packages/ui-vue/demos/data-grid/cell_edit.vue b/packages/ui-vue/demos/data-grid/cell_edit.vue index 6fc04a74937..645b09849ee 100644 --- a/packages/ui-vue/demos/data-grid/cell_edit.vue +++ b/packages/ui-vue/demos/data-grid/cell_edit.vue @@ -1,26 +1,35 @@