cloud-web-corejs 1.0.54-dev.244 → 1.0.54-dev.246

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.244",
+  "version": "1.0.54-dev.246",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/setting-panel/property-editor/textFlag-editor.vue

@@ -104,12 +104,6 @@
               {{ row.serveName }}
             </template>
           </el-table-column>
-          <el-table-column label='加密规则（格式：“3*3”，“3*”，“*3”，“*”，“-”，数值表示明文位数）' width="400">
-            <template slot-scope="{row}">
-              <el-input v-model="row.encryptFormula" clearable></el-input>
-            </template>
-          </el-table-column>
-
           <el-table-column :label="i18nt('角色编码')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.roleCodes" clearable></el-input>
@@ -118,14 +112,17 @@
 
           <el-table-column :label="i18nt('设置')" width="150">
             <template slot-scope="{row}">
-              <el-select v-model="row.type" clearable>
-                <el-option :value="1" label="明文显示"></el-option>
-                <el-option :value="2" label="密文文本显示"></el-option>
-                <!--                <el-option :value="0" label="组件显示"></el-option>
-                                <el-option :value="3" label="超链接显示"></el-option>-->
+              <el-select v-model="row.type">
+                <el-option :value="1" label="明文"></el-option>
+                <el-option :value="2" label="密文"></el-option>
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label='加密规则（格式：“3*3”，“3*”，“*3”，“*”，“-”，数值表示明文位数）' width="400">
+            <template slot-scope="{row}">
+              <el-input v-model="row.encryptFormula" clearable></el-input>
+            </template>
+          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
             <template #header>
               <span>{{ i18nt('designer.setting.actionColumn') }}</span>

package/src/components/xform/form-designer/setting-panel/property-editor/widgetShowRuleFlag-editor.vue

@@ -80,7 +80,7 @@
           </el-table-column>
           <el-table-column :label="i18nt('服务名称')" width="150">
             <template slot-scope="{row}">
-              {{row.serveName}}
+              {{ row.serveName }}
             </template>
           </el-table-column>
 
@@ -128,7 +128,7 @@
       </div>
     </el-dialog>
     <bdCompanyEnvDialog v-if="showBdCompanyEnvDialog" :visiable.sync="showBdCompanyEnvDialog"
-      @confirm="confirmBdCompanyEnvDialog" :multi="false"/>
+                        @confirm="confirmBdCompanyEnvDialog" :multi="false"/>
   </div>
 </template>
 <script>
@@ -148,7 +148,7 @@ export default {
     return {
       dialogVisible: false,
       tableData: [],
-      showBdCompanyEnvDialog:false
+      showBdCompanyEnvDialog: false
     }
   },
   methods: {
@@ -169,19 +169,25 @@ export default {
     },
     colSubmit() {
 
-      /*if(this.tableData.some(item=>!item.roleCodes)){
-        this.$message({
-          type:"error",
-          content:"角色编码不能为空"
-        })
-        return
-      }*/
-
-      let searveNameList = ["prod", "uat", "dev"];
       let tableData = this.tableData;
       let map = {}
+
       for (let i = 0; i < tableData.length; i++) {
         let item = tableData[i];
+        if (!item.serveName) {
+          this.$message({
+            type: "error",
+            message: "服务名称不能为空",
+          });
+          return
+        }
+        if (!item.companyCodes) {
+          this.$message({
+            type: "error",
+            message: "组织编码不能为空",
+          });
+          return
+        }
         if (!item.roleCodes) {
           this.$message({
             type: "error",
@@ -189,33 +195,25 @@ export default {
           })
           return
         }
-        if (item.serveType === 4) {
-          if (!item.serveName) {
-            this.$message({
-              type: "error",
-              message: "自定义服务的服务名称不能为空"
-            })
-            return
-          } else if(searveNameList.includes(item.serveName)){
-            this.$message({
-              type: "error",
-              message: "自定义服务的服务名称不能为`prod,uat,dev`"
-            })
-            return
-          }
+        if (!item.type) {
+          this.$message({
+            type: "error",
+            message: "设置不能为空"
+          })
+          return
         }
-        let serveName = item.serveName || "";
-        if (item.serveType === 5) serveName = "_all";
-        let companyCodes = item.companyCodes || "";
+
+        let serveName = item.serveName;
+        let companyCodes = item.companyCodes;
         let key = serveName + "_" + companyCodes;
         if (!map[key]) {
           map[key] = true;
         } else {
           this.$message({
             type: "error",
-            message: "[服务+组织]不能重复"
-          })
-          return
+            message: "[服务+组织]不能重复",
+          });
+          return;
         }
       }
 
@@ -240,16 +238,16 @@ export default {
       row.serveName = serveName;
     },
 
-    clearBdCompanyEnv(row){
+    clearBdCompanyEnv(row) {
       row.serveName = null;
       row.companyCodes = null;
     },
-    openBdCompanyEnvDialog(rowIndex){
+    openBdCompanyEnvDialog(rowIndex) {
       this.operateIndex = rowIndex;
       this.showBdCompanyEnvDialog = true;
     },
     confirmBdCompanyEnvDialog(rows) {
-      if(rows.length){
+      if (rows.length) {
         let row = rows[0];
         let item = this.tableData[this.operateIndex]
         item.serveName = row.bdService;

package/src/views/bd/setting/bd_company_env/dialog.vue

@@ -29,9 +29,11 @@
             </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('搜索') }}
+              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{
+                  $t1('搜索')
+                }}
               </vxe-button>
             </template>
           </tableForm>
@@ -49,7 +51,7 @@
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ getCheckLabel(checkRow,'name') }}</p>
+          <p>{{ getCheckLabel(checkRow, 'name') }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>
@@ -98,6 +100,7 @@ export default {
   methods: {
     initTableM1() {
       let that = this;
+      let bdServiceMap = {"dev": this.$t1("测试"), "uat": this.$t1("UAT"), "prod": this.$t1("正式")};
       let url = USER_PREFIX + '/bd_company_env/listPage';
       let tableOption = {
         vue: that,
@@ -112,16 +115,20 @@ export default {
         columns: [
           {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
           {
-            title: '服务',
+            title: this.$t1('服务'),
             field: 'bdService',
             width: 150,
-            fixed: 'left'
+            fixed: 'left',
+            slots: {
+              default: ({row}) => {
+                return bdServiceMap[row.bdService] || "";
+              }
+            }
           },
           {
-            title: '组织编码',
+            title: this.$t1('组织编码'),
             field: 'bdCompanyCode',
             width: 150,
-            fixed: 'left'
           },
           {
             width: 47,
@@ -132,10 +139,11 @@ export default {
         ],
         searchColumns: [
           {
-            title: this.$t1("服务"),
-            field: "bdService",
-            type: "input",
-            common: true,
+            title: this.$t1('服务'), field: "bdService", type: "select", common: true, itemOption: [
+              {label: this.$t1("测试"), value: "dev"},
+              {label: this.$t1("UAT"), value: "uat"},
+              {label: this.$t1("正式"), value: "prod"}
+            ]
           },
           {
             title: this.$t1("组织编码"),

package/src/views/bd/setting/bd_company_env/edit.vue

@@ -26,7 +26,11 @@
               </th>
               <td>
                 <el-form-item prop="bdService" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="bdCompanyEnv.bdService" clearable/>
+                  <el-select v-model="bdCompanyEnv.bdService">
+                    <el-option value="dev" :label="$t1('测试')"></el-option>
+                    <el-option value="uat" :label="$t1('UAT')"></el-option>
+                    <el-option value="prod" :label="$t1('正式')"></el-option>
+                  </el-select>
                 </el-form-item>
               </td>
               <th>
@@ -76,7 +80,7 @@ export default {
         readTimeout: 60000,
         preScript: null,
         postScript: null,
-        exeCompanyCode:null
+        exeCompanyCode: null
       },
       showCodeEditor: false
     };

package/src/views/bd/setting/bd_company_env/list.vue

@@ -12,15 +12,18 @@
             <template #form>
               <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
                 <template #buttonLeft>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
                   </vxe-button>
-                  <base-table-export :option="{ title: '企业组织环境设置导出', targetRef: 'table-m1'}" :parent-target="_self"/>
+                  <base-table-export :option="{ title: '企业组织环境设置导出', targetRef: 'table-m1'}"
+                                     :parent-target="_self"/>
                 </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('搜索') }}
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{ $t1('搜索') }}
                   </vxe-button>
                 </template>
               </tableForm>
@@ -68,7 +71,7 @@ export default {
     },
     initTableList() {
       let that = this;
-      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let bdServiceMap = {"dev": this.$t1("测试"), "uat": this.$t1("UAT"), "prod": this.$t1("正式")};
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -82,16 +85,20 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '服务',
+            title: this.$t1('服务'),
             field: 'bdService',
             width: 150,
-            fixed: 'left'
+            fixed: 'left',
+            slots: {
+              default: ({row}) => {
+                return bdServiceMap[row.bdService] || "";
+              }
+            }
           },
           {
-            title: '组织编码',
+            title: this.$t1('组织编码'),
             field: 'bdCompanyCode',
             width: 150,
-            fixed: 'left'
           },
           {
             field: 'createBy',
@@ -129,7 +136,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>
@@ -142,10 +149,11 @@ export default {
         ],
         searchColumns: [
           {
-            title: this.$t1("服务"),
-            field: "bdService",
-            type: "input",
-            common: true,
+            title: this.$t1('服务'), field: "bdService", type: "select", common: true, itemOption: [
+              {label: this.$t1("测试"), value: "dev"},
+              {label: this.$t1("UAT"), value: "uat"},
+              {label: this.$t1("正式"), value: "prod"}
+            ]
           },
           {
             title: this.$t1("组织编码"),