kz-ui-base 1.0.147 → 1.0.148

package/common/src/components/basics/RightToolbar/advancedQueryClose.vue

@@ -4,7 +4,7 @@
       <!-- <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top"
                   v-if="searchVisible"> -->
         <el-button size="mini" type="danger" icon="el-icon-close" @click="toggleSearch()">
-          {{this.t('common.close')}}
+          关闭
         </el-button>
       <!-- </el-tooltip> -->
       <!-- <el-tooltip class="item" effect="dark" content="刷新" placement="top" v-if="refreshVisible">

package/common/src/utils/request.js

@@ -28,11 +28,6 @@ service.interceptors.request.use(
     if (getToken() && !isToken) {
       config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    if(localStorage.getItem('locale')){
-      config.headers["Lang"] = localStorage.getItem('locale');
-    }else{
-      config.headers["Lang"] = "zh-CN";
-    }
     //添加 forward-to
     if (configRes && configRes.forwardTo) {
       config.headers["forward-to"] = configRes.forwardTo;

package/components/customForm/datePicker.vue

@@ -36,6 +36,7 @@
       format="HH:mm"
       value-format="HH:mm"
       @change="onChangeEvent"
+      placeholder="选择时间"
     >
     </el-time-picker>
   </el-form-item>

package/list-base-page/doublelistBasePageTs.vue

@@ -63,10 +63,10 @@
                 icon="el-icon-search"
                 size="mini"
                 @click="handleQuery"
-                >{{ this.t('common.search') }}</el-button
-                  >
-                  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                    >{{ this.t('common.reset') }}</el-button
+                >搜索</el-button
+              >
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
               >
             </el-form-item>
           </el-form>
@@ -137,12 +137,12 @@
               align="center"
             />
             <el-table-column
-                v-if="listSetting.isShowIndexColumn != false"
-                type="index"
-                :label="this.t('component.table.serialNumber')"
-                width="50"
-                align="center"
-              >
+              v-if="listSetting.isShowIndexColumn != false"
+              type="index"
+              label="序号"
+              width="50"
+              align="center"
+            >
               <template scope="scope">
                 <span>{{
                   (listQueryParams.pageNum - 1) * listQueryParams.pageSize +
@@ -256,7 +256,7 @@
             </template>
 
             <el-table-column
-              :label="this.t('common.operation')"
+              label="操作"
               align="center"
               min-width="160"
               class-name="small-padding fixed-width"
@@ -323,13 +323,13 @@
                         icon="el-icon-search"
                         size="mini"
                         @click="doubleHandleQuery(dex)"
-                        >{{ this.t('common.search') }}</el-button
+                        >搜索</el-button
                       >
                       <el-button
                         icon="el-icon-refresh"
                         size="mini"
                         @click="doubleResetQuery(dex)"
-                        >{{ this.t('common.reset') }}</el-button
+                        >重置</el-button
                       >
                     </el-form-item>
                   </el-form>
@@ -376,7 +376,7 @@
                   <el-table-column
                     v-if="tableSetting[dex].isShowIndexColumn != false"
                     type="index"
-                    :label="this.t('component.table.serialNumber')"
+                    label="序号"
                     width="50"
                     align="center"
                   >
@@ -498,7 +498,7 @@
                   </template>
 
                   <el-table-column
-                    :label="this.t('common.operation')"
+                    label="操作"
                     align="center"
                     min-width="160"
                     class-name="small-padding fixed-width"
@@ -1017,7 +1017,7 @@ export default class doubleBasePageTs extends ListBasePage {
               );
               console.log(this.tableSetting[0].listColumns);
             } else {
-              this.msgError(this.t('component.form.dataError'));
+              this.msgError("数据错误！");
             }
           });
         }

package/list-base-page/listBasePageTs.vue

@@ -132,10 +132,10 @@
                 icon="el-icon-search"
                 size="mini"
                 @click="handleQuery"
-                >{{ this.t('common.search') }}</el-button
+                >搜索</el-button
               >
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >{{ this.t('common.reset') }}</el-button
+                >重置</el-button
               >
               <AdvancedQuery
                 style="margin-left: 10px"
@@ -284,13 +284,13 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="handleQuery"
-                  >{{ this.t('common.search') }}</el-button
+                  >搜索</el-button
                 >
                 <el-button
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
-                  >{{ this.t('common.reset') }}</el-button
+                  >重置</el-button
                 >
                 <AdvancedQueryClose
                   style="
@@ -1237,6 +1237,7 @@
     </printDialog>
   </div>
 </template>
+
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import {
@@ -1416,7 +1417,7 @@ export default class listBasePage extends Vue {
   opMenus = [
     {
       visable: true,
-      text: (this as any).t('common.add'),
+      text: "添加",
       icon: "el-icon-plus",
       permission: "add",
       name: "add",
@@ -1425,7 +1426,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: true,
-      text: (this as any).t('common.copy'),
+      text: "复制",
       icon: "ion-md-copy",
       permission: "add",
       name: "copy",
@@ -1435,7 +1436,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: true,
-      text: (this as any).t('common.update'),
+      text: "修改",
       icon: "el-icon-edit",
       permission: "edit",
       name: "update",
@@ -1445,7 +1446,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: true,
-      text: (this as any).t('common.delete'),
+      text: "删除",
       icon: "el-icon-delete",
       permission: "remove",
       name: "delete",
@@ -1455,7 +1456,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: true,
-      text: (this as any).t('common.detail'),
+      text: "查看",
       icon: "ion-md-information-circle-outline",
       name: "detail",
       isShowText: false,
@@ -1465,7 +1466,7 @@ export default class listBasePage extends Vue {
 
     {
       visable: true,
-      text: (this as any).t('common.export'),
+      text: "导出",
       icon: "ion-md-cloud-download",
       name: "export",
       isShowText: false,
@@ -1473,7 +1474,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: true,
-      text: (this as any).t('common.import'),
+      text: "导入",
       icon: "ion-md-cloud-upload",
       permission: "add",
       name: "import",
@@ -1482,7 +1483,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: false,
-      text: (this as any).t('system.order.startWf'),
+      text: "发起审批",
       icon: "el-icon-position",
       permission: "startWf",
       name: "startWf",
@@ -1492,7 +1493,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: false,
-      text: (this as any).t('system.order.showWf'),
+      text: "审批进度",
       icon: "el-icon-view",
       permission: "showWf",
       name: "showWf",
@@ -1505,7 +1506,7 @@ export default class listBasePage extends Vue {
     //{ visable: true, text: "高级搜索", icon: "ion-md-paw", name: "advanceSearch", isShowText: false },
     {
       visable: true,
-      text: (this as any).t('system.order.print'),
+      text: "打印",
       icon: "ion-md-print",
       name: "print",
       isShowText: false,
@@ -1514,7 +1515,7 @@ export default class listBasePage extends Vue {
     },
     {
       visable: true,
-      text: (this as any).t('system.order.advancedSearch'),
+      text: "高级搜索",
       icon: "ion-md-print",
       name: "search",
       isShowText: false,
@@ -1569,7 +1570,7 @@ export default class listBasePage extends Vue {
     //{ text: `用户账号`, property: "userAccount", visible: true },
   ];
   listSerialNumber = {
-    label: '序号',
+    label: "序号",
     width: "50",
     align: "center",
   };
@@ -1666,7 +1667,7 @@ export default class listBasePage extends Vue {
       name: "basic",
       visable: true,
       icon: "ion-plus-round",
-      text: '基本信息',
+      text: "基本信息",
       type: "area",
     },
   ];
@@ -1681,8 +1682,8 @@ export default class listBasePage extends Vue {
   editRules = {};
   //编辑界面按钮菜单
   editOpMenus = [
-    { name: "save", visable: true, icon: "ion-plus-round", text: (this as any).t('common.save') },
-    { name: "close", visable: true, icon: "ion-md-create", text: (this as any).t('common.close') },
+    { name: "save", visable: true, icon: "ion-plus-round", text: "保存" },
+    { name: "close", visable: true, icon: "ion-md-create", text: "关闭" },
   ];
   //编辑界面自定义按钮菜单 - 若无自定义按钮，不需要重写
   editCustomOpMenus = [
@@ -1694,7 +1695,7 @@ export default class listBasePage extends Vue {
     // 是否显示编辑窗口
     isShow: false,
     // 弹出层标题（用户导入）
-    title: (this as any).t('common.import'),
+    title: "导入",
     // 是否禁用上传
     isUploading: false,
     // 是否更新已经存在的用户数据
@@ -1711,7 +1712,7 @@ export default class listBasePage extends Vue {
     // 是否显示编辑窗口
     isShow: false,
     // 弹出层标题（用户导入）
-    title: '打印模版',
+    title: "打印模板",
     //打印类型
     templateType: "",
     // 保存时是否自动关闭
@@ -2015,7 +2016,7 @@ export default class listBasePage extends Vue {
     const sums = [];
     columns.forEach((column, index) => {
       if (index === 0) {
-        sums[index] = '合计';
+        sums[index] = "合计";
         return;
       }
       const values = data.map((item) => Number(item[column.property]));

package/package.json

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