cloud-web-corejs 1.0.54-dev.80 → 1.0.54-dev.800

package/src/views/user/company_info/edit.vue

@@ -3,87 +3,149 @@
     <el-form ref="editForm" :model="companyInfo">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
-          {{ $t1('查看组织信息') }}
+          <i class="el-icon-info" />
+          {{ $t1("查看组织信息") }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
           </el-button>
         </div>
       </div>
       <div class="d-cont">
         <div class="d-item">
-          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+          <div class="title first">
+            <b>{{ $t1("基本信息") }}</b>
+          </div>
           <table class="table-detail">
             <tbody>
-            <tr>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织全称') }}
-              </th>
-              <td>
-                <el-form-item prop="companyName" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="companyInfo.companyName" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织简称') }}
-              </th>
-              <td>
-                <el-form-item prop="simpleName" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="companyInfo.simpleName" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织编码') }}
-              </th>
-              <td>{{ companyInfo.companyCode }}</td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('组织默认首页') }}
-              </th>
-              <td colspan="3">
-                <el-form-item prop="defaultHomePage" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="companyInfo.defaultHomePage" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织唯一标志') }}
-              </th>
-              <td colspan="3">{{ companyInfo.uniqueIdentify }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t1('备注') }}</th>
-              <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                          v-model="companyInfo.note"
-                          clearable></el-input>
-              </td>
-            </tr>
-            <tr>
-              <th>logo</th>
-              <td colspan="5">
-                <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="companyInfo.logoUrl"
-                            dataType="medium"></baseUpload>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('创建人') }}</th>
-              <td>{{ companyInfo.createBy }}</td>
-              <th>{{ $t1('创建时间') }}</th>
-              <td>{{ companyInfo.createDate }}</td>
-              <th>{{ $t1('更新人') }}</th>
-              <td>{{ companyInfo.modifyBy }}</td>
-              <th>{{ $t1('更新时间') }}</th>
-              <td>{{ companyInfo.modifyDate }}</td>
-            </tr>
+              <tr></tr>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织全称") }}
+                </th>
+                <td>
+                  <el-form-item
+                    prop="companyName"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.companyName"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织简称") }}
+                </th>
+                <td>
+                  <el-form-item
+                    prop="simpleName"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.simpleName"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织编码") }}
+                </th>
+                <td>{{ companyInfo.companyCode }}</td>
+              </tr>
+              <tr></tr>
+              <tr>
+                <th>
+                  {{ $t1("组织默认首页") }}
+                </th>
+                <td colspan="3">
+                  <el-form-item
+                    prop="defaultHomePage"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.defaultHomePage"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>{{ $t1("环境编码") }}</th>
+                <td>
+                  <el-form-item prop="envCode">
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="companyInfo.envCode"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="companyInfo.note"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>logo</th>
+                <td colspan="5">
+                  <baseUpload
+                    :limit="1"
+                    accept="image/png, image/jpeg"
+                    multi="false"
+                    :file.sync="companyInfo.logoUrl"
+                    dataType="medium"
+                  ></baseUpload>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织唯一标志") }}
+                </th>
+                <td colspan="3">{{ companyInfo.uniqueIdentify }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1("创建人") }}</th>
+                <td>{{ companyInfo.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ companyInfo.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ companyInfo.modifyBy }}</td>
+                <th>{{ $t1("更新时间") }}</th>
+                <td>{{ companyInfo.modifyDate }}</td>
+              </tr>
             </tbody>
           </table>
         </div>
@@ -94,7 +156,7 @@
 
 <script>
 export default {
-  name: 'company_info:view',
+  name: "company_info:view",
   components: {},
   data() {
     return {
@@ -102,11 +164,10 @@ export default {
       isEdit: false,
       companyInfo: {},
       showAreaDialog: false,
-      activeName: 'first'
+      activeName: "first",
     };
   },
-  created() {
-  },
+  created() {},
   mounted() {
     this.getData();
   },
@@ -114,43 +175,43 @@ export default {
     getData() {
       this.isEdit = true;
       this.$commonHttp({
-        url: USER_PREFIX + '/company_info/getCurrent',
+        url: USER_PREFIX + "/company_info/getCurrent",
         method: `post`,
         isLoading: true,
         modalStrictly: true,
-        success: res => {
+        success: (res) => {
           this.companyInfo = res.objx || {};
-        }
+        },
       });
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + '/company_info/update';
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
+            var url = USER_PREFIX + "/company_info/update";
             this.$http({
               url: url,
               method: `post`,
               data: this.companyInfo,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 if (this.isEdit) {
                   //更新
                   this.$message({
                     message: res.content,
-                    type: 'success',
+                    type: "success",
                     duration: 500,
-                    onClose: t => {
+                    onClose: (t) => {
                       this.$baseReload();
-                    }
+                    },
                   });
                 }
-              }
+              },
             });
           });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/country/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <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">{{
                   $t1('搜索')

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

@@ -19,7 +19,7 @@
                 </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">
                     {{ $t1('搜索') }}

package/src/views/user/data_type_setting/dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <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">
                 {{ $t1('搜索') }}

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

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <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">
                 {{ $t1('搜索') }}
@@ -51,6 +51,7 @@
                 <el-select v-model="formData.dsType" clearable>
                   <el-option :value="0" label="mysql"></el-option>
                   <el-option :value="1" label="oracle"></el-option>
+						      <el-option :value="2" label="doris"></el-option>
                 </el-select>
               </template>
             </vxe-form-item>
@@ -156,6 +157,8 @@ export default {
                   return 'mysql';
                 } else if (row.dsType === 1) {
                   return 'oracle';
+                } else if (row.dsType === 2) {
+                  return 'doris';
                 }
               }
             }

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

@@ -61,11 +61,12 @@
                 <em class="f-red">*</em>
                 {{ $t1('数据源类型') }}
               </th>
-              <td>
+              <td colspan="3">
                 <el-form-item prop="dsType" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="dataSource.dsType">
                     <el-radio :label="0">mysql</el-radio>
                     <el-radio :label="1">oracle</el-radio>
+                    <el-radio :label="2">doris</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>

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

@@ -24,7 +24,7 @@
                 </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">
                     {{ $t1('搜索') }}
@@ -48,6 +48,7 @@
                     <el-select v-model="formData.dsType" clearable>
                       <el-option :value="0" label="mysql"></el-option>
                       <el-option :value="1" label="oracle"></el-option>
+                      <el-option :value="2" label="doris"></el-option>
                     </el-select>
                   </template>
                 </vxe-form-item>
@@ -133,6 +134,8 @@ export default {
                   return 'mysql';
                 } else if (row.dsType === 1) {
                   return 'oracle';
+                } else if (row.dsType === 2) {
+                  return 'doris';
                 }
               }
             }

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

@@ -29,10 +29,10 @@
                         :rules="[{ required: false, trigger: 'blur' }]" class="block">
             <el-input type="textarea" :rows="2" v-model="fieldTranslation[item.translationField]" clearable/>
           </el-form-item>
-          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
+<!--          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
                         class="block">
             <langTagView v-model="fieldTranslation.fieldTranslationTagDTOs" :readonly="!isDev"></langTagView>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item :label="$t1('创建时间')" prop="createDate" :rules="[{ required: false, trigger: 'blur' }]">
             <span>{{ fieldTranslation.createDate }}</span>
           </el-form-item>
@@ -53,23 +53,23 @@
       </el-button>
     </span>
     </el-dialog>
-    <langTagDialog v-if="showLangTagDialog"
+<!--    <langTagDialog v-if="showLangTagDialog"
                    :visiable.sync="showLangTagDialog"
                    @confirm="confirmLangTagDialog"
                    :multi="true"
                    :rows="fieldTranslationTagDTOs"
-                   fieldKey="tagCode"></langTagDialog>
+                   fieldKey="tagCode"></langTagDialog>-->
   </div>
 </template>
 
 <script>
 import {getBdFlag} from "@base/api/user";
-import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
-import langTagView from "@base/components/langTag/view.vue";
+/*import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+import langTagView from "@base/components/langTag/view.vue";*/
 
 
 export default {
-  components: {langTagDialog, langTagView},
+  components: {/*langTagDialog, langTagView*/},
   props: {
     _dataId: [String, Number],
     currentDataType: Object
@@ -116,7 +116,7 @@ export default {
     this.initLanguageSetting();
   },
   mounted() {
-    this.getBdEnv();
+    // this.getBdEnv();
     this.getData();
   },
   methods: {

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

@@ -46,12 +46,12 @@
                     <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
                                 v-if="isDev">{{ $t1('导出发布') }}
                     </vxe-button>
-                    <langTagAddButton :option="addProjectTagOption" v-if="isDev"></langTagAddButton>
-                    <langTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></langTagDeleteButton>
+                    <!--                    <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('重置') }}
+                                plain>{{ $t1('刷新') }}
                     </vxe-button>
                     <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                       {{ $t1('搜索') }}
@@ -64,29 +64,29 @@
                       </template>
                     </vxe-form-item>
                   </template>
-                  <template #tag>
-                    <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
-                      <template v-slot>
-                        <el-input
-                          class="search-input"
-                          max="200"
-                          :value="getTabNames()"
-                          @clear="
-                            checkTags = [];
-                          "
-                          v-el-readonly
-                          clearable
-                        >
-                          <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
-                        </el-input>
-                      </template>
-                    </vxe-form-item>
-                  </template>
+                  <!--                  <template #tag>
+                                      <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
+                                        <template v-slot>
+                                          <el-input
+                                            class="search-input"
+                                            max="200"
+                                            :value="getTabNames()"
+                                            @clear="
+                                              checkTags = [];
+                                            "
+                                            v-el-readonly
+                                            clearable
+                                          >
+                                            <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
+                                          </el-input>
+                                        </template>
+                                      </vxe-form-item>
+                                    </template>-->
                 </tableForm>
               </template>
-              <template #tag="{row}">
-                <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
-              </template>
+              <!--              <template #tag="{row}">
+                              <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
+                            </template>-->
             </vxe-grid>
           </div>
         </div>
@@ -95,11 +95,11 @@
     <fieldTranslationEditDialog v-if="showFieldTranslationEditDialog" :visiable.sync="showFieldTranslationEditDialog"
                                 :_dataId.sync="dataId" :currentDataType="currentDataType"
                                 @confirm="confirmFieldTranslationEditDialog"></fieldTranslationEditDialog>
-    <langTagDialog v-if="showLangTagDialog3"
+<!--    <langTagDialog v-if="showLangTagDialog3"
                    :visiable.sync="showLangTagDialog3"
                    @confirm="confirmLangTagDialog3"
                    :rows="checkTags"
-                   :multi="true"></langTagDialog>
+                   :multi="true"></langTagDialog>-->
   </div>
 </template>
 
@@ -108,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 langTagDialog from "../../../views/user/lang_tag/dialog.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";
+import langTagView from "@base/components/langTag/view.vue";*/
 
 export default {
   name: 'fieldTranslation:list',
   components: {
-    langTagView,
-    langTagDialog, tableForm, fieldTranslationEditDialog, langTagAddButton, langTagDeleteButton
+    tableForm, fieldTranslationEditDialog/*, langTagView,
+    langTagDialog, langTagAddButton, langTagDeleteButton*/
   },
   data() {
     return {
@@ -191,7 +191,7 @@ export default {
       }
     });*/
     await this.initLanguageSetting();
-    this.getBdEnv();
+    // this.getBdEnv();
     this.initTableList();
   },
   methods: {
@@ -284,7 +284,7 @@ export default {
               }
             }
           },
-          {
+          /*{
             title: this.$t1('多语言标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.fieldTranslationTagDTOs) {
@@ -292,7 +292,7 @@ export default {
                 }
               }
             }
-          },
+          },*/
           {
             field: 'modifyDate',
             title: this.$t1('更新时间'),
@@ -337,7 +337,7 @@ export default {
           },
           {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"},
+          // {title: this.$t1('多语言标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {

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

@@ -20,7 +20,7 @@
                 </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">
                     {{ $t1('搜索') }}

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

@@ -31,7 +31,7 @@
                 </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">
                     {{ $t1('搜索') }}

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

@@ -28,7 +28,7 @@
                   </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">
                       {{ $t1('搜索') }}