kz-ui-base 1.0.151 → 1.0.153

package/common/src/components/base/dialog/BaseDialog.vue

@@ -22,12 +22,12 @@
           size="small"
           type="primary"
           @click="handleConfirm"
-        >{{ _confirmText }}
+        >{{ confirmText }}
         </el-button>
         <el-button
           size="small"
           @click="handleClose"
-        >{{ _cancelText }}
+        >{{ cancelText }}
         </el-button>
       </div>
     </div>
@@ -44,11 +44,11 @@ export default {
     },
     confirmText: {
       type: String,
-      default: ''
+      default: '确定'
     },
     cancelText: {
       type: String,
-      default: ''
+      default: '关闭'
     },
     visible: {
       type: Boolean,
@@ -66,25 +66,12 @@ export default {
       submitLoading: false
     }
   },
-  computed: {
-    // 确定按钮文本，支持国际化
-    _confirmText() {
-      return this.confirmText || this.t('component.dialog.confirm') || '确定'
-    },
-    // 取消按钮文本，支持国际化
-    _cancelText() {
-      return this.cancelText || this.t('component.dialog.cancel') || '关闭'
-    }
-  },
   watch: {
     visible(val) {
       this.modalState = val
     }
   },
   methods: {
-    t(key) {
-      return this.$t(key) || key
-    },
     handleConfirm() {
       this.$emit('on-confirm')
     },

package/common/src/components/base/dialog/Dialog.js

@@ -1,24 +1,6 @@
 import Vue from "vue";
-import zhCN from "element-ui/lib/locale/lang/zh-CN";
-import enUS from "element-ui/lib/locale/lang/en";
-import ElementLocale from "element-ui/lib/locale";
-
-// 根据当前语言设置配置 Element UI 语言
-function initElementLocale() {
-  const currentLocale = localStorage.getItem("locale") || "zh_CN";
-  if (currentLocale === "en_US") {
-    ElementLocale.use(enUS);
-  } else {
-    ElementLocale.use(zhCN);
-  }
-}
-
-// 初始化 Element UI 语言
-initElementLocale();
 
 function makeDialog(option) {
-  // 每次创建对话框时重新初始化语言
-  initElementLocale();
   var dom = document.createElement("div");
   document.getElementsByTagName("body")[0].appendChild(dom);
   let tpl =
@@ -129,8 +111,6 @@ function makeDialog(option) {
   return vue;
 }
 function makeDrawer(option) {
-  // 每次创建抽屉时重新初始化语言
-  initElementLocale();
   var dom = document.createElement("div");
   document.getElementsByTagName("body")[0].appendChild(dom);
   let tpl =

package/list-base-page/listBasePageTs.vue

@@ -3249,42 +3249,42 @@ export default class listBasePage extends Vue {
   }
   cellStayle(row) {}
   mounted() {
-    // 为 listColumns 中每个对象添加 text 属性
-    if (this.listColumns) {
-      this.listColumns.forEach((col: any) => {
-        if (col.property) {
-          col.text = (this as any).t(`${this.moduleName}.${this.serviceName}.${col.property}`);
-        }
-      });
-    }
+    // // 为 listColumns 中每个对象添加 text 属性
+    // if (this.listColumns) {
+    //   this.listColumns.forEach((col: any) => {
+    //     if (col.property) {
+    //       col.text = (this as any).t(`${this.moduleName}.${this.serviceName}.${col.property}`);
+    //     }
+    //   });
+    // }
 
-    // 为 searchRules 中每个对象添加 text 属性
-    if (this.searchRules) {
-      this.searchRules.forEach((rule: any) => {
-        if (rule.property) {
-          rule.text = (this as any).t(`${this.moduleName}.${this.serviceName}.${rule.property}`);
-        }
-      });
-    }
+    // // 为 searchRules 中每个对象添加 text 属性
+    // if (this.searchRules) {
+    //   this.searchRules.forEach((rule: any) => {
+    //     if (rule.property) {
+    //       rule.text = (this as any).t(`${this.moduleName}.${this.serviceName}.${rule.property}`);
+    //     }
+    //   });
+    // }
 
-    // 为 editColumns 中每个对象添加 text 属性
-    if (this.editColumns) {
-      this.editColumns.forEach((col: any) => {
-        if (col.property) {
-          col.text = (this as any).t(`${this.moduleName}.${this.serviceName}.${col.property}`);
-        }
-      });
-    }
+    // // 为 editColumns 中每个对象添加 text 属性
+    // if (this.editColumns) {
+    //   this.editColumns.forEach((col: any) => {
+    //     if (col.property) {
+    //       col.text = (this as any).t(`${this.moduleName}.${this.serviceName}.${col.property}`);
+    //     }
+    //   });
+    // }
 
-    // 为 editSetting.listSetting.listColumns 中每个对象添加 text 属性
-    if (this.editSetting?.listSetting?.listColumns) {
-      const listSetting: any = this.editSetting.listSetting;
-      listSetting.listColumns.forEach((col: any) => {
-        if (col.property) {
-          col.text = (this as any).t(`${listSetting.moduleName}.${listSetting.serviceName}.${col.property}`);
-        }
-      });
-    }
+    // // 为 editSetting.listSetting.listColumns 中每个对象添加 text 属性
+    // if (this.editSetting?.listSetting?.listColumns) {
+    //   const listSetting: any = this.editSetting.listSetting;
+    //   listSetting.listColumns.forEach((col: any) => {
+    //     if (col.property) {
+    //       col.text = (this as any).t(`${listSetting.moduleName}.${listSetting.serviceName}.${col.property}`);
+    //     }
+    //   });
+    // }
 
     var that = this;
     if (this.listSetting.isShowSumRow) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.151",
+  "version": "1.0.153",
   "description": "",
   "main": "index.js",
   "scripts": {