plain-design 1.0.0-beta.49 → 1.0.0-beta.50

package/src/packages/components/Form/types/string.tsx

@@ -22,7 +22,7 @@ export function checkStringValidation(
   );
 
   if (!isEmpty && typeof value != "string" && typeof value != "number") {
-    return getMessage(i18n('base.validate.valueShouldBeStringOrNumber').d('值类型应该为字符串或者数字'));
+    return getMessage(i18n.$it('base.validate.valueShouldBeStringOrNumber').d('值类型应该为字符串或者数字'));
   }
 
   if (!isEmpty) {if (typeof value === "number") {value = String(value);}}
@@ -30,7 +30,7 @@ export function checkStringValidation(
   /*any值的必填校验*/
   if (required) {
     if (isEmpty) {
-      return getMessage(i18n('base.validate.require').d('必填'));
+      return getMessage(i18n.$it('base.validate.require').d('必填'));
     }
   }
 
@@ -41,28 +41,28 @@ export function checkStringValidation(
   if (!isEmpty && !!patterns.length) {
     const failPattern = patterns.find((i) => !i!.test(String(value)));
     if (!!failPattern) {
-      return getMessage(config?.patternMessage || `${i18n('base.validate.notMatchPattern').d('不符合表达式')}：${failPattern.source}`);
+      return getMessage(config?.patternMessage || `${i18n.$it('base.validate.notMatchPattern').d('不符合表达式')}：${failPattern.source}`);
     }
   }
 
   /*最小值*/
   if (rule.min != null && !isEmpty && value.length < rule.min) {
-    return getMessage(i18n('base.validate.minimunCharacters', { num: rule.min }).d(`最少${rule.min}个字符`));
+    return getMessage(i18n.$it('base.validate.minimunCharacters', { num: rule.min }).d(`最少${rule.min}个字符`));
   }
   /*最大值*/
   if (rule.max != null && !isEmpty && value.length > rule.max) {
-    return getMessage(i18n('base.validate.maximunCharacters', { num: rule.max }).d(`最多${rule.max}个字符`));
+    return getMessage(i18n.$it('base.validate.maximunCharacters', { num: rule.max }).d(`最多${rule.max}个字符`));
   }
   /*固定长度*/
   if (rule.len != null && !isEmpty && value.length !== rule.len) {
-    return getMessage(i18n('base.validate.fixedCharacters', { num: rule.len }).d(`固定${rule.len}个字符`));
+    return getMessage(i18n.$it('base.validate.fixedCharacters', { num: rule.len }).d(`固定${rule.len}个字符`));
   }
 
   /*枚举范围（取值范围）*/
   const _enum = rule.enum;
   if (_enum && !isEmpty) {
     if (toArray(value).some(i => _enum.indexOf(i) === -1)) {
-      return getMessage(i18n('base.validate.outOfRange', { value, range: _enum }).d(`值${value}超出了范围${_enum}`));
+      return getMessage(i18n.$it('base.validate.outOfRange', { value, range: _enum }).d(`值${value}超出了范围${_enum}`));
     }
   }
 }

package/src/packages/components/Formatter/index.tsx

@@ -48,7 +48,7 @@ export const Formatter: Record<string, undefined | ((...args: any[]) => string |
   cny: (value: string | number | null | undefined) => {
     if (value == null || value === 0) {return `¥0`;}
     value = Number(value);
-    if (isNaN(value)) {return i18n('base.invalidAmount').d('无效金额');}
+    if (isNaN(value)) {return i18n.$it('base.invalidAmount').d('无效金额');}
     return `¥ ${Formatter.money!(value)}`;
   },
   /**

package/src/packages/components/Image/index.tsx

@@ -125,9 +125,9 @@ export const Image = designComponent({
     });
 
     const tip = {
-      [eImageStatus.empty]: i18n('image.noPicture').d('无图片'),
-      [eImageStatus.pending]: i18n('base.loading').d('加载中'),
-      [eImageStatus.error]: i18n('base.loadFailed').d('加载失败'),
+      [eImageStatus.empty]: i18n.$it('image.noPicture').d('无图片'),
+      [eImageStatus.pending]: i18n.$it('base.loading').d('加载中'),
+      [eImageStatus.error]: i18n.$it('base.loadFailed').d('加载失败'),
     };
 
     const handler = {

package/src/packages/components/ImageUploader/index.tsx

@@ -201,11 +201,11 @@ export const ImageUploader = designComponent({
           )}
           {state.status === eImageUploaderStatus.empty && <div className="image-uploader-empty" onClick={handler.onClick}>
             <Icon icon="pi-image"/>
-            <span>{i18n('file.toBeUpload').d('待上传')}</span>
+            <span>{i18n.$it('file.toBeUpload').d('待上传')}</span>
           </div>}
           {state.status === eImageUploaderStatus.fail && <div className="image-uploader-fail" onClick={handler.onClick}>
             <Icon icon="pi-image-close"/>
-            <span>{i18n('file.uploadFailed').d('上传失败')}</span>
+            <span>{i18n.$it('file.uploadFailed').d('上传失败')}</span>
           </div>}
           <div className="image-uploader-button-group">
             <div className="image-uploader-button" onClick={handler.onClick}>

package/src/packages/components/Object/createObjectRender.multiple.tsx

@@ -241,7 +241,7 @@ export function createObjectRenderMultiple(
       /*禁用select的输入筛选，让select不处理搜索关键词避免隐藏部分option选项*/
       disableFilter: true,
       /*没有关键词的时候，提示输入关键词，已经有关键词并且没有选项的情况下提示placeholder*/
-      noDataLabel: !inputHandler.state.multipleText && state.option == null ? (props.searchPlaceholder || i18n('table.pleaseEnterSearchKey').d('请输入搜索关键词')) : undefined
+      noDataLabel: !inputHandler.state.multipleText && state.option == null ? (props.searchPlaceholder || i18n.$it('table.pleaseEnterSearchKey').d('请输入搜索关键词')) : undefined
     }));
     return { state, popperAttrs, onSelectChange, selectAttrs, reset };
 

package/src/packages/components/Object/createObjectRender.single.tsx

@@ -163,7 +163,7 @@ export function createObjectRenderSingle(
       /*禁用select的输入筛选，让select不处理搜索关键词避免隐藏部分option选项*/
       disableFilter: true,
       /*没有关键词的时候，提示输入关键词，已经有关键词并且没有选项的情况下提示placeholder*/
-      noDataLabel: !inputHandler.state.inputValue && state.option == null ? (props.searchPlaceholder || i18n('table.pleaseEnterSearchKey').d('请输入搜索关键词')) : undefined
+      noDataLabel: !inputHandler.state.inputValue && state.option == null ? (props.searchPlaceholder || i18n.$it('table.pleaseEnterSearchKey').d('请输入搜索关键词')) : undefined
     }));
     return { state, popperAttrs, onSelectChange, selectAttrs };
   })();

package/src/packages/components/PageThemeUtils/deepmerge.ts

@@ -0,0 +1,21 @@
+export function deepmerge(...list: any[]): any {
+  list = list.filter(i => i != null);
+  if (!list.length || list.length == 1) {
+    return list[0];
+  }
+  let result: any = {};
+  list.forEach((item) => {
+    for (let key in item) {
+      if (typeof item[key] !== "object") {
+        result[key] = item[key];
+      } else {
+        if (result[key] == undefined) {
+          result[key] = item[key];
+        } else {
+          result[key] = deepmerge(result[key], item[key]);
+        }
+      }
+    }
+  });
+  return result;
+}

package/src/packages/components/PageThemeUtils/index.tsx

@@ -3,6 +3,9 @@ import {createCache} from "../../utils/createCache";
 import {InputMode, ThemeMode, ThemeShape, ThemeSize} from "../../uses/useStyle";
 import {DeepPartial} from "../../utils/type";
 import {iApplicationConfiguration} from "../Application/utils/application.utils";
+import {iThemeConfiguration} from "../Application/theme/theme";
+import {deepmerge} from "./deepmerge";
+import {PlainObject} from "plain-utils/utils/event";
 
 export const PageThemeUtils = (() => {
 
@@ -34,41 +37,19 @@ export const PageThemeUtils = (() => {
 
     config.theme.dark = !!dark;
 
-    if (!!primaryKey) {
-      if (dark && primaryKey === 'dark') {
-        primaryKey = 'white';
-      } else if (!dark && primaryKey === 'light') {
-        primaryKey = 'dark';
+    const themeConfig = !primaryKey ? undefined : ((): DeepPartial<Omit<iThemeConfiguration, 'dark'>> | undefined => {
+      let themeConfig = ThemePrimaryColors[primaryKey]?.themeConfig;
+      if (themeConfig == undefined) {return undefined;}
+      if (typeof themeConfig === "string") {
+        return {
+          base: { primary: themeConfig }
+        };
+      } else {
+        return themeConfig[dark ? 'dark' : 'light'];
       }
-    }
-
-    config.theme.base.primary = !primaryKey ? undefined : ThemePrimaryColors[primaryKey]?.primary;
-
-    if (primaryKey === 'dark') {
-      Object.assign(config.theme.vars!, {
-        'primary-light-1': '#f2f3f5',
-        'primary-1': '#f2f3f5',
-        'primary-light-2': '#e1e2e7',
-        'primary-2': '#e1e2e7',
-        'primary-light-3': '#c9cdd4',
-        'primary-3': '#c9cdd4',
-        'primary-light-4': '#a9aeb8',
-        'primary-4': '#a9aeb8',
-        'primary-light-5': '#86909c',
-        'primary-5': '#86909c',
-        'primary-light-6': '#0c0e10',
-        'primary-6': '#0b0b0b',
-        'primary-light-7': '#464f5e',
-        'primary-7': '#464f5e',
-        'primary-light-8': '#272e3b',
-        'primary-8': '#272e3b',
-        'primary-light-9': '#1d2129',
-        'primary-9': '#111318',
-        'primary-light-10': '#0c0e10',
-        'primary-10': '#0b0b0b',
-      });
-    }
+    })();
 
+    config.theme = deepmerge(config.theme, themeConfig) as PlainObject;
 
     if (!config.default) {
       config.default = {};
@@ -78,11 +59,11 @@ export const PageThemeUtils = (() => {
     }
     if (!!shape) {
       config.default.shape = shape;
-      if (!config.theme.vars) {
-        config.theme.vars = {};
+      if (!config.theme!.vars) {
+        config.theme!.vars = {};
       }
       if (shape === 'square') {
-        Object.assign(config.theme.vars, {
+        Object.assign(config.theme!.vars, {
           'box-size-mini-border-radius': '2px',
           'box-size-small-border-radius': '2px',
           'box-size-normal-border-radius': '4px',
@@ -90,7 +71,7 @@ export const PageThemeUtils = (() => {
         });
       }
       if (shape === 'none') {
-        Object.assign(config.theme.vars, {
+        Object.assign(config.theme!.vars, {
           'box-size-mini-border-radius': '0',
           'box-size-small-border-radius': '0',
           'box-size-normal-border-radius': '0',
@@ -161,22 +142,96 @@ export const PageThemeUtils = (() => {
   };
 })();
 
-export const ThemePrimaryColors: Record<string, { label: string, primary: string | undefined } | undefined> = {
-  default: { label: '默认主题', primary: undefined, },
-  dustRed: { label: '薄暮', primary: '#f5222d', },
-  volcano: { label: '火山', primary: '#fa541c', },
-  subset: { label: '日暮', primary: '#fa8c16', },
-  gold: { label: '金盏花', primary: '#faad14', },
-  sunrise: { label: '日出', primary: '#fadb14', },
-  lime: { label: '青柠', primary: '#a0d911', },
-  polar: { label: '极光绿', primary: '#52c41a', },
-  cyan: { label: '明青', primary: '#13c2c2', },
-  daybreak: { label: '拂晓蓝', primary: '#1677ff', },
-  geek: { label: '极客蓝', primary: '#2f54eb', },
-  purple: { label: '酱紫', primary: '#722ed1', },
-  magenta: { label: '洋红', primary: '#eb2f96', },
-  light: { label: '极昼', primary: '#ffffff', },
-  dark: { label: '黑夜', primary: '#000000', },
+export const ThemePrimaryColors: Record<string, {
+  label: string,
+  themeConfig: {
+    dark: DeepPartial<Omit<iThemeConfiguration, 'dark'>>,
+    light: DeepPartial<Omit<iThemeConfiguration, 'dark'>>
+  } | undefined | string
+} | undefined> = {
+  default: { label: '默认主题', themeConfig: undefined, },
+  dustRed: {
+    label: '薄暮', themeConfig: '#f5222d'
+  },
+  volcano: {
+    label: '火山', themeConfig: '#fa541c'
+  },
+  subset: {
+    label: '日暮', themeConfig: '#fa8c16'
+  },
+  gold: {
+    label: '金盏花', themeConfig: '#faad14'
+  },
+  sunrise: {
+    label: '日出', themeConfig: '#fadb14'
+  },
+  lime: {
+    label: '青柠', themeConfig: '#a0d911'
+  },
+  polar: {
+    label: '极光绿', themeConfig: '#42b883'
+  },
+  cyan: {
+    label: '明青', themeConfig: '#13c2c2'
+  },
+  daybreak: {
+    label: '拂晓蓝', themeConfig: '#1677ff'
+  },
+  geek: {
+    label: '极客蓝', themeConfig: '#2f54eb'
+  },
+  purple: {
+    label: '酱紫', themeConfig: {
+      dark: {
+        base: { primary: '#7643ff', }
+      },
+      light: {
+        base: { primary: '#6a00ff', }
+      },
+    }
+  },
+  magenta: {
+    label: '洋红', themeConfig: {
+      dark: {
+        base: { primary: '#eb2f96', }
+      },
+      light: {
+        base: { primary: '#d90178', }
+      },
+    }
+  },
+  dark: {
+    label: '极夜', themeConfig: {
+      dark: {
+        base: { primary: '#FFFFFF', },
+      },
+      light: {
+        base: { primary: '#000000', },
+        vars: {
+          'primary-light-1': '#f2f3f5',
+          'primary-1': '#f2f3f5',
+          'primary-light-2': '#e1e2e7',
+          'primary-2': '#e1e2e7',
+          'primary-light-3': '#c9cdd4',
+          'primary-3': '#c9cdd4',
+          'primary-light-4': '#a9aeb8',
+          'primary-4': '#a9aeb8',
+          'primary-light-5': '#86909c',
+          'primary-5': '#86909c',
+          'primary-light-6': '#0c0e10',
+          'primary-6': '#0b0b0b',
+          'primary-light-7': '#464f5e',
+          'primary-7': '#464f5e',
+          'primary-light-8': '#272e3b',
+          'primary-8': '#272e3b',
+          'primary-light-9': '#1d2129',
+          'primary-9': '#111318',
+          'primary-light-10': '#0c0e10',
+          'primary-10': '#0b0b0b',
+        }
+      },
+    }
+  },
 };
 
 export default PageThemeUtils;

package/src/packages/components/Pagination/index.tsx

@@ -252,7 +252,7 @@ export const Pagination = designComponent({
             onChange={emit.onSizeChange as any}
           >
             {(props.pageSizes || []).map((item) => (
-              <SelectOption label={i18n('table.rowPerPage', { num: item }).d(`${item} 条/页`)} val={item} key={item}/>
+              <SelectOption label={i18n.$it('table.rowPerPage', { num: item }).d(`${item} 条/页`)} val={item} key={item}/>
             ))}
           </Select>
         );
@@ -270,8 +270,8 @@ export const Pagination = designComponent({
               onEnter={handler.onJumperChange}
             >
               {{
-                prefix: () => <span style={{ whiteSpace: 'nowrap' }}>{i18n('base.go').d('前往')}</span>,
-                suffix: () => <span>{i18n('base.page').d('页')}</span>,
+                prefix: () => <span style={{ whiteSpace: 'nowrap' }}>{i18n.$it('base.go').d('前往')}</span>,
+                suffix: () => <span>{i18n.$it('base.page').d('页')}</span>,
               }}
             </InputNumber>
           </div>
@@ -303,7 +303,7 @@ export const Pagination = designComponent({
         );
 
         const blank = (<div className="pagination-blank" key="blank"/>);
-        const total = props.total == null ? null : (<div className="pagination-total" key="total"><span>{i18n('base.totalPage', { total: props.total }).d(`总共${props.total}条数据`)}</span></div>);
+        const total = props.total == null ? null : (<div className="pagination-total" key="total"><span>{i18n.$it('base.totalPage', { total: props.total }).d(`总共${props.total}条数据`)}</span></div>);
         const slot = !slots.default.isExist() ? null : (<div className="pagination-slot" key="slot">{slots.default()}</div>);
         const loading = !editComputed.value.loading ? null : (
           <div className="pagination-loading" key="loading">

package/src/packages/components/Select/SelectPanel.tsx

@@ -46,7 +46,7 @@ export const SelectPanel = designComponent({
           content = slots.loadingContent(
             <div className="select-panel-loading">
               <Loading type="delta"/>
-              <span>{i18n('base.loading').d('加载中')}</span>
+              <span>{i18n.$it('base.loading').d('加载中')}</span>
             </div>
           );
         } else if (props.dataLength === 0) {

package/src/packages/components/Select/createMultipleSelectRender.tsx

@@ -83,11 +83,11 @@ export function createMultipleSelectRender(params: iSelectCompositionParams) {
         <>
           {editComputed.value.editable && (
             <div className="select-panel-header">
-              {/*<Button onClick={handler.handleCheckAll} size="mini">{i18n('base.select.all').d('全选')}</Button>
-              <Button onClick={handler.handleUncheckALl} size="mini">{i18n('base.clear').d('清空')}</Button>
-              <Button onClick={handler.handleCheckReverse} size="mini">{i18n('base.select.reverse').d('反选')}</Button>*/}
+              {/*<Button onClick={handler.handleCheckAll} size="mini">{i18n.$it('base.select.all').d('全选')}</Button>
+              <Button onClick={handler.handleUncheckALl} size="mini">{i18n.$it('base.clear').d('清空')}</Button>
+              <Button onClick={handler.handleCheckReverse} size="mini">{i18n.$it('base.select.reverse').d('反选')}</Button>*/}
               <Checkbox checkStatus={checkStatus} customReadonly label={
-                checkStatus !== CheckboxStatus.check ? i18n('base.select.all').d('全选') : i18n('base.clear').d('清空')
+                checkStatus !== CheckboxStatus.check ? i18n.$it('base.select.all').d('全选') : i18n.$it('base.clear').d('清空')
               } onClick={() => {
                 checkStatus !== CheckboxStatus.check ? handler.handleCheckAll() : handler.handleUncheckALl();
               }}/>

package/src/packages/components/Table/editor/PlcAddress.tsx

@@ -11,11 +11,11 @@ export const PlcAddress = designComponent({
     types: { type: String, default: 'pcd' },
     service: { type: Object as PropType<iAddressService> },
 
-    provinceTitle: { type: String, default: () => i18n('base.province').d('省') },
+    provinceTitle: { type: String, default: () => i18n.$it('base.province').d('省') },
     provinceField: { type: String, default: 'province' },
-    cityTitle: { type: String, default: () => i18n('base.city').d('市') },
+    cityTitle: { type: String, default: () => i18n.$it('base.city').d('市') },
     cityField: { type: String, default: 'city' },
-    districtTitle: { type: String, default: () => i18n('base.district').d('区县') },
+    districtTitle: { type: String, default: () => i18n.$it('base.district').d('区县') },
     districtField: { type: String, default: 'district' },
   },
   setup({ props }) {
@@ -37,7 +37,7 @@ export const PlcAddress = designComponent({
             field={props.provinceField}
             province
             editColSpan={props.types.length}
-            formLabel={i18n('base.address').d("地址")}
+            formLabel={i18n.$it('base.address').d("地址")}
             filterType="province"
             filterHandler="like"
             v-slots={{

package/src/packages/components/Table/standard/PlcCheck/PlcCheck.multiple.tsx

@@ -249,11 +249,11 @@ export function usePlcCheckMultiple(
           </Badge>
         ),
         popper: () => <>
-          <DropdownOption label={i18n('base.select.all').d('全选')} icon="pi-select-all" onClick={methods.checkAll}/>
-          <DropdownOption label={i18n('base.clear').d('清空')} icon="pi-menu" onClick={methods.uncheckAll}/>
+          <DropdownOption label={i18n.$it('base.select.all').d('全选')} icon="pi-select-all" onClick={methods.checkAll}/>
+          <DropdownOption label={i18n.$it('base.clear').d('清空')} icon="pi-menu" onClick={methods.uncheckAll}/>
           {!!model.value?.length && <>
-            <DropdownOption label={i18n('base.select.reverse').d('反选')} icon="pi-unordered-list" onClick={methods.reverse}/>
-            {!props.hideShowAllButton && <DropdownOption label={i18n('base.lookUp').d('查看')} icon="pi-ordered-list" onClick={methods.showAll}/>}
+            <DropdownOption label={i18n.$it('base.select.reverse').d('反选')} icon="pi-unordered-list" onClick={methods.reverse}/>
+            {!props.hideShowAllButton && <DropdownOption label={i18n.$it('base.lookUp').d('查看')} icon="pi-ordered-list" onClick={methods.showAll}/>}
           </>}
         </>
       }}

package/src/packages/components/Table/standard/PlcExpand.tsx

@@ -169,8 +169,8 @@ export const PlcExpand = designComponent({
                 </div>
               ),
               popper: () => <>
-                <DropdownOption label={i18n('base.edit.expandAll').d('全部展开')} icon="pi-expand" onClick={methods.expandAll}/>
-                <DropdownOption label={i18n('base.edit.collapseAll').d('全部收起')} icon="pi-shrink" onClick={methods.collapseAll}/>
+                <DropdownOption label={i18n.$it('base.edit.expandAll').d('全部展开')} icon="pi-expand" onClick={methods.expandAll}/>
+                <DropdownOption label={i18n.$it('base.edit.collapseAll').d('全部收起')} icon="pi-shrink" onClick={methods.collapseAll}/>
               </>
             }}
           </Dropdown>

package/src/packages/components/Table/standard/PlcIndex.tsx

@@ -17,7 +17,7 @@ export const PlcIndex = designComponent({
       noFilter: true,
       noSort: true,
     }),
-    summaryText: { type: String, default: () => i18n('base.edit.summary').d('合计') },
+    summaryText: { type: String, default: () => i18n.$it('base.edit.summary').d('合计') },
     start: { type: Number, default: 0 },
   },
   scopeSlots: PlcScopeSlotsOptions,

package/src/packages/components/Table/standard/PlcOperation/OuterOperation.tsx

@@ -166,7 +166,7 @@ export const OuterOperation = designComponent({
                       v-slots={{
                         default: () => (
                           <ButtonGroup>
-                            <Button label={i18n('base.more').d('更多')}/>
+                            <Button label={i18n.$it('base.more').d('更多')}/>
                             <Button icon="pi-down"/>
                           </ButtonGroup>
                         ),

package/src/packages/components/Table/standard/PlcOperation/PlcOperation.tsx

@@ -25,7 +25,7 @@ export const PlcOperation = designComponent({
       width: null as any,
       align: 'left',
       hideInForm: true,
-      title: (() => i18n('base.operation').d('操作')) as any,
+      title: (() => i18n.$it('base.operation').d('操作')) as any,
       noFilter: true,
       noSort: true,
     }),
@@ -305,13 +305,13 @@ export const PlcOperation = designComponent({
                       <Button
                         mode="text"
                         key="save"
-                        label={i18n('base.edit.save').d('保存')}
+                        label={i18n.$it('base.edit.save').d('保存')}
                         onClick={() => event.emit.onClickNodeSaveOperation(node)}
                       />
                       <Button
                         mode="text"
                         key="cancel"
-                        label={i18n('base.cancel').d('取消')}
+                        label={i18n.$it('base.cancel').d('取消')}
                         onClick={() => event.emit.onClickNodeCancelOperation(node)}
                       />
                     </>;
@@ -349,7 +349,7 @@ export const PlcOperation = designComponent({
                               mode="text"
                               key="more"
                             >
-                              <span>{i18n('base.more').d('更多')}</span>
+                              <span>{i18n.$it('base.more').d('更多')}</span>
                               <Icon icon="pi-down"/>
                             </Button>
                           ),

package/src/packages/components/Table/standard/PlcTree/PlcTree.renderNode.tsx

@@ -40,11 +40,11 @@ export function usePlcTreeRenderNode(
   const renderTreeHead = () => (
     <>
       <PlcTreeHeader table={table} buttonStyles={buttonStyles.value} getPlcRefer={getPlcRefer}>
-        <DropdownOption label={i18n('base.edit.expandAll').d('全部展开')} icon="pi-expand" onClick={treeCore.methods.expandAll}/>
-        <DropdownOption label={i18n('base.edit.collapseAll').d('全部收起')} icon="pi-shrink" onClick={treeCore.methods.collapseAll}/>
+        <DropdownOption label={i18n.$it('base.edit.expandAll').d('全部展开')} icon="pi-expand" onClick={treeCore.methods.expandAll}/>
+        <DropdownOption label={i18n.$it('base.edit.collapseAll').d('全部收起')} icon="pi-shrink" onClick={treeCore.methods.collapseAll}/>
         {props.multiple && <>
-          <DropdownOption label={i18n('table.checkAll').d('全部选中')} icon="pi-select-all" onClick={treeCore.methods.checkAll}/>
-          <DropdownOption label={i18n('table.clearAll').d('清空选中')} icon="pi-unordered-list" onClick={treeCore.methods.unCheckAll}/>
+          <DropdownOption label={i18n.$it('table.checkAll').d('全部选中')} icon="pi-select-all" onClick={treeCore.methods.checkAll}/>
+          <DropdownOption label={i18n.$it('table.clearAll').d('清空选中')} icon="pi-unordered-list" onClick={treeCore.methods.unCheckAll}/>
         </>}
       </PlcTreeHeader>
       {props.title}

package/src/packages/components/Table/table/use/useTableFormEditor.tsx

@@ -104,10 +104,10 @@ export function useTableFormEditor(
             return (
               <Dialog
                 v-model={state.show}
-                title={title || i18n('base.edit.edit').d('编辑')}
+                title={title || i18n.$it('base.edit.edit').d('编辑')}
                 confirmButton
                 cancelButton
-                confirmButtonText={i18n('base.edit.save').d('保存')}
+                confirmButtonText={i18n.$it('base.edit.save').d('保存')}
                 handleConfirm={handler.handleConfirm}
                 handleCancel={handler.handleCancel}
                 position="right"

package/src/packages/components/Table/table/use/useTableModifyEditor.tsx

@@ -74,7 +74,7 @@ export function useTableModifyEditor(
   const handler = {
     handleConfirm: async () => {
       if (!state.node) {
-        $message.warn(i18n('table.pleaseClickNext').d('请点击下一步'));
+        $message.warn(i18n.$it('table.pleaseClickNext').d('请点击下一步'));
         return Promise.reject('next step');
       }
       await refs.form?.validate();
@@ -92,10 +92,10 @@ export function useTableModifyEditor(
         <>
           <Table data={availablePlcList.value}>
             <PlcCheck field="index" v-model={state.modifyPlcIndexList} toggleOnClickRow/>
-            <Plc title={i18n('table.columnTitle').d('列标题')} field="title"/>
+            <Plc title={i18n.$it('table.columnTitle').d('列标题')} field="title"/>
           </Table>
           <div className="table-modify-dialog-operations">
-            <Button label={i18n('base.nextStep').d('下一步')} onClick={utils.renderModifyForm}/>
+            <Button label={i18n.$it('base.nextStep').d('下一步')} onClick={utils.renderModifyForm}/>
           </div>
         </>
       );
@@ -133,8 +133,8 @@ export function useTableModifyEditor(
             })}
           </Form>
           <div className="table-modify-dialog-operations">
-            <Button label={i18n('base.prevStep').d('上一步')} onClick={utils.renderSelectPlcList}/>
-            <Button label={i18n('base.edit.done').d('完成')} mode="fill" onClick={handler.handleConfirm}/>
+            <Button label={i18n.$it('base.prevStep').d('上一步')} onClick={utils.renderSelectPlcList}/>
+            <Button label={i18n.$it('base.edit.done').d('完成')} mode="fill" onClick={handler.handleConfirm}/>
           </div>
         </>
       );
@@ -150,7 +150,7 @@ export function useTableModifyEditor(
             render: () => {
               const option = state.optionGetter?.();
               if (!option) {return null;}
-              const title = option.title || i18n('table.batchModify').d('批量修改');
+              const title = option.title || i18n.$it('table.batchModify').d('批量修改');
               const plcList = option.plcList || getFlatPlcList();
               if (!plcList) {return null;}
               return (