centaline-data-driven 1.2.56 → 1.2.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.56",
+  "version": "1.2.59",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "3"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/salematter/agentcontract/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -17,7 +17,8 @@
         // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
+        // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
+        apiParam:{acId:"220422141624917EB85D143D438CB8E5",actionType:3}
       }
     },
     methods: {

package/src/centaline/common/index.js

@@ -351,7 +351,7 @@ const common = {
   initFunction(f) {
     return function () {
       if (arguments.length === 0) {
-        return f($fd);
+        return f(typeof $fd!='undefined'?$fd:'');
       }
       else {
         var exStr = 'f(';

package/src/centaline/css/common.css

@@ -804,9 +804,4 @@ html {
   line-height: 26px;
 }
 
-.el-popoverabsolute{
-  position: absolute !important;
-  top: 20px !important;
-}
-
 

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -34,20 +34,20 @@
              <div>{{model.label}}</div>
              <div style="color:red;font-weight:700;">{{model.subText}}</div>             
   </el-button>
-  <el-button v-else-if="model.isCallTel" :id="model.id"
+  <el-button v-else-if="model.isCallTel"
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="clickHandle"
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    <el-popover :ref="'popover'+model.id" :append-to-body="false"
-      class="Stats-popover" :popper-class="flagAbsolute?'el-popoverabsolute':'el-popover1'" :placement="option.placement?option.placement:'left'" 
+    <el-popover 
+      class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'" 
       v-model="visible" :trigger="option.trigger?option.trigger:''">
       <div style="border-bottom:none">
         <div style="color: #388cd3;text-align: center;">{{message}}</div>
         <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
       </div>
-      <img v-if="model.imgUrl" slot="reference" :title="model.label" :src="tellImgUrl?tellImgUrl:model.imgUrl" height="24px" />
+      <img v-if="model.imgUrl" slot="reference" :title="model.label+rowindex" :src="tellImgUrl?tellImgUrl:model.imgUrl" height="24px" />
       <span v-else slot="reference">{{model.label}}</span>
     </el-popover>
   </el-button>
@@ -69,7 +69,8 @@
       vmodel: Object,
       fileData: Object,
       optionApi:String,
-      flagAbsolute:Boolean,
+      rowData: Object,
+      rowindex:Number,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -83,7 +84,7 @@
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
-          appendId: '.el-button',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+          appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
           placement: 'bottom-start',//方向，传值可查看Popper UI组件placement属性
         },
@@ -144,7 +145,7 @@
             this.tellImgUrl='';
           }
           else{
-            this.$emit('click',this.model);
+            this.$emit('click',this.model,this.rowData,this.rowindex);
           }
         }
         else{

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -1,6 +1,7 @@
 <template>
-  <div v-if="apiRouter!=={} && model && model.listData.length>0" style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
-  padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;">
+  <div v-if="apiRouter!=={} && model && model.listData.length>0"
+    style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
+    padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;width:100%">
     <div class="ct-so" style="width:auto;margin-right: 10px;">        
       <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
         <div>
@@ -18,8 +19,8 @@
       </span>
     </div>
     <div style="margin-left: 5px;display: flex;">
-      <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id" :flagAbsolute="true"
-      v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" :style="{position: router.isCallTel ?'relative':null}"
+      <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id"
+      v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" 
       :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
       </component>
     </div>

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -91,9 +91,12 @@
                     </ct-tablecurrency>
                   </div>
                   <!--可点击的列-->
-                  <ct-tablecurrency v-else-if="column.router" :align="column.attrs.align" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :router="column.router" :colValue="row[column.id]" :rowData="row"
-                                    @click="rolRouterClickHandler">
-                  </ct-tablecurrency>
+                  <div v-else-if="column.routers" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" style="display: flex;">
+                    <component v-for="(router, i) in column.routers" :key="i" :ref="'router'+router.id+rowindex" :rowData="row" :rowindex="rowindex"
+                      v-if="!router.rightField || !row[router.rightField] || row[router.rightField] == 1" 
+                      :is="router.is" :vmodel="router" :api="model.optionApi" @click="rolRouterClickHandler">
+                    </component>
+                  </div>
                   <!--正常的列-->
                   <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
                     {{row.rowHiddenColumns && row.rowHiddenColumns.includes(column.id)?"":row[column.id]}}
@@ -168,7 +171,6 @@
         this.model.scripts.formData = this.model.formData;
         this.model.scripts.formData.formTable = this.model;
         this.model.setHiddenRow();
-        console.log(this.model);
       },
       lookOwner(router) {
         var self = this; 
@@ -264,7 +266,8 @@
 
         return true;
       },
-      rolRouterClickHandler(field, rowData) {
+      rolRouterClickHandler(field, rowData,rowindex) {
+        field.rowindex=rowindex;
         var submitData = {};
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[k];
@@ -395,6 +398,15 @@
                 if(callBack){
                   callBack();
                 }
+                if(field.actionType===10){
+                  data.apiRouter=self.model.apiRouter;            
+                  data.rowMergedColumns=self.model.rowMergedColumns;
+                  self.loaderObj.ContactList(data,null,self.load);
+                  self.$forceUpdate();
+                }
+                else if(field.actionType===19){
+                  self.$refs['router'+field.id+field.rowindex][0].callTelClick(data);
+                }
               })
             }
           }

package/src/centaline/dynamicDetail/src/dynamicDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
-      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
+      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
@@ -23,6 +23,7 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      parentModel: Object,
       pageType: String,
       selectIndex:Number,
       rowCount:Number,

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -29,8 +29,8 @@
               <div>
                 <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
                 :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
-                <img src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px">
-                <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px">
+                <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px;cursor: pointer">
+                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
               </div>
               <div class="mt5">
                 <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
@@ -301,6 +301,7 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      parentModel: Object,
     },
     data() {
       return {
@@ -591,6 +592,17 @@
           clickAcion(field,submitData);
         }
       },
+      clickNextHandler() {
+        console.log(this.parentModel);
+        if(this.parentModel){
+          this.parentModel.$vue.rowKeyDownHandle(null,1);
+        }
+      },
+      clickPrevHandler() {        
+        if(this.parentModel){
+          this.parentModel.$vue.rowKeyDownHandle(null,-1);
+        }
+      },
     }
   }
 </script>

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -60,8 +60,8 @@
           <el-popover v-if="showIndex>0" ref="popover0" :append-to-table="option.appendId?option.appendId:''" 
             class="Stats-popover" popper-class="el-popover1" :placement="option.placement?option.placement:'left'" 
             :trigger="option.trigger?option.trigger:''">
-            <div class="tab-list" style="border-bottom:none">
-              <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index" 
+            <div class="tab-list" style="border-bottom:none;display: flex;flex-direction: column;">
+              <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index" style="margin-bottom: 10px;margin-left: 0px;"
                 v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
                 :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
               </component>
@@ -100,7 +100,7 @@
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
           appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
           trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
-          placement: 'right-start',//方向，传值可查看Popper UI组件placement属性
+          placement: 'left-start',//方向，传值可查看Popper UI组件placement属性
         },
       }
     },
@@ -147,9 +147,12 @@
             this.topWidth=this.$refs.main.clientWidth-140;
           }
 
-          let totalWidth=self.$refs.routers.offsetWidth;
+          let totalWidth=0;
           let sumWidth=0;
           let moreWidth = 20;
+          if(self.$refs.routers){
+            totalWidth=self.$refs.routers.offsetWidth;
+          }
           self.model.actionRoutersSimple.forEach((v,i) => {
             if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
               if(self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -13,6 +13,7 @@
                :headers="headers"
                :before-upload="beforeUploadProcess"
                :on-success="handleAvatarSuccess"
+               :on-error="handleAvatarError"
                :on-progress="uploadProcess"
                :limit="parseInt(model.max||999)"
                :on-exceed="handleExceed">
@@ -196,6 +197,14 @@
       handleAvatarSuccess(res, file, fileList) {
         this.model.handleAvatarSuccess(res, file, fileList);
       },
+      handleAvatarError(res, file, fileList) {
+        if(res.status===404){
+          let m=JSON.parse(res.message);
+          if(m.error){
+            this.$message.warning('path('+m.path+') '+m.error);
+          }
+        }
+      },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
 

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -141,6 +141,7 @@
         this.$emit('failLoad', this.model);
       },
       load(data) {
+        var self=this;
         this.$set(this, 'model', data);
         this.model.self = this;
         if (typeof this.model.scripts !== 'undefined') {
@@ -150,6 +151,14 @@
           this.model.scripts.formData.fieldsDic = this.model.fieldsDic;
         }
         this.loadFields();
+
+        if(this.model.onload){
+          let onloads=this.model.onload.split(';');
+          onloads.forEach((v, index) => {          
+            self.$common.excute.call(self.model.scripts, v);
+          });          
+        }
+
         this.loading = false;
         //通知父组件加载完成
         this.$emit('loaded', this.model);
@@ -255,8 +264,11 @@
           if (!field.isClientFuntion) {
             if (field.isSubmit) {
               let verified = true;
-              if (self.validExcute()) {
-                if (typeof field.onClick !== 'undefined') {
+              if(field.flagVerifyData){
+                verified=self.validExcute();
+              }
+              if (verified) {
+                if (field.flagVerifyData && typeof field.onClick !== 'undefined') {
                   verified = self.$common.excute.call(self.model.scripts, field.onClick);
                 }
 
@@ -294,7 +306,7 @@
                           self.parentModel.$vue.closeTabThen(data);
                         }
                       }
-                      field.disabled = false;                    
+                      field.disabled = false;
                       self.model.pageDisabled= false;
                     });
                   }
@@ -411,7 +423,7 @@
           }
         }
 
-        if (field.isSubmit && !self.validExcute()) {
+        if (field.isSubmit && field.flagVerifyData && !self.validExcute()) {
           return;
         }
 

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -20,21 +20,36 @@
               @click="viewerOpen(photoList, index)"
             >
             </el-image>
-            <span class="cover-list-item-span-delete">
+            <span
+              class="cover-list-item-span-delete"
+              v-if="!modelPhotoselect.lock"
+            >
               <i class="el-icon-delete" @click="handleRemove(index)"></i>
             </span>
-            <span class="cover-list-item-span" v-if="item.mediaLabelName">
-              <span class="el-dropdown-link">
-                &nbsp;{{ item.mediaLabelName }}
+            <span class="cover-list-item-span">
+              <span class="el-dropdown-link" v-if="item.mediaLabelName">
+                <span style="width: 80px; height: 26px; display: inline-flex;">
+                &nbsp;{{ item.mediaLabelName }} </span>
+              </span>
+              <span v-if="item.rightDefault==true||item.rightDefault=='true'"
+                :class="[
+                  item.flagDefault &&
+                  (item.flagDefault == true || item.flagDefault == 'true')
+                    ? 'checked'
+                    : 'Unchecked',
+                  'isradio',
+                ]"
+                @click="radiochecked(photoList, item)"
+              >
               </span>
             </span>
           </div>
         </li>
       </draggable>
     </ul>
-    <div 
+    <div
       class="el-upload el-upload--picture-card"
-      v-if="!modelPhotoselect.lock&&photoList.length<max"
+      v-if="!modelPhotoselect.lock && photoList.length < max"
       @click="handleOpen()"
     >
       <i class="el-icon-plus"></i>
@@ -65,7 +80,8 @@ export default {
   },
   data() {
     return {
-      max:99999, 
+      radio: "1",
+      max: 99999,
       validMessage: "",
       photoList: [],
       modelPhotoselect: {},
@@ -103,7 +119,7 @@ export default {
   methods: {
     load(data) {
       this.model = data;
-      this.max=data.max?data.max:99999;
+      this.max = data.max ? data.max : 99999;
       this.modelPhotoselect = data;
       this.photoList = data.fileList;
     },
@@ -156,7 +172,7 @@ export default {
                       }, 3000);
                       photoList = photoList.slice(0, this.modelPhotoselect.max);
                     }
-                  } 
+                  }
                   self.modelPhotoselect.setFileList(photoList);
                   self.photoList = photoList;
 
@@ -183,7 +199,15 @@ export default {
       self.$nextTick(function () {
         self.modelPhotoselect.setFileList(self.photoList);
       });
-    }, 
+    },
+    radiochecked(list, item) {
+      var self = this;
+      list.forEach((v) => {
+        v.flagDefault = false;
+      });
+      item.flagDefault = true;
+      self.modelPhotoselect.setFileList(list);
+    },
     //不能共用的数据校验
     selfValidExcute: function (eventName) {
       if (this.modelPhotoselect.required) {
@@ -275,10 +299,14 @@ export default {
   margin-right: 4px;
 }
 
-.ct-photoSelect .el-dropdown-link {
-  cursor: pointer;
-  color: #fff;
-}
+.ct-photoSelect .el-dropdown-link{
+    cursor: pointer;
+    color: #fff;
+    position: relative;
+    width: 80px;
+    height: 26px;
+    display: inline-block;
+  }
 
 .ct-photoSelect .el-icon-arrow-down {
   font-size: 12px;
@@ -306,4 +334,21 @@ export default {
 .card {
   display: inline-block;
 }
+
+.ct-photoSelect .checked {
+  background: url(../../../assets/checked.png);
+}
+.ct-photoSelect .Unchecked {
+  background: url(../../../assets/Unchecked.png);
+}
+
+.ct-photoSelect .isradio {
+  background-size: 100% 100%;
+  height: 18px;
+  width: 18px;
+  display: block;
+  cursor: pointer;
+  margin-top: 5px;
+  float: right;
+}
 </style>

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -215,12 +215,16 @@
         }
       },
       sideMenuClickHandler(v) {
+        let popoverCallTels=document.getElementsByClassName('el-popoverCallTel');
         if(v=='open'){
           this.sideBarStatus ='close';
           this.sideBarRight=-this.sideBarWidth;
           this.sideBarWidth=0;
           this.searchWidth=0;
           this.sideBarMenuRight=0;
+          for(var i=0;i<popoverCallTels.length;i++){
+            popoverCallTels[i].style.display='none';
+          }
         }
         else if(v=='close'){
           this.sideBarStatus ='open';
@@ -228,7 +232,10 @@
           this.sideBarWidth=this.$refs.table.model.sideBarWidth;
           this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           this.sideBarMenuRight=this.sideBarWidth-2;
-          this.rowClickHandle();
+          this.rowClickHandle();          
+          for(var i=0;i<popoverCallTels.length;i++){
+            popoverCallTels[i].style.display='block';
+          }
         }
       },
       closeSideHandler() {

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -110,6 +110,7 @@
                                   @click="rolRouterClickHandler">
                 </ct-tablecurrency>
 
+
                 <!--正常的列-->
                 <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">                  
                 </div>

package/src/centaline/formData/index.js

@@ -45,7 +45,6 @@ const formData = {
         var rtn1 = this.fieldsDic[id];
         if (rtn1) {
             rtn1.source[attrKey] = attrValue;
-            console.log(this.form)
             this.form.hatchHandle(id, attrKey, attrValue, rtn1);
             //this.form.hiddenHandle(rtn1);//隐藏关联的
 
@@ -231,7 +230,7 @@ const formData = {
     //获取后台数据，并返回脚本。
     execServerScript(action, object, successCallback) {
         let formData = this;//作用域保存
-debugger;
+
         //是否是行内触发的
         let data = this.getListField(this.form.scripts.$fd, null, null);
         object.editMode = data ? 1 : 0;

package/src/centaline/loader/src/ctl/Base.js

@@ -43,6 +43,9 @@ const Base = function (source) {
     get code1() {
       return source.code1;
     },
+    set code1(v) {
+      source.code1 = v;
+    },
     get value() {
       return source.code1;
     },
@@ -144,7 +147,9 @@ const Base = function (source) {
     },
     get lock() {
       return source.locked;
-      //return true;
+    },
+    set locked(v) {
+      source.locked = v;
     },
     get listBind() {
       let bind = {};

package/src/centaline/loader/src/ctl/ContactList.js

@@ -60,8 +60,8 @@ const ContactList = function (source,para ,callBack) {
           if (data.content.actionRouters) {
             data.content.actionRouters.forEach((v) => {
               var router = Router(v);
-              //router.is = "ct-btn";
-              //router.attrs = { size: "mini" }
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
               rtn._actionRouter.push(router);
             });
           }
@@ -180,8 +180,7 @@ const ContactList = function (source,para ,callBack) {
                 if (col._router !== null) {
                   return col._router;
                 }
-                //todo
-                if (typeof v.routerKey !== "undefined") {
+                if (typeof v.routerKey !== "undefined" && v.routerKey && v.routerKey.indexOf(',')===-1) {
                   let router = rtn.actionRouter.find(b => {
                     return b.id === v.routerKey;
                   });
@@ -189,6 +188,23 @@ const ContactList = function (source,para ,callBack) {
                 }
                 return null;
               },
+              _routers: null,
+              get routers() {
+                if (col._routers !== null) {
+                  return col._routers;
+                }
+                if (typeof v.routerKey !== "undefined" && v.routerKey) {
+                  col._routers=[];
+                  v.routerKey.split(',').forEach((v) => {                    
+                    let router = rtn.actionRouter.find(b => {
+                      return b.id === v;
+                    });
+                    col._routers.push(router);
+                  });
+                  return col._routers;
+                }
+                return null;
+              },
               //是否高度自适应
               get autoRowHeight() {
                 return v.autoRowHeight;

package/src/centaline/loader/src/ctl/Form.js

@@ -160,6 +160,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           }
         }
       },
+      get onload() {
+        return source.onload;
+      },
       get formData() {
         return formData;
       },

package/src/centaline/loader/src/ctl/Router.js

@@ -313,6 +313,15 @@ const Router = function (source) {
     get locked() {
       return source.locked;
     },
+    get flagVerifyData() {
+      //提交表单时是否校验数据
+      if(source.flagVerifyData!=undefined){
+        return source.flagVerifyData;
+      }
+      else{
+        return true;
+      }
+    },
   };
   return rtn;
 }

package/src/centaline/loader/src/ctl/SearchTable.js

@@ -106,7 +106,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 if (col._router !== null) {
                   return col._router;
                 }
-                //todo
                 if (typeof v.routerKey !== "undefined") {
                   let router = rtn.actionRouter.find(b => {
                     return b.id === v.routerKey;