diff --git a/packages/ui-vue/components/data-grid/src/locales/ui/en.json b/packages/ui-vue/components/data-grid/src/locales/ui/en.json index 4d7df3b068a82f0d48ea41f325737df2f9ce2fd1..9a0b353b4183a4348f7fca8a7444f34c607134a1 100644 --- a/packages/ui-vue/components/data-grid/src/locales/ui/en.json +++ b/packages/ui-vue/components/data-grid/src/locales/ui/en.json @@ -48,7 +48,7 @@ "sixMonths": "Six Months" }, "settings": { - "visible": "Visible", + "visible": "Display Columns", "sortting": "Sortting", "title": "Column Settings", "canchoose": "Can choose", diff --git a/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHS.json b/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHS.json index c56a492be6e0d81a5bf3f19d30254153e15b97dd..9066c3393e6cb723fab5a5410539f61953c9a8d5 100644 --- a/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHS.json +++ b/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHS.json @@ -112,7 +112,11 @@ }, "loadingMessage": "正在加载", "commandColumn": { - "title": "操作" + "title": "操作", + "edit": "编辑", + "remove": "删除", + "cancel": "取消", + "accept": "确定" } } } \ No newline at end of file diff --git a/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHT.json b/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHT.json index 8261233be9827f766d8e1fec588e2a93525aae22..39ecc8c2cbb8ed6ec3c73339addc32943edf80b3 100644 --- a/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHT.json +++ b/packages/ui-vue/components/data-grid/src/locales/ui/zh-CHT.json @@ -112,7 +112,11 @@ }, "loadingMessage": "正在載入", "commandColumn": { - "title": "操作" + "title": "操作", + "edit": "編輯", + "remove": "刪除", + "cancel": "取消", + "accept": "確定" } } } \ No newline at end of file diff --git a/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx b/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx index 85ea75548736cf54837b235fc5cd1c5c2db066ab..561477f17868feadcff75595bed73aa4e42ae01f 100644 --- a/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx +++ b/packages/ui-vue/components/data-view/components/column-setting/column-setting-icon.component.tsx @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { useI18n } from 'vue-i18n'; import { DataViewOptions, UseColumn, UseDataView, UseFilter, UseFitColumn, UseSort, UseVirtualScroll } from '../../composition/types'; import { F_MODAL_SERVICE_TOKEN, FModalService } from '@farris/ui-vue/components/modal'; import getDataGridSettingsRender from './column-setting.component'; @@ -30,6 +31,7 @@ export default function ( useVirtualScrollComposition: UseVirtualScroll ) { const modalService = inject(F_MODAL_SERVICE_TOKEN) as any; + const vueI18nComposition = useI18n(); function onClickColumnHandler(payload: MouseEvent) { const { openSettingPanel @@ -43,7 +45,8 @@ export default function ( useFitColumnComposition, useSorterComposition, useVirtualScrollComposition, - modalService + modalService, + vueI18nComposition ); openSettingPanel(); } diff --git a/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx b/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx index a419bae5e30ab36a5f51b4e23baa8df1241fc1fa..473b726bfa1bd11d1853961aa0fb186aab266ce0 100644 --- a/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx +++ b/packages/ui-vue/components/data-view/components/column-setting/column-setting.component.tsx @@ -1,4 +1,3 @@ -import { useI18n } from 'vue-i18n'; import { cloneDeep } from 'lodash-es'; import FTransfer from '@farris/ui-vue/components/transfer'; import FTabs, { FTabPage } from '@farris/ui-vue/components/tabs'; @@ -22,9 +21,9 @@ export default function ( useFitColumnComposition: UseFitColumn, useSorterComposition: UseSort, useVirtualScrollComposition: UseVirtualScroll, - modalService: any + modalService: any, + vueI18nComposition: any ) { - const { t: getLocaleValue } = useI18n(); const identifyField = 'id'; const conditionListRef = ref(); let modalInstance: any; @@ -141,12 +140,12 @@ export default function ( headerPrefix: () => ( ), default: () => [ - + column.dataType !== 'commands') .filter((column: DataColumn) => column.visible).length || 1); @@ -122,7 +122,7 @@ export function useFitColumn( visibleColumn.actualWidth = columnWidth; context.value.primaryColumnsWidth += visibleColumn.actualWidth; }); - context.value.primaryColumnsWidth += 120; + context.value.primaryColumnsWidth += 150; } }