cloud-web-corejs 1.0.54-dev.245 → 1.0.54-dev.247

package/package.json

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

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t1('企业组织环境设置列表')"
+    :title="$t1('组织环境设置列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -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,25 @@ 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'
+          },
+          {
+            title: this.$t1('组织备注'),
+            field: 'bdCompanyRemark',
+            width: 150,
           },
           {
             width: 47,
@@ -132,10 +144,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

@@ -4,7 +4,7 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看企业组织环境设置') : $t1('新增企业组织环境设置') }}
+          {{ dataId ? $t1('查看组织环境设置') : $t1('新增组织环境设置') }}
         </div>
         <div class="fr">
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
@@ -27,9 +27,9 @@
               <td>
                 <el-form-item prop="bdService" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-select v-model="bdCompanyEnv.bdService">
-                    <el-option value="dev" label="DEV"></el-option>
-                    <el-option value="uat" label="UAT"></el-option>
-                    <el-option value="prod" label="PROD"></el-option>
+                    <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>
@@ -43,6 +43,14 @@
                 </el-form-item>
               </td>
             </tr>
+            <tr>
+              <th>{{ $t1('组织备注') }}</th>
+              <td colspan="5">
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="bdCompanyEnv.bdCompanyRemark"
+                          clearable></el-input>
+              </td>
+            </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
               <td>{{ bdCompanyEnv.createBy }}</td>
@@ -80,7 +88,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,16 @@
             <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"/>
                 </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 +69,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 +83,25 @@ 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'
+          },
+          {
+            title: this.$t1('组织备注'),
+            field: 'bdCompanyRemark',
+            width: 150,
           },
           {
             field: 'createBy',
@@ -129,7 +139,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>
@@ -141,17 +151,11 @@ export default {
           }
         ],
         searchColumns: [
-          /*{
-            title: this.$t1("服务"),
-            field: "bdService",
-            type: "input",
-            common: true,
-          },*/
           {
             title: this.$t1('服务'), field: "bdService", type: "select", common: true, itemOption: [
-              {label: "DEV", value: "dev"},
-              {label: "UAT", value: "uat"},
-              {label: "PROD", value: "prod"}
+              {label: this.$t1("测试"), value: "dev"},
+              {label: this.$t1("UAT"), value: "uat"},
+              {label: this.$t1("正式"), value: "prod"}
             ]
           },
           {

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

@@ -30,7 +30,7 @@ export default {
       typeTabs: [
         {label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true},
         {label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false},
-        {label: this.$t1("企业组织环境设置"), name: "bd_company_env_list", inited: false},
+        {label: this.$t1("组织环境设置"), name: "bd_company_env_list", inited: false},
       ]
     }
   },

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

@@ -62,7 +62,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>{{ checkRow.name }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>

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

@@ -44,22 +44,23 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                {{ $t1('请求Url') }}
+                {{ $t1('执行组织编码') }}
               </th>
               <td colspan="5">
-                <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="requestSetting.url" clearable/>
+                <el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="requestSetting.exeCompanyCode" clearable/>
                 </el-form-item>
               </td>
+              <td colspan="2"><span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span></td>
             </tr>
             <tr>
               <th>
                 <em class="f-red">*</em>
-                {{ $t1('执行组织编码') }}
+                {{ $t1('请求Url') }}
               </th>
-              <td colspan="5">
-                <el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="requestSetting.exeCompanyCode" clearable/>
+              <td colspan="7">
+                <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="requestSetting.url" clearable/>
                 </el-form-item>
               </td>
             </tr>
@@ -67,7 +68,7 @@
               <th>
                 {{ $t1('请求头') }}
               </th>
-              <td colspan="5">
+              <td colspan="7">
                 <el-form-item prop="header" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
                             v-model="requestSetting.header"
@@ -77,31 +78,35 @@
             </tr>
             <tr>
               <th>
-                <em class="f-red">*</em>
-                {{ $t1('是否启用') }}
+                {{ $t1('连接超时(ms)') }}
               </th>
               <td>
-                <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-radio-group v-model="requestSetting.enabled">
-                    <el-radio :label="true">{{ $t1('启用') }}</el-radio>
-                    <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
-                  </el-radio-group>
+                <el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number v-model="requestSetting.connectTimeout" clearable/>
                 </el-form-item>
               </td>
+              <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认10000毫秒') }}</span></td>
               <th>
-                {{ $t1('连接超时') }}
+                {{ $t1('读取超时(ms)') }}
               </th>
               <td>
-                <el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
-                  <base-input-number v-model="requestSetting.connectTimeout" clearable/>
+                <el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number v-model="requestSetting.readTimeout" clearable/>
                 </el-form-item>
               </td>
+              <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认60000毫秒') }}</span></td>
+            </tr>
+            <tr>
               <th>
-                {{ $t1('读取超时') }}
+                <em class="f-red">*</em>
+                {{ $t1('是否启用') }}
               </th>
               <td>
-                <el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
-                  <base-input-number v-model="requestSetting.readTimeout" clearable/>
+                <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="requestSetting.enabled">
+                    <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
+                  </el-radio-group>
                 </el-form-item>
               </td>
             </tr>
@@ -109,7 +114,7 @@
               <th>
                 {{ $t1('备注') }}
               </th>
-              <td colspan="5">
+              <td colspan="7">
                 <el-form-item prop="remark" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
                             v-model="requestSetting.remark"
@@ -117,18 +122,18 @@
                 </el-form-item>
               </td>
             </tr>
-<!--            <tr>
-              <th>
-                {{ $t1('前置脚本') }}
-                <scriptTestButton :script.sync="requestSetting.preScript"></scriptTestButton>
-              </th>
-              <td colspan="7">
-                <el-form-item prop="preScript" :rules="[{ required: false, trigger: 'blur' }]">
-                  <code-editor mode="java" :readonly="!1" v-model="requestSetting.preScript"
-                               v-if="showCodeEditor"></code-editor>
-                </el-form-item>
-              </td>
-            </tr>-->
+            <!--            <tr>
+                          <th>
+                            {{ $t1('前置脚本') }}
+                            <scriptTestButton :script.sync="requestSetting.preScript"></scriptTestButton>
+                          </th>
+                          <td colspan="7">
+                            <el-form-item prop="preScript" :rules="[{ required: false, trigger: 'blur' }]">
+                              <code-editor mode="java" :readonly="!1" v-model="requestSetting.preScript"
+                                           v-if="showCodeEditor"></code-editor>
+                            </el-form-item>
+                          </td>
+                        </tr>-->
             <tr>
               <th>
                 {{ $t1('后置脚本') }}
@@ -178,7 +183,7 @@ export default {
         readTimeout: 60000,
         preScript: null,
         postScript: null,
-        exeCompanyCode:null
+        exeCompanyCode: null
       },
       showCodeEditor: false
     };

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

@@ -14,7 +14,6 @@
                 <div class="fl">
                   <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"/>
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"