cloud-web-corejs 1.0.27 → 1.0.29

package/src/views/user/extend_datasource/list.vue

@@ -12,39 +12,38 @@
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
                   </vxe-button>
                   <vxe-button status="primary" class="button-sty" icon="el-icon-upload2"
-                              @click="$excelExport({ title: '数据源导出', targetRef: 'table-m1' })">导出
+                              @click="$excelExport({ title: $t1('数据源导出'), targetRef: 'table-m1' })">{{
+                      $t1('导出')
+                    }}
                   </vxe-button>
                   <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入</vxe-button> -->
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{$t1('重置')}}
+                              plain>{{ $t1('重置') }}
                   </vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{ $t1('搜索') }}
                   </vxe-button>
                 </div>
               </div>
               <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
                         @submit="searchEvent" @reset="searchEvent">
-                <!-- <vxe-form-item title="模板名称:" field="reportName">
-                  <template v-slot>
-                    <el-input v-model="formData.reportName" size="small" clearable />
-                  </template>
-                </vxe-form-item> -->
-                <vxe-form-item title="数据源名称:" field="dsName">
+                <vxe-form-item :title="$t1('数据源名称')+':'" field="dsName">
                   <template v-slot>
                     <el-input v-model="formData.dsName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="数据源Url:" field="dsUrl">
+                <vxe-form-item :title="$t1('数据源Url')+':'" field="dsUrl">
                   <template v-slot>
                     <el-input v-model="formData.dsUrl" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="数据源类型:" field="dsType">
+                <vxe-form-item :title="$t1('数据源类型')+':'" field="dsType">
                   <template v-slot>
                     <el-select v-model="formData.dsType" clearable>
                       <el-option :value="0" label="mysql"></el-option>
@@ -52,11 +51,11 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="是否启用:" field="enable">
+                <vxe-form-item title="$t1('是否启用')+':'" field="enable">
                   <template v-slot>
                     <el-select v-model="formData.enable" clearable>
-                      <el-option :value="true" label="启用"></el-option>
-                      <el-option :value="false" label="禁用"></el-option>
+                      <el-option :value="true" :label="$t1('启用')"></el-option>
+                      <el-option :value="false" :label="$t1('禁用')"></el-option>
                     </el-select>
                   </template>
                 </vxe-form-item>
@@ -113,18 +112,18 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '数据源名称',
+            title: this.$t1('数据源名称'),
             field: 'dsName',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '数据源编码',
+            title: this.$t1('数据源编码'),
             field: 'dsCode',
             width: 150
           },
           {
-            title: '数据源类型',
+            title: this.$t1('数据源类型'),
             field: 'dsType',
             width: 150,
             slots: {
@@ -138,17 +137,17 @@ export default {
             }
           },
           {
-            title: '数据源对应驱动ClassName',
+            title: this.$t1('数据源对应驱动ClassName'),
             field: 'driverClassName',
             width: 150
           },
           {
-            title: '链接数据源Url',
+            title: this.$t1('链接数据源Url'),
             field: 'dsUrl',
             width: 150
           },
           {
-            title: '数据源用户名',
+            title: this.$t1('数据源用户名'),
             field: 'dsUserName',
             width: 150
           },
@@ -161,13 +160,13 @@ export default {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
-                      <span>启用</span>
+                      <span>{this.$t1('启用')}</span>
                     </div>
                   ];
                 } else {
                   return [
                     <div class="txt-status disable">
-                      <span>禁用</span>
+                      <span>{this.$t1('禁用')}</span>
                     </div>
                   ];
                 }
@@ -200,7 +199,7 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                   popper-class="tooltip-skin">
                         <i class="el-icon-edit"/>
                       </el-tooltip>

package/src/views/user/fieldTranslation/editDialog.vue

@@ -1,42 +1,42 @@
 <template>
   <div>
     <el-dialog
-      :title="dataId?'编辑多语言':'新增多语言'"
+      :title="dataId?$t1('编辑多语言'):$t1('新增多语言')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
       :visible.sync="showDialog"
       :modal="false"
       custom-class="dialog-style list-dialog dialog-checkbox pd_8"
-      width="800px"
+      width="544px"
       v-el-drag-dialog
       @close="close"
     >
       <div class="cont">
         <el-form ref="editForm" :model="fieldTranslation" label-width="110px" class="adSearchForm"
                  style="width:100%;height: auto;">
-          <el-form-item label="数据类型" prop="dataTypeName" :rules="[{ required: false, trigger: 'blur' }]">
-            <!--          <el-input v-model="fieldTranslation.dataTypeName" disabled/>-->
+          <el-form-item :label="$t1('数据类型')" prop="dataTypeName" :rules="[{ required: false, trigger: 'blur' }]">
             <span>{{ dataTypeMap[fieldTranslation.dataTypeCode] }}</span>
           </el-form-item>
-          <el-form-item label="字段编码" prop="fieldCode" :rules="[{ required: false, trigger: 'blur' }]">
+          <el-form-item :label="$t1('字段编码')" prop="fieldCode" :rules="[{ required: false, trigger: 'blur' }]">
             <el-input v-model="fieldTranslation.fieldCode" clearable/>
           </el-form-item>
-          <el-form-item label="中文" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]" class="block">
+          <el-form-item :label="$t1('中文')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
+                        class="block">
             <el-input v-model="fieldTranslation.translation1" clearable/>
           </el-form-item>
           <el-form-item v-for="(item,index) in languageSettings" :key="index" :label="item.languageName" :prop="item.sn"
                         :rules="[{ required: false, trigger: 'blur' }]" class="block">
             <el-input v-model="fieldTranslation[item.translationField]" clearable/>
           </el-form-item>
-          <el-form-item label="项目标签" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
+          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
                         class="block">
-            <projectTagView v-model="fieldTranslation.fieldTranslationTagDTOs" :readonly="!isDev"></projectTagView>
+            <langTagView v-model="fieldTranslation.fieldTranslationTagDTOs" :readonly="!isDev"></langTagView>
           </el-form-item>
-          <el-form-item label="创建时间" prop="createDate" :rules="[{ required: false, trigger: 'blur' }]">
+          <el-form-item :label="$t1('创建时间')" prop="createDate" :rules="[{ required: false, trigger: 'blur' }]">
             <span>{{ fieldTranslation.createDate }}</span>
           </el-form-item>
-          <el-form-item label="更新时间" prop="modifyDate" :rules="[{ required: false, trigger: 'blur' }]">
+          <el-form-item :label="$t1('更新时间')" prop="modifyDate" :rules="[{ required: false, trigger: 'blur' }]">
             <span>{{ fieldTranslation.modifyDate }}</span>
           </el-form-item>
 
@@ -45,31 +45,31 @@
       <span slot="footer" class="dialog-footer">
       <el-button type="primary" plain class="button-sty" @click="showDialog=false">
         <i class="el-icon-close el-icon"></i>
-        {{$t1('取 消')}}
+        {{ $t1('取 消') }}
       </el-button>
       <el-button type="primary" @click="saveData" class="button-sty" v-if="isDev">
         <i class="el-icon-check el-icon"></i>
-        {{$t1('确 定')}}
+        {{ $t1('确 定') }}
       </el-button>
     </span>
     </el-dialog>
-    <projectTagDialog v-if="showProjectTagDialog"
-                      :visiable.sync="showProjectTagDialog"
-                      @confirm="confirmProjectTagDialog"
-                      :multi="true"
-                      :rows="fieldTranslationTagDTOs"
-                      fieldKey="tagCode"></projectTagDialog>
+    <langTagDialog v-if="showLangTagDialog"
+                   :visiable.sync="showLangTagDialog"
+                   @confirm="confirmLangTagDialog"
+                   :multi="true"
+                   :rows="fieldTranslationTagDTOs"
+                   fieldKey="tagCode"></langTagDialog>
   </div>
 </template>
 
 <script>
 import {getBdFlag} from "@base/api/user";
-import projectTagDialog from "../../../views/user/project_tag/dialog.vue";
-import projectTagView from "@base/components/projectTag/view.vue";
+import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+import langTagView from "@base/components/langTag/view.vue";
 
 
 export default {
-  components: {projectTagDialog, projectTagView},
+  components: {langTagDialog, langTagView},
   props: {
     _dataId: [String, Number],
     currentDataType: Object
@@ -91,10 +91,10 @@ export default {
       showDataTypeDialog: false,
       languageSettings: [],
       dataTypeMap: {
-        "business": "全局对照表",
-        "menus": "菜单对照表",
+        "business": this.$t1('全局对照表'),
+        "menus": this.$t1('菜单对照表'),
       },
-      showProjectTagDialog: false,
+      showLangTagDialog: false,
       isDev: true
     };
   },
@@ -200,7 +200,7 @@ export default {
       this.showDialog = false;
       this.$emit('update:visiable', false)
     },
-    openProjectTagDialog() {
+    openLangTagDialog() {
       let fieldTranslationTagDTOs = this.fieldTranslation.fieldTranslationTagDTOs || [];
       this.fieldTranslationTagDTOs = fieldTranslationTagDTOs.map(item => {
         return {
@@ -208,9 +208,9 @@ export default {
           tagName: item.tagName,
         }
       })
-      this.showProjectTagDialog = true;
+      this.showLangTagDialog = true;
     },
-    confirmProjectTagDialog(rows) {
+    confirmLangTagDialog(rows) {
       this.fieldTranslation.fieldTranslationTagDTOs = rows.map(item => {
         return {
           tagCode: item.tagCode,
@@ -229,7 +229,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 ::v-deep .el-form-item {
   float: left;
   width: 50%;

package/src/views/user/fieldTranslation/list.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
-          <div class="tit"><b>数据类型</b></div>
+          <div class="tit"><b>{{ $t1('数据类型') }}</b></div>
           <el-tree
             :props="defaultProps"
             :load="loadNode"
@@ -33,37 +33,39 @@
                   <template #buttonLeft>
                     <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
                                 @click="openFieldTranslationEditDialog()" :disabled="!currentDataType.id" v-if="isDev">
-                      新增
+                      {{ $t1('新增') }}
                     </vxe-button>
-                    <base-table-export :option="{ title: '多语言', targetRef: 'table-m1'}"
+                    <base-table-export :option="{ title: $t1('多语言'), targetRef: 'table-m1'}"
                                        :parent-target="_self" :disabled="!currentDataType.id" v-if="isDev"/>
                     <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel"
-                                :disabled="!currentDataType.id" v-if="isDev">导入
+                                :disabled="!currentDataType.id" v-if="isDev">{{ $t1('导入') }}
                     </vxe-button>
-                    <vxe-button status="success" class="button-sty" icon="el-icon-download" @click="jsonImport">导入发布
+                    <vxe-button status="success" class="button-sty" icon="el-icon-download" @click="jsonImport">
+                      {{ $t1('导入发布') }}
                     </vxe-button>
                     <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
-                                v-if="isDev">导出发布
+                                v-if="isDev">{{ $t1('导出发布') }}
                     </vxe-button>
-                    <projectTagAddButton :option="addProjectTagOption" v-if="isDev"></projectTagAddButton>
-                    <projectTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></projectTagDeleteButton>
+                    <langTagAddButton :option="addProjectTagOption" v-if="isDev"></langTagAddButton>
+                    <langTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></langTagDeleteButton>
                   </template>
                   <template #buttonRight>
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
                                 plain>{{ $t1('重置') }}
                     </vxe-button>
-                    <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+                    <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                      {{ $t1('搜索') }}
                     </vxe-button>
                   </template>
                   <template #dataTypeName>
-                    <vxe-form-item title="数据类型:" field="dataTypeName">
+                    <vxe-form-item :title="$t1('数据类型')+':'" field="dataTypeName">
                       <template v-slot>
                         <el-input v-model="currentDataType.dataTypeName" size="small" disabled/>
                       </template>
                     </vxe-form-item>
                   </template>
                   <template #tag>
-                    <vxe-form-item title="项目标签:" field="tag">
+                    <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
                       <template v-slot>
                         <el-input
                           class="search-input"
@@ -75,7 +77,7 @@
                           v-el-readonly
                           clearable
                         >
-                          <i slot="suffix" class="el-input__icon el-icon-search" @click="openProjectTagDialog3"></i>
+                          <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
                         </el-input>
                       </template>
                     </vxe-form-item>
@@ -83,7 +85,7 @@
                 </tableForm>
               </template>
               <template #tag="{row}">
-                <projectTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></projectTagView>
+                <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
               </template>
             </vxe-grid>
           </div>
@@ -93,11 +95,11 @@
     <fieldTranslationEditDialog v-if="showFieldTranslationEditDialog" :visiable.sync="showFieldTranslationEditDialog"
                                 :_dataId.sync="dataId" :currentDataType="currentDataType"
                                 @confirm="confirmFieldTranslationEditDialog"></fieldTranslationEditDialog>
-    <projectTagDialog v-if="showProjectTagDialog3"
-                      :visiable.sync="showProjectTagDialog3"
-                      @confirm="confirmProjectTagDialog3"
-                      :rows="checkTags"
-                      :multi="true"></projectTagDialog>
+    <langTagDialog v-if="showLangTagDialog3"
+                   :visiable.sync="showLangTagDialog3"
+                   @confirm="confirmLangTagDialog3"
+                   :rows="checkTags"
+                   :multi="true"></langTagDialog>
   </div>
 </template>
 
@@ -106,16 +108,16 @@ import fieldTranslationEditDialog from "../../../views/user/fieldTranslation/edi
 import {treeScollx} from '@base/utils/global.js';
 import {getBdFlag} from "@base/api/user";
 import tableForm from "@base/components/table/tableForm.vue";
-import projectTagDialog from "../../../views/user/project_tag/dialog.vue";
-import projectTagAddButton from "@base/components/projectTag/addButton.vue";
-import projectTagDeleteButton from "@base/components/projectTag/deleteButton.vue";
-import projectTagView from "@base/components/projectTag/view.vue";
+import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+import langTagAddButton from "@base/components/langTag/addButton.vue";
+import langTagDeleteButton from "@base/components/langTag/deleteButton.vue";
+import langTagView from "@base/components/langTag/view.vue";
 
 export default {
   name: 'fieldTranslation:list',
   components: {
-    projectTagView,
-    projectTagDialog, tableForm, fieldTranslationEditDialog, projectTagAddButton, projectTagDeleteButton
+    langTagView,
+    langTagDialog, tableForm, fieldTranslationEditDialog, langTagAddButton, langTagDeleteButton
   },
   data() {
     return {
@@ -173,7 +175,7 @@ export default {
           this.searchEvent()
         }
       },
-      showProjectTagDialog3: false,
+      showLangTagDialog3: false,
       checkTags: [],
       isDev: true,
 
@@ -219,11 +221,22 @@ export default {
       this.activeName = 'first';
       this.$openEditView('showEdit');
     },
+    getSearchParam() {
+      let tagCodes = null;
+      if (this.checkTags.length) {
+        tagCodes = this.checkTags.map(item => item.tagCode);
+      }
+      return {
+        ...this.formData,
+        dataTypeCode: this.currentDataType.dataTypeCode,
+        tagCodes
+      };
+    },
     initTableList() {
       let that = this;
       let dataTypeMap = {
-        "business": "全局对照表",
-        "menus": "菜单对照表",
+        "business": this.$t1('全局对照表'),
+        "menus": this.$t1('菜单对照表'),
       }
       let syncColumns = []
       this.languageSettings.forEach(item => {
@@ -239,15 +252,7 @@ export default {
         tableName: 'user_fieldTranslation_list-m1',
         path: USER_PREFIX + '/fieldTranslation/listPage',
         param: () => {
-          let tagCodes = null;
-          if (this.checkTags.length) {
-            tagCodes = this.checkTags.map(item => item.tagCode);
-          }
-          return {
-            ...this.formData,
-            dataTypeCode: this.currentDataType.dataTypeCode,
-            tagCodes
-          };
+          return this.getSearchParam();
         },
         config: {
           proxyConfig: {
@@ -257,20 +262,20 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '字段编码',
+            title: this.$t1('字段编码'),
             field: 'fieldCode',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '中文',
+            title: this.$t1('中文'),
             field: 'translation1',
             width: 150,
             fixed: 'left'
           },
           ...syncColumns,
           {
-            title: '数据类型',
+            title: this.$t1('数据类型'),
             field: 'dataTypeName',
             width: 150,
             slots: {
@@ -280,7 +285,7 @@ export default {
             }
           },
           {
-            title: '项目标签', field: 'tag', width: 250, slots: {default: "tag"}, params: {
+            title: this.$t1('多语言标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.fieldTranslationTagDTOs) {
                   return row.fieldTranslationTagDTOs.map(item => item.tagName).join(",")
@@ -322,7 +327,7 @@ export default {
         ],
         searchColumns: [
           {
-            title: "数据类型",
+            title: this.$t1('数据类型'),
             field: "dataTypeName",
             type: "input",
             common: true,
@@ -330,9 +335,9 @@ export default {
             defaultValueEnabled: false,
             slot: "dataTypeName"
           },
-          {title: "字段编码", field: "fieldCode", type: "input", common: true},
-          {title: "中文", field: "translation1", type: "input", common: true},
-          {title: "项目标签", field: "tag", type: "input", common: true, slot: "tag"},
+          {title: this.$t1('字段编码'), field: "fieldCode", type: "input", common: true},
+          {title: this.$t1('中文'), field: "translation1", type: "input", common: true},
+          {title: this.$t1('多语言标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
@@ -350,13 +355,13 @@ export default {
 
       let rows = [
         {
-          dataTypeName: '全局对照表',
+          dataTypeName: this.$t1('全局对照表'),
           dataTypeCode: 'business',
           id: 'business',
           leaf: true,
         },
         {
-          dataTypeName: '菜单对照表',
+          dataTypeName: this.$t1('菜单对照表'),
           dataTypeCode: 'menus',
           id: 'menus',
           leaf: true,
@@ -377,7 +382,7 @@ export default {
       this.dataId = !id || typeof id == 'object' ? 0 : id;
       if (!this.dataId) {
         if (!this.currentDataType) {
-          this.$baseAlert("请选择数据类型");
+          this.$baseAlert(this.$t1('请选择数据类型'));
           return
         }
       }
@@ -390,7 +395,7 @@ export default {
       let that = this;
       let currentDataType = this.currentDataType;
       that.$excelImport({
-        title: "多语言导入（" + currentDataType.dataTypeName + "）",
+        title: this.$t1('多语言导入（{dataTypeName}）', {dataTypeName: currentDataType.dataTypeName}),
         prefix: USER_PREFIX,
         excel: USER_PREFIX + '/excelTemplate/fieldTranslation/fieldTranslation.xlsx',
         multi: false,
@@ -410,22 +415,19 @@ export default {
       });
     },
     jsonExport() {
-      this.$baseConfirm('您确定要导出发布吗？')
+      this.$baseConfirm(this.$t1('您确定要导出发布吗？'))
         .then(() => {
           this.$http({
             url: USER_PREFIX + "/fieldTranslation/export2Publish",
             method: `post`,
-            data: {
-              ...this.formData,
-              dataTypeCode: this.currentDataType.dataTypeCode
-            },
+            data: this.getSearchParam(),
             isLoading: true,
             success: res => {
               let content = res.objx
               if (content && content !== "[]") {
                 this.downloadTxt(content)
               } else {
-                this.$baseAlert("不存在需要导出的数据")
+                this.$baseAlert(this.$t1('不存在需要导出的数据'))
               }
             }
           });
@@ -449,10 +451,10 @@ export default {
       document.body.removeChild(link);
       URL.revokeObjectURL(url);
     },
-    openProjectTagDialog3() {
-      this.showProjectTagDialog3 = true;
+    openLangTagDialog3() {
+      this.showLangTagDialog3 = true;
     },
-    confirmProjectTagDialog3(rows) {
+    confirmLangTagDialog3(rows) {
       this.checkTags = rows;
     },
     getTabNames() {