diff --git a/packages/core/client/src/locale/en_US.ts b/packages/core/client/src/locale/en_US.ts index 6793594197..7d1d9e6a05 100644 --- a/packages/core/client/src/locale/en_US.ts +++ b/packages/core/client/src/locale/en_US.ts @@ -87,7 +87,7 @@ export default { "Gantt":"Gantt", "Create gantt block":"Create gantt block", "Progress field":"Progress field", - "Time range":"Time range", + "Time scale":"Time scale", "Hour":"Hour", "Quarter of day":"Quarter of day", "Half of day":"Half of day", diff --git a/packages/core/client/src/locale/ja_JP.ts b/packages/core/client/src/locale/ja_JP.ts index a63d567591..69f9518365 100644 --- a/packages/core/client/src/locale/ja_JP.ts +++ b/packages/core/client/src/locale/ja_JP.ts @@ -85,7 +85,7 @@ export default { "Gantt":"ガント図", "Create gantt block":"ガントチャートブロックの作成", "Progress field":"進捗フィールド", - "Time range":"時間スケールレベル", + "Time scale":"時間スケールレベル", "Hour":"時間", "Quarter of day":"四分の一日", "Half of day":"半日", diff --git a/packages/core/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts index 44945bc798..070cd76500 100644 --- a/packages/core/client/src/locale/zh_CN.ts +++ b/packages/core/client/src/locale/zh_CN.ts @@ -97,7 +97,7 @@ export default { "Gantt":"甘特图", "Create gantt block":"创建甘特图区块", "Progress field":"进度字段", - "Time range":"时间缩放等级", + "Time scale":"时间缩放等级", "Hour":"小时", "Quarter of day":"四分之一天", "Half of day":"半天", diff --git a/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx b/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx index 9568c1d566..29bd746272 100644 --- a/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx @@ -60,7 +60,7 @@ export const GanttDesigner = () => { }} /> { export const Gantt: any = (props: any) => { const { designable } = useDesignable(); const { - headerHeight = designable ? 65 : 55, + headerHeight = designable ? 64 : 55, listCellWidth = '155px', - rowHeight = 55, + rowHeight = 55.56, ganttHeight = 0, preStepsCount = 1, locale = 'en-GB', diff --git a/packages/core/client/src/schema-component/antd/gantt/components/gantt/style.tsx b/packages/core/client/src/schema-component/antd/gantt/components/gantt/style.tsx index 69e5f35273..dbae9b1ac1 100644 --- a/packages/core/client/src/schema-component/antd/gantt/components/gantt/style.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/components/gantt/style.tsx @@ -6,7 +6,8 @@ export const ganttVerticalContainer=css ` font-size: 0; margin: 0; padding: 0; - width:100% + width:100%; + border-left:2px solid #c5c4c4 ` export const horizontalContainer=css ` diff --git a/packages/core/client/src/schema-component/antd/gantt/components/grid/style.tsx b/packages/core/client/src/schema-component/antd/gantt/components/grid/style.tsx index 8f7d88074a..08430afed7 100644 --- a/packages/core/client/src/schema-component/antd/gantt/components/grid/style.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/components/grid/style.tsx @@ -8,6 +8,8 @@ export const gridRow = css` export const gridRowLine = css` stroke: #f0f0f0; + stroke-width:1; + border-bottom: 1px solid #f0f0f0; `; export const gridTick = css` diff --git a/packages/core/client/src/schema-initializer/items/GanttBlockInitializer.tsx b/packages/core/client/src/schema-initializer/items/GanttBlockInitializer.tsx index c082bd1060..b8ba1a9f28 100644 --- a/packages/core/client/src/schema-initializer/items/GanttBlockInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/GanttBlockInitializer.tsx @@ -80,7 +80,7 @@ export const GanttBlockInitializer = (props) => { 'x-decorator': 'FormItem', }, range: { - title: t('Time range'), + title: t('Time scale'), enum: [ { label: '{{t("Hour")}}', value: 'hour', color: 'orange' }, { label: '{{t("Quarter of day")}}', value: 'quarterDay', color: 'default' },