cloud-web-corejs 1.0.54-dev.276 → 1.0.54-dev.278

package/package.json

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

package/src/components/excelExport/mixins.js

@@ -98,7 +98,7 @@ function getGrid(that, tableRef) {
 
     },
     mounted() {
-      this.exc();
+      // this.exc();
     },
     beforeDestroy() {
       this.clearExportTimer()

package/src/components/xform/form-designer/form-widget/container-widget/detail-widget.vue

@@ -13,12 +13,12 @@
                      :index-of-parent-list="indexOfParentList" :class="widget.options.isFullscreen ? 'full-height':''">
     <div class="detail-wrap grid-container" :key="widget.id"
          :class="{'selected': selected}" @click.stop="selectWidget(widget)">
-        <div class="d-header clearfix">
-          <div class="fl">
+        <div class="d-header clearfix" style="height: auto;">
+          <div class="fl" style="width: 20%;overflow: hidden;height: 40px;">
             <i class="el-icon-info"/>
             {{ widget.options.label }}
           </div>
-          <div class="fr">
+          <div class="fr" style="overflow: auto;">
             <div class="grid-cell">
               <draggable
                 :list="widget.widgetList"

package/src/components/xform/form-designer/form-widget/field-widget/copy_button-widget.vue

@@ -74,7 +74,10 @@
     methods: {
       clickHandle(){
         if(this.designState || this.field.options.disabled)return
-        this.getFormRef().openCopyEditTab();
+        let copyData = this.$baseLodash.cloneDeep(this.formModel);
+
+        this.handleCustomEvent(this.field.options.copyDataHandle, ["copyData"], [copyData])
+        this.getFormRef().openCopyEditTab(copyData);
       }
     }
 

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

@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-form-item label="复制数据处理" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('copyDataHandle', copyDataHandleParams)">
+        <span>{{ optionModel.copyDataHandle }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+  import eventMixin
+    from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+  export default {
+    name: "copyButton-editor",
+    mixins: [i18n,eventMixin],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+    data(){
+      return {
+        copyDataHandleParams: ["dataId", "formCode", "copyData"]
+      }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -80,6 +80,7 @@ const COMMON_PROPERTIES = {
   'echarBarOption': 'echart-bar-editor', //柱状图
   'echarCategoryOption': 'echart-category-editor', //折线图
   'vabSearchName': 'vabSearchName-editor',
+  'copyButton': 'copyButton-editor',
 
   //容器
   'showBlankRow': 'showBlankRow-editor',

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3595,6 +3595,7 @@ export const businessFields = [
       onCreated: "",
       onMounted: "",
       copyButton: true,
+      copyDataHandle: "",
       ...defaultWfConfig,
       ...defaultWidgetShowRuleConfig,
       hiddenByWf: true,

package/src/components/xform/form-render/indexMixin.js

@@ -2495,6 +2495,9 @@ modules = {
     getFormRef(){
       return this;
     },
+    isObject(value) {
+      return Object.prototype.toString.call(value) === "[object Object]";
+    },
     openCopyEditTab(copyData){
       let formData = this.$baseLodash.cloneDeep(copyData || this.formDataModel);
 
@@ -2505,24 +2508,25 @@ modules = {
             handleData(item)
           })
           return
+        }else if(this.isObject(data)){
+          data.id = null;
+          data.create_by = null;
+          data.create_date = null;
+          data.modify_by = null;
+          data.modify_date = null;
+          delete data.head_table_id;
+          delete data.objectForeignId
+          if(data.createBy)data.createBy
+          if(data.createDate)data.createDate
+          if(data.modifyBy)data.modifyBy
+          if(data.modifyDate)data.modifyDate
+          Object.keys(data).forEach((key)=>{
+            let value = data[key]
+            if(value && Array.isArray(value)){
+              handleData(value);
+            }
+          })
         }
-        data.id = null;
-        data.create_by = null;
-        data.create_date = null;
-        data.modify_by = null;
-        data.modify_date = null;
-        delete data.head_table_id;
-        delete data.objectForeignId
-        if(data.createBy)data.createBy
-        if(data.createDate)data.createDate
-        if(data.modifyBy)data.modifyBy
-        if(data.modifyDate)data.modifyDate
-        Object.keys(data).forEach((key)=>{
-          let value = data[key]
-          if(value && Array.isArray(value)){
-            handleData(value);
-          }
-        })
       }
       if(formData){
         handleData(formData)

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

@@ -22,14 +22,22 @@
                 <td>{{ pushData.id }}</td>
                 <th>{{ $t1('任务编码') }}</th>
                 <td>{{ pushData.taskCode }}</td>
+                <th>{{ $t1('业务方产生时间点') }}</th>
+                <td>{{ pushData.generateDate }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('组织编码') }}</th>
+                <td>{{ pushData.callbackCompanyCode }}</td>
                 <th>{{ $t1('数据唯一标识') }}</th>
                 <td colspan="3">{{ pushData.sid }}</td>
               </tr>
               <tr>
-                <th>{{ $t1('业务方产生时间点') }}</th>
-                <td>{{ pushData.generateDate }}</td>
                 <th>{{ $t1('业务数据标识') }}</th>
-                <td>{{ pushData.transfer }}</td>
+                <td colspan="7">{{ pushData.transfer }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('推送数据') }}</th>
+                <td colspan="7">{{ pushData.data }}</td>
               </tr>
               <tr>
                 <th>{{ $t1('冗余字段1') }}</th>
@@ -49,18 +57,6 @@
                 <th>{{ $t1('备注') }}</th>
                 <td colspan="7">{{ pushData.remark }}</td>
               </tr>
-              <tr>
-                <th>{{ $t1('推送数据') }}</th>
-                <td colspan="7">{{ pushData.data }}</td>
-              </tr>
-              <tr>
-                <th>{{ $t1('回传的数据类型') }}</th>
-                <td>{{ pushData.callbackDataType }}</td>
-                <th>{{ $t1('回传的单据数据编码或ID') }}</th>
-                <td>{{ pushData.callbackCode }}</td>
-                <th>{{ $t1('回传的组织编码') }}</th>
-                <td>{{ pushData.callbackCompanyCode }}</td>
-              </tr>
               <tr>
                 <th>{{ $t1('服务名') }}</th>
                 <td colspan="7">{{ pushData.serverName }}</td>
@@ -70,6 +66,10 @@
                 <td>{{ pushData.createBy }}</td>
                 <th>{{ $t1('创建时间') }}</th>
                 <td>{{ pushData.createDate }}</td>
+                <th class="no"></th>
+                <td></td>
+                <th class="no"></th>
+                <td></td>
               </tr>
               </tbody>
             </table>

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

@@ -23,7 +23,7 @@
           <template v-slot>
             <el-select v-model="serverName">
               <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
-                         :label="serviceId"></el-option>
+                         :label="serviceId" @change="searchEvent"></el-option>
             </el-select>
           </template>
         </vxe-form-item>
@@ -211,25 +211,15 @@ export default {
             width: 150
           },
           {
-            title: '备注',
-            field: 'remark',
-            width: 200
-          },
-          {
-            title: '回传的数据类型',
-            field: 'callbackDataType',
+            title: '组织编码',
+            field: 'callbackCompanyCode',
             width: 150
           },
           {
-            title: '回传的单据数据编码或ID',
-            field: 'callbackCode',
+            title: '备注',
+            field: 'remark',
             width: 200
           },
-          {
-            title: '回传的组织编码',
-            field: 'callbackCompanyCode',
-            width: 150
-          },
           {
             field: 'createBy',
             title: this.$t1('创建人'),

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

@@ -22,14 +22,22 @@
                 <td>{{ pushDataH.id }}</td>
                 <th>{{ $t1('任务编码') }}</th>
                 <td>{{ pushDataH.taskCode }}</td>
+                <th>{{ $t1('业务方产生时间点') }}</th>
+                <td>{{ pushDataH.generateDate }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('组织编码') }}</th>
+                <td>{{ pushDataH.callbackCompanyCode }}</td>
                 <th>{{ $t1('数据唯一标识') }}</th>
                 <td colspan="3">{{ pushDataH.sid }}</td>
               </tr>
               <tr>
-                <th>{{ $t1('业务方产生时间点') }}</th>
-                <td>{{ pushDataH.generateDate }}</td>
                 <th>{{ $t1('业务数据标识') }}</th>
-                <td>{{ pushDataH.transfer }}</td>
+                <td colspan="7">{{ pushDataH.transfer }}</td>
+              </tr>
+              <tr>
+                <th>{{ $t1('推送数据') }}</th>
+                <td colspan="7">{{ pushDataH.data }}</td>
               </tr>
               <tr>
                 <th>{{ $t1('冗余字段1') }}</th>
@@ -49,18 +57,6 @@
                 <th>{{ $t1('备注') }}</th>
                 <td colspan="7">{{ pushDataH.remark }}</td>
               </tr>
-              <tr>
-                <th>{{ $t1('推送数据') }}</th>
-                <td colspan="7">{{ pushDataH.data }}</td>
-              </tr>
-              <tr>
-                <th>{{ $t1('回传的数据类型') }}</th>
-                <td>{{ pushDataH.callbackDataType }}</td>
-                <th>{{ $t1('回传的单据数据编码或ID') }}</th>
-                <td>{{ pushDataH.callbackCode }}</td>
-                <th>{{ $t1('回传的组织编码') }}</th>
-                <td>{{ pushDataH.callbackCompanyCode }}</td>
-              </tr>
               <tr>
                 <th>{{ $t1('服务名') }}</th>
                 <td colspan="7">{{ pushDataH.serverName }}</td>
@@ -70,6 +66,10 @@
                 <td>{{ pushDataH.createBy }}</td>
                 <th>{{ $t1('创建时间') }}</th>
                 <td>{{ pushDataH.createDate }}</td>
+                <th class="no"></th>
+                <td></td>
+                <th class="no"></th>
+                <td></td>
               </tr>
               </tbody>
             </table>

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

@@ -21,7 +21,7 @@
                 @submit="searchEvent" @reset="searchEvent">
         <vxe-form-item :title="$t1('服务名')+':'">
           <template v-slot>
-            <el-select v-model="serverName">
+            <el-select v-model="serverName" @change="searchEvent">
               <el-option v-for="(serviceId,index) in serviceIds" :key="index" :value="serviceId"
                          :label="serviceId"></el-option>
             </el-select>
@@ -221,29 +221,15 @@ export default {
             width: 150
           },
           {
-            title: '备注',
-            field: 'remark',
-            width: 200
-          },
-          {
-            title: '回传的数据类型',
-            field: 'callbackDataType',
+            title: '组织编码',
+            field: 'callbackCompanyCode',
             width: 150
           },
           {
-            title: '回传的单据数据编码或ID',
-            field: 'callbackCode',
+            title: '备注',
+            field: 'remark',
             width: 200
           },
-          {
-            title: '回传的组织编码',
-            field: 'callbackCompanyCode',
-            width: 150
-          },
-
-
-
-
           {
             field: 'createBy',
             title: this.$t1('创建人'),