cloud-web-corejs 1.0.54-dev.264 → 1.0.54-dev.265

package/package.json

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

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -968,6 +968,8 @@ modules = {
         if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {
           done();
         }
+      } else {
+        done();
       }
     },
     handleAddTableDataEvent(flag) {

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

@@ -1,17 +1,15 @@
 <template>
   <div class="detail-wrap">
-    <el-form ref="editForm" :model="requestAsyncSetting">
+    <el-form ref="editForm" :model="pushData">
       <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">
             {{ $t1('重置') }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
-          </el-button>
         </div>
       </div>
       <baseTabs>
@@ -20,161 +18,38 @@
             <table class="table-detail">
               <tbody>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('推送编码') }}
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="reqCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.reqCode" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('任务编码') }}</th>
+                <td>{{ pushData.taskCode }}</td>
+                <th>{{ $t1('服务名') }}</th>
+                <td>{{ pushData.serverName }}</td>
+                <th>{{ $t1('操作对象') }}</th>
+                <td>{{ pushData.code }}</td>
+                <th>{{ $t1('产生日志时间') }}</th>
+                <td>{{ pushData.operDate }}</td>
               </tr>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('推送名称') }}
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="reqName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.reqName" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('冗余字段1') }}</th>
+                <td>{{ pushData.field1 }}</td>
+                <th>{{ $t1('冗余字段2') }}</th>
+                <td>{{ pushData.field2 }}</td>
+                <th>{{ $t1('冗余字段3') }}</th>
+                <td>{{ pushData.field3 }}</td>
+                <th>{{ $t1('冗余字段4') }}</th>
+                <td>{{ pushData.field4 }}</td>
               </tr>
               <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('执行组织编码') }}
-                </th>
-                <td colspan="5">
-                  <el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.exeCompanyCode" clearable/>
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span></td>
-              </tr>
-
-<!--              <tr>
-                <th>
-                  {{ $t1('连接超时(ms)') }}
-                </th>
-                <td>
-                  <el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
-                    <base-input-number v-model="requestAsyncSetting.connectTimeout" clearable/>
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认10000毫秒') }}</span></td>
-                <th>
-                  {{ $t1('读取超时(ms)') }}
-                </th>
-                <td>
-                  <el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
-                    <base-input-number v-model="requestAsyncSetting.readTimeout" clearable/>
-                  </el-form-item>
-                </td>
-                <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认60000毫秒') }}</span></td>
-              </tr>-->
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('是否启用') }}
-                </th>
-                <td>
-                  <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-radio-group v-model="requestAsyncSetting.enabled">
-                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
-                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </td>
-
-              </tr>
-              <tr>
-                <th>
-                  {{ $t1('备注') }}
-                </th>
-                <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="requestAsyncSetting.remark"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-
-              <tr>
+                <th>{{ $t1('冗余字段5') }}</th>
+                <td>{{ pushData.field5 }}</td>
+                <th>{{ $t1('服务名') }}</th>
+                <td>{{ pushData.serverName }}</td>
                 <th>{{ $t1('创建人') }}</th>
-                <td>{{ requestAsyncSetting.createBy }}</td>
+                <td>{{ pushData.createBy }}</td>
                 <th>{{ $t1('创建时间') }}</th>
-                <td>{{ requestAsyncSetting.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ requestAsyncSetting.modifyBy }}</td>
-                <th>{{ $t1('更新时间') }}</th>
-                <td>{{ requestAsyncSetting.modifyDate }}</td>
+                <td>{{ pushData.createDate }}</td>
               </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-        <baseTabPane :label="$t1('数据组合脚本')">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
               <tr>
-                <tr>
-                  <th>
-                    {{ $t1('脚本') }}
-                    <scriptTestButton :script.sync="requestAsyncSetting.script"></scriptTestButton>
-                  </th>
-                  <td colspan="7">
-                    <el-form-item prop="postScript" :rules="[{ required: false, trigger: 'blur' }]">
-                      <code-editor mode="java" :readonly="!1" v-model="requestAsyncSetting.script"
-                                   v-if="showCodeEditor"></code-editor>
-                    </el-form-item>
-                  </td>
-                </tr>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-        <baseTabPane :label="$t1('推送数据服务信息')">
-          <template #default>
-            <table class="table-detail">
-              <tbody>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('请求Url') }}
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.url" clearable/>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  {{ $t1('请求头') }}
-                </th>
-                <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="requestAsyncSetting.header"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('调度任务编码') }}
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="taskCode" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="requestAsyncSetting.taskCode" clearable/>
-                  </el-form-item>
-                </td>
+                <th>{{ $t1('内容') }}</th>
+                <td colspan="7">{{ pushData.content }}</td>
               </tr>
               </tbody>
             </table>
@@ -187,10 +62,10 @@
 
 <script>
 export default {
-  name: 'request_async_settingEdit',
+  name: 'push_dataEdit',
   props: {
     _dataId: [String, Number],
-    copyId: [String, Number]
+    serverName: String
   },
   components: {},
   data() {
@@ -198,7 +73,7 @@ export default {
       isEdit: false,
       tabIndex: 'first',
       dataId: '',
-      requestAsyncSetting: {
+      pushData: {
         enabled: true,
         connectTimeout: 10000,
         readTimeout: 60000,
@@ -209,6 +84,11 @@ export default {
       showCodeEditor: false
     };
   },
+  computed: {
+    current_prefix() {
+      return this.serverName ? `/${this.serverName}` : "";
+    }
+  },
   created() {
     if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
   },
@@ -217,13 +97,10 @@ export default {
   },
   methods: {
     getData() {
-      if (this.copyId) {
-        return;
-      }
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
-          url: USER_PREFIX + `/request_async_setting/get`,
+          url: this.current_prefix + `/push_data/get`,
           method: `post`,
           data: {
             id: this.dataId
@@ -231,47 +108,10 @@ export default {
           isLoading: true,
           modalStrictly: true,
           success: res => {
-            this.requestAsyncSetting = res.objx || {};
-            this.showCodeEditor = true;
+            this.pushData = res.objx || {};
           }
         });
-      } else {
-        this.showCodeEditor = true;
       }
-    },
-    saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
-        if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/request_async_setting/update` : `/request_async_setting/save`);
-            this.$http({
-              url: url,
-              method: `post`,
-              data: this.requestAsyncSetting,
-              isLoading: true,
-              success: res => {
-                this.$message({
-                  message: res.content,
-                  type: 'success',
-                  duration: 500,
-                  onClose: t => {
-                    if (this.isEdit) {
-                      this.$baseReload();
-                    } else {
-                      this.$baseReload({
-                        updateParam: {
-                          _dataId: res.objx,
-                          copyId: null
-                        }
-                      });
-                    }
-                  }
-                });
-              }
-            });
-          });
-        }
-      });
     }
   }
 };

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

@@ -19,22 +19,22 @@
       </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="reqCode">
+        <vxe-form-item :title="$t1('服务名')+':'">
           <template v-slot>
-            <el-input v-model="formData.reqCode" size="small" clearable/>
+            <el-select v-model="formData.serverName">
+              <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
+                         :label="serviceId"></el-option>
+            </el-select>
           </template>
         </vxe-form-item>
-        <vxe-form-item title="推送名称:" field="reqName">
+        <vxe-form-item :title="$t1('任务编码')+':'">
           <template v-slot>
-            <el-input v-model="formData.reqName" size="small" clearable/>
+            <el-input v-model="formData.taskCode" size="small" clearable/>
           </template>
         </vxe-form-item>
-        <vxe-form-item title="是否启用:" field="enabled">
+        <vxe-form-item :title="$t1('备注')+':'">
           <template v-slot>
-            <el-select v-model="formData.enabled" clearable>
-              <el-option :value="true" label="启用"></el-option>
-              <el-option :value="false" label="禁用"></el-option>
-            </el-select>
+            <el-input v-model="formData.remark" size="small" clearable/>
           </template>
         </vxe-form-item>
       </vxe-form>
@@ -46,7 +46,10 @@
 import editView from './edit.vue';
 
 export default {
-  name: 'request_async_setting:list',
+  name: 'push_data:list',
+  props: {
+    flag: String
+  },
   components: {editView},
   data() {
     return {
@@ -58,38 +61,63 @@ export default {
       vxeOption: {},
       formData: {},
       advancedFormData: {},
+      serviceIds: [],
+      serverName: null
     };
   },
+  computed: {
+    current_prefix() {
+      return this.serverName ? `/${this.serverName}` : "";
+    }
+  },
   mounted() {
-    this.initTableList();
+    this.getServiceIds(() => {
+      this.initTableList();
+    })
   },
   methods: {
     searchEvent() {
+      if(!this.serverName){
+        this.$baseAlert(this.$t1("请选择服务名"));
+        return
+      }
       this.$refs['table-m1'].commitProxy('reload');
     },
     resetEvent() {
+      if(!this.serverName){
+        this.$baseAlert(this.$t1("请选择服务名"));
+        return
+      }
       this.formData = {};
-      this.advancedFormData = {};
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(id) {
-      this.copyId = 0;
       this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
+      this.$emit('openEditDialog', this.dataId);
+      /*if (this.flag !== 1) {
+        this.activeName = 'first';
+        this.$openEditView('showEdit');
+      } else {
+        this.$emit('openEditDialog', this.dataId);
+      }*/
     },
     initTableList() {
       let that = this;
-      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let autoLoad = false;
+      let serviceIds = this.serviceIds || [];
+      if (serviceIds.length) {
+        this.serverName = serviceIds[0];
+        autoLoad = true;
+      }
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
-        tableName: 'bd_request_async_setting_list-m1',
-        path: USER_PREFIX + '/request_async_setting/listPage',
+        tableName: 'bd_push_data_list-m1',
+        path: this.current_prefix + '/push_data/listPage',
         param: () => {
           return {
             ...this.formData,
-            ...this.advancedFormData
+            serverName: this.serverName
           }
         },
         columns: [
@@ -232,15 +260,26 @@ export default {
             }
           }
         ],
-        config:{
+        config: {
           proxyConfig: {
-            autoLoad: false
+            autoLoad: autoLoad
           }
         }
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         this.vxeOption = opts;
       });
+    },
+    getServiceIds(callback) {
+      this.$http({
+        url: USER_PREFIX + `/wf_obj_config/wfServiceIds`,
+        method: `post`,
+        data: {},
+        success: res => {
+          this.serviceIds = res.objx || [];
+          callback && callback()
+        }
+      });
     }
   }
 };

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

@@ -2,8 +2,8 @@
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :copyId.sync="copyId"
-                  :parent-target="_self" @reload="$reloadHandle"></editView>
+        <component v-if="showEdit" visible-key="showEdit" :is="editComponentName" :_dataId.sync="dataId"
+                  :parent-target="_self" @reload="$reloadHandle"></component>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
@@ -50,22 +50,24 @@
           </vxe-grid>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t1('在途推送数据')" name="third">
+<!--      <el-tab-pane :label="$t1('在途推送数据')" name="pushData">
         <div class="grid-height">
-          <push_data_list></push_data_list>
+          <push_data_list :flag="1" @openEditDialog="openPushDataEditView"></push_data_list>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t1('历史推送数据')" name="fourth">
+      <el-tab-pane :label="$t1('历史推送数据')" name="pushDataH">
         <div class="grid-height">
-          <push_data_h_list></push_data_h_list>
+          <push_data_h_list :flag="1" @openEditDialog="openPushDataHEditView"></push_data_h_list>
         </div>
-      </el-tab-pane>
+      </el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
 
 <script>
 import editView from './edit.vue';
+import push_data_edit from "../push_data/edit.vue";
+import push_data_h_edit from "../push_data_h/edit.vue";
 import push_data_list from "../push_data/list.vue";
 import push_data_h_list from "../push_data_h/list.vue";
 
@@ -83,6 +85,7 @@ export default {
       vxeOption: {},
       formData: {},
       advancedFormData: {},
+      editComponentName:null
     };
   },
   mounted() {
@@ -100,6 +103,19 @@ export default {
     openEditDialog(id) {
       this.copyId = 0;
       this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.editComponentName = "editView"
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    openPushDataEditView(id){
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.editComponentName = "push_data_edit"
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    openPushDataHEditView(id){
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.editComponentName = "push_data_h_edit"
       this.activeName = 'first';
       this.$openEditView('showEdit');
     },