Merge branch 'dev' of https://github.com/th37rose/lowcoder_dev1 into feature/bundle

Author: Thomas

client/packages/lowcoder-design/src/components/Section.tsx

@@ -158,4 +158,5 @@ export const sectionNames = {
   headerStyle:trans("prop.headerStyle"),
   bodyStyle:trans("prop.bodyStyle"),
   badgeStyle:trans("prop.badgeStyle"),
+  columnStyle:trans("prop.columnStyle"),
 };

client/packages/lowcoder-design/src/i18n/design/locales/en.ts

@@ -37,6 +37,7 @@ export const en = {
     headerStyle: 'Header Style',
     bodyStyle: 'Body Style',
     badgeStyle: 'Badge Style',
+    columnStyle: 'Column Style',
   },
   passwordInput: {
     label: "Password:",

client/packages/lowcoder-design/src/i18n/design/locales/zh.ts

@@ -1,4 +1,7 @@
-export const zh = {
+import {en} from "./en";
+
+export const zh: typeof en = {
+    ...en,
     addItem: "添加",
     duplicate: "复制",
     rename: "重命名",
@@ -10,54 +13,64 @@ export const zh = {
     nextStep: "下一步",
     finish: "完成",
     country: {
-      china: "中国",
+        ...en.country,
+        china: "中国",
     },
     notification: {
-      copySuccess: "复制成功",
-      copyFail: "复制失败",
+        ...en.notification,
+        copySuccess: "复制成功",
+        copyFail: "复制失败",
     },
     prop: {
-      basic: "基础",
-      resources: "资源",
-      interaction: "交互",
-      advanced: "高级",
-      validation: "验证",
-      layout: "布局",
-      labelStyle:"标签样式",
-      style: "样式",
-      meetings: "会议",
-      data: "数据",
+        ...en.prop,
+        basic: "基础",
+        resources: "资源",
+        interaction: "交互",
+        advanced: "高级",
+        validation: "验证",
+        layout: "布局",
+        labelStyle:"标签样式",
+        style: "样式",
+        meetings: "会议",
+        data: "数据",
     },
     passwordInput: {
+        ...en.passwordInput,
         label: "密码:",
         placeholder: "请输入密码",
         inconsistentPassword: "两次密码输入不一致",
         confirmPasswordLabel: "确认密码:",
         confirmPasswordPlaceholder: "请再次输入密码",
     },
     verifyCodeInput: {
+        ...en.verifyCodeInput,
         label: "验证码:",
         errorMsg: "验证码应为 {digitNum} 位数字",
         placeholder: "请输入 {digitNum} 位数字验证码",
         sendCode: "发送验证码",
     },
     iconSelect: {
+        ...en.iconSelect,
         title: "选择图标",
         searchPlaceholder: "搜索图标",
     },
     eventHandler: {
+        ...en.eventHandler,
         advanced: "高级",
     },
     comp: {
+        ...en.comp,
         selectedCompsTitle: "已选择 {selectCompNum} 个组件",
         selectedCompsDetail: "点击组件查看其属性",
         batchDelete: "批量删除",
     },
     optionsControl: {
+        ...en.optionsControl,
         optionItemErrorMSg: `发现重复的选项值 "{value}"，只会显示第一项,请更改为唯一值.`,
         emptyList: "无选项",
     },
     container: {
+        ...en.container,
         hintPlaceHolder: "从右侧面板拖动组件",
     },
   };

client/packages/lowcoder-design/src/icons/index.ts

@@ -264,6 +264,7 @@ export { ReactComponent as ChartCompIconSmall } from "./v2/pie-chart-s.svg";
 export { ReactComponent as CheckboxCompIconSmall } from "./v2/checkbox-s.svg";
 export { ReactComponent as ColorPickerCompIconSmall } from "./v2/colorpicker-s.svg"; // new
 export { ReactComponent as CollapsibleContainerCompIconSmall } from "./v2/collapsible-container-s.svg"; // new
+export { ReactComponent as ColumnLayoutCompIconSmall } from "./v2/column-layout-s.svg"; // new
 export { ReactComponent as CommentCompIconSmall } from "./v2/comment-s.svg";
 export { ReactComponent as ContainerCompIconSmall } from "./v2/container-s.svg";
 export { ReactComponent as CustomCompIconSmall } from "./v2/custom-code-s.svg"; // new
@@ -365,6 +366,7 @@ export { ReactComponent as CascaderCompIcon } from "./v2/cascader-m.svg";
 export { ReactComponent as ChartCompIcon } from "./v2/pie-chart-m.svg";
 export { ReactComponent as CheckboxCompIcon } from "./v2/checkbox-m.svg";
 export { ReactComponent as CollapsibleContainerCompIcon } from "./v2/collapsible-container-m.svg";
+export { ReactComponent as ColumnLayoutCompIcon } from "./v2/column-layout-m.svg";
 export { ReactComponent as CommentCompIcon } from "./v2/comment-m.svg";
 export { ReactComponent as ColorPickerCompIcon } from "./v2/colorpicker-m.svg";
 export { ReactComponent as ContainerCompIcon } from "./v2/container-m.svg";