centaline-data-driven 1.2.71 → 1.2.74

package/build/centaline/centaline.path.js

@@ -45,6 +45,7 @@ const paths = {
     "dynamicRepeat": "./src/centaline/dynamicRepeat/index.js",//重复控件
     "dynamicCompound": "./src/centaline/dynamicCompound/index.js",//复合控件
     "dynamicContact": "./src/centaline/dynamicContact/index.js",//联系人电话
+    "dynamicLayout": "./src/centaline/dynamicLayout/index.js",//Layout组件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js",//调用API插件

package/package.json

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

package/src/Form.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/salematter/agentcontract/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/salematter/squareupload/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> -->
@@ -18,7 +18,7 @@
         // 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:{acId:"220422141624917EB85D143D438CB8E5",actionType:3}
+        apiParam:{"actionType":2,"jsonData":{}}
       }
     },
     methods: {

package/src/SearchList.vue

@@ -4,14 +4,14 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/cache/getLayoutOfSearchForCache'" 
-    :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/salemattersmanage/squareuploadlist/getLayoutOfSearch'" 
+    :searchDataApi="'/salemattersmanage/squareuploadlist/getList'"></ct-searchlist>
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist>
+                   ></ct-searchlist> -->
 
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <!-- <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist> -->

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

@@ -120,7 +120,7 @@
       handleAvatarSuccess(res) {
         let self = this;
         this.$api.postThenHandler({ data: res}).then(function () {
-          self.$emit('importComplete', res);
+          self.$emit('importComplete', res,self.model);
         });
       },
       handleAvatarError(info) {

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

@@ -2,14 +2,14 @@
   <div ref="contact" 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;">        
+    <div class="ct-so" style="width:auto;margin-right: 10px;flex:1">        
       <el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
         <div>
           <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
         </div>
         <div slot="reference" readonly="readonly" ref="ct-input"
         style="font-weight: Bold;color:#333333 !important;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;display: flex;"
-        :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px',width:inputLinewidth+'px'}"
+        :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px',width:'auto'}"
         @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" v-html="model.text"
         @change="changeHandler($event)" :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"></div>
       </el-popover>
@@ -19,7 +19,7 @@
         </span>
       </span>
     </div>
-    <div ref="routers" style="margin-left: 5px;display: flex;">
+    <div ref="routers" style="margin-right: 5px;display: flex;">
       <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)">
@@ -303,7 +303,7 @@
           if (this.$refs.contact) {
             var w1 = this.$refs.contact.clientWidth | 0;
             var w2 = this.$refs.routers.clientWidth | 0;
-            this.inputLinewidth=w1-w2-50;
+            this.inputLinewidth=w1-w2-80;
           }
         });
       }, 

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

@@ -787,8 +787,15 @@
           }
           .expand-f {
             line-height: 15px;
-            font-size: 18px;
+            font-size: 16px;
             font-weight: bold;
+            img{
+              width: 15px!important;
+              margin-left: 0!important;
+            }
+            span{
+              float:right;
+            }
           }
           .info-conten {
             display: flex;

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

@@ -29,9 +29,12 @@
               <div>
                 <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default w93"
                 :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
-                <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer">
-                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.length-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;    margin-left: 15px;
-    margin-right: 13px;cursor: pointer">
+                <img v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
+                  :class="{'domDisabled':parentModel && parentModel.$refs.table && parentModel.$refs.table.model.selectIndex<=0}" 
+                  @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer">
+                <img v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
+                  :class="{'domDisabled':parentModel && parentModel.$refs.table && parentModel.$refs.table.model.listData && parentModel.$refs.table.model.selectIndex===parentModel.$refs.table.model.listData.length-1}" 
+                  @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 15px;margin-right: 13px;cursor: pointer">
               </div>
               <div class="mt5">
                 <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
@@ -107,10 +110,10 @@
                 <div class="hous-b">
                   <img :src="model.fields1Dic.ewmUrl.value" alt="" class="code-ewm">
                     <div class="info-row mb20 mt5">
-                      <div class="row-i"><span>{{model.fields1Dic.Price.label}}</span><span class="base-clolr expand-f">{{model.fields1Dic.Price.value}}</span><span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>
+                      <div class="row-i"><span>{{model.fields1Dic.Price.label}}</span><span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span><span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>
                       <img src="../../../assets/jsq.png" class="img-jsq" alt="">
                       </div>
-                      <div class="row-i"><span>{{model.fields1Dic.PriceUnit.label}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.value}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span></div>
+                      <div class="row-i"><span>{{model.fields1Dic.PriceUnit.label}}</span><span class="base-clolr expand-f" v-html="model.fields1Dic.PriceUnit.value"></span><span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span></div>
                       <div v-if="model.fields1Dic.PriceLine" class="row-i"><span>{{model.fields1Dic.PriceLine.label}}</span><div>{{model.fields1Dic.PriceLine.value}}{{model.fields1Dic.PriceLine.unitName}}</div></div></div>
                    <div class="info-row">
                       <div v-if="model.fields1Dic.PriceLine" class="row-i">
@@ -577,7 +580,7 @@
             let title=field.pageTitle==undefined ?field.label:field.pageTitle;
             submitData.actionType=field.actionType;
             var fun =self.$common.getDataDrivenOpts().handler[field.action];
-            fun(submitData,title,self.model);
+            fun(submitData,title,null);
           }
         }
 
@@ -601,27 +604,27 @@
         }
       },
       clickNextHandler() {
-        console.log(this.parentModel)
-        if(this.parentModel && this.parentModel.listData){
-          let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
-          this.parentModel.$vue.rowKeyDownHandle(null,1);
-          let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
+        let key='chanceID';
+        if(this.parentModel && this.parentModel.$refs.table){
+          let oldValue=this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
+          this.parentModel.$refs.table.rowKeyDownHandle(null,1);
+          let newValue=this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
           if(oldValue!==newValue){
             let parm=this.apiParam;
-            parm[this.parentModel.primaryKey]=newValue;
+            parm[key]=newValue;
             this.loaderObj.Detail(this.api,parm, this.load);    
           }
         }
       },
       clickPrevHandler() {
-        console.log(this.parentModel)
-        if(this.parentModel && this.parentModel.listData){
-          let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
-          this.parentModel.$vue.rowKeyDownHandle(null,-1);
-          let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
+        let key='chanceID';
+        if(this.parentModel && this.parentModel.$refs.table){
+          let oldValue=this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
+          this.parentModel.$refs.table.rowKeyDownHandle(null,-1);
+          let newValue=this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
           if(oldValue!==newValue){
             let parm=this.apiParam;
-            parm[this.parentModel.primaryKey]=newValue;
+            parm[key]=newValue;
             this.loaderObj.Detail(this.api,parm, this.load);   
           }
         }
@@ -809,8 +812,15 @@
           }
           .expand-f {
             line-height: 15px;
-            font-size: 18px;
+            font-size: 16px;
             font-weight: bold;
+            img{
+              width: 15px!important;
+              margin-left: 0!important;
+            }
+            span{
+              float:right;
+            }
           }
           .img-jsq{
             width: 14px;

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

@@ -13,7 +13,7 @@
         <div class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler"></div>
       </div>
       <div style="padding-left: 20px;padding-right: 20px;">
-        <div style="margin-top: 18px;">
+        <div ref="title" style="margin-top: 18px;">
           <div style="font-weight: Bold;font-size: 16px;color: #333333;display: flex;">
             <span>{{model.fields1Dic.EstateName.value}}</span>
             <span>{{model.fields1Dic.BuildingName.value}}</span>
@@ -29,8 +29,8 @@
           </div>
           <div style="display: flex;flex-wrap: wrap;">
             <div v-for="(tag, index) in model.actionRouterLabel" :key="index" class="t-tag" style="margin-top: 7px;"
-            :style="{color:tag.textColor,backgroundColor:tag.bgColor,borderColor:tag.borderColor}">
-            {{tag.label}}
+                 :style="{color:tag.textColor,backgroundColor:tag.bgColor,borderColor:tag.borderColor}">
+              {{tag.label}}
             </div>
           </div>
         </div>
@@ -41,34 +41,48 @@
           </div>
           <div style="width: 33.33%;">
             <div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.Price.label}}</div>
-            <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.Price.value}}{{model.fields1Dic.Price.unitName}}</div>
+            <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;"><span v-html="model.fields1Dic.Price.value"></span><span>{{model.fields1Dic.Price.unitName}}</span></div>
           </div>
           <div style="width: 33.33%;">
             <div style="margin-top: 13px;font-size: 12px;">{{model.fields1Dic.FloorName.label}}</div>
             <div style="margin-top: 7px;font-size: 14px;font-weight: Bold;color: #EE6B6B;">{{model.fields1Dic.FloorName.value}}</div>
           </div>
         </div>
-        <div ref="contact" id="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null" >
-          <ct-contact :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
+        <div ref="contact" id="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null">
+          <ct-contact :key="refreshKey" :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
         <div ref="routers" style="margin-top: 16px;display: flex;">
-          <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length-1)" :key="index" 
-            :ref="'routers'+index"
-            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 v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length-1)" :key="index"
+                     :ref="'routers'+index"
+                     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>
-          <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:''">
+          <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;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)">
+                         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>
             </div>
-            <span :slot="showIndex>0?'reference':''" class="icon-more" style="margin-left: 10px;"></span>
+            <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
           </el-popover>
         </div>
+        <div class="tablist-info base-box">
+          <div class="details-tabs-box">
+            <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
+              <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID"
+                           :index="index.toString()" :name="index.toString()">
+                <div slot="label" v-html="col.appName"></div>
+              </el-tab-pane>
+            </el-tabs>
+            <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list'+listKey.toString()+refershKey"
+                           :apiParam="model.paramDataTags1" :flagFocus="false"
+                           :searchConditionApi="model.searchConditionApiTags1"
+                           :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
+          </div>
+        </div>
       </div>
     </div>
 </template>
@@ -93,8 +107,10 @@
     },
     data() {
       return {
+        refreshKey:0,
         topWidth:300,
-        showIndex:0,
+        showIndex: 0,
+        listKey: 0,
         option: {
           isHidden: true,//是否开启操作栏隐藏设置，默认开启
           showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
@@ -126,6 +142,7 @@
     methods: {
       load(data) {
         var self = this;
+        this.refershKey = this.refershKey + 1;
         this.model = data; 
         this.model.$vue = self;
         this.loadFields();
@@ -166,7 +183,12 @@
             }
           });
         });
-      }, 
+      },
+      refreshPage(){
+        this.refreshKey=this.refreshKey+1;
+        this.showIndex=0;
+        this.setDetailStyle();
+      },
       loadFields() {
         var self = this;
         self.collapse=[];
@@ -223,10 +245,10 @@
         let i=key.index;
         this.model.activeIndex1=i;
         if(this.model.tags1 && this.model.tags1[i]){
-          // this.model.searchlistKey=this.model.searchlistKey+1;
-          // this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
-          // this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
-          // this.model.paramDataTags1=this.model.tags1[i].paramData||'';
+          this.listKey = this.listKey + 1;
+          this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionApiUrl || '';
+          this.model.searchDataApiTags1 = this.model.tags1[i].searchDataApiUrl || '';
+          this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
         }
       },      
       fieldClickHandler(field) {
@@ -417,6 +439,14 @@
     margin-right: 10px;
     font-size: 12px;
 }
+.more{
+    background: url('../../../assets/more.png')no-repeat;
+    background-size: 100% 100%;
+    width: 26px;
+    height: 26px;
+    display: table-caption;
+    cursor: pointer;
+}
 </style>
 
 

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

@@ -24,9 +24,9 @@
                        v-for="(item, index) in collapse" v-if="item.show !== false" :key="index">
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
-                           @input="inputHandler(col,$event)"
+                           @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
                            @tableButtonClick="clickHandler"></component>
               </el-col>
@@ -43,9 +43,9 @@
             </template>
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
-                           @input="inputHandler(col,$event)"
+                           @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
                            @tableButtonClick="clickHandler"></component>
               </el-col>
@@ -262,8 +262,8 @@
         var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
+            let verified = true;
             if (field.isSubmit) {
-              let verified = true;
               if(field.flagVerifyData){
                 verified=self.validExcute();
               }
@@ -404,6 +404,16 @@
                 let query = self.$common.objectToQueryStr(submitData);
                 window.open(field.action + query, "_blank");
               }
+              else if (field.isExport) {
+                submitData = field.getActionPara(submitData).para;
+                self.model.export(field, submitData);
+              }
+              else {
+                submitData = field.getActionPara(submitData).para;
+                field.doAction(submitData, (data) => {                  
+                  self.model.doAction(data);
+                })
+              }
             }
           }
           //执行客户端脚本
@@ -442,6 +452,14 @@
           clickAcion(field,submitData);
         }
       },
+      importComplete(res,field) {
+        if(field && field.changeCallBackFunName){
+          this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+        }
+        else{
+          this.model.doAction(res);
+        }
+      },
       changeHandler(field) {
         var self = this;
         if (typeof field.change !== 'undefined') {
@@ -530,9 +548,15 @@
         var self = this;
         var rtnBool = true;
         var jump = false;
+        var i=0;
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
+              if(i===0){
+                self.$message.error('【'+f.model.label+'】不能为空！');
+              }
+              i++;
+
               if (!jump) {
                 if (this.model.isHorizontalLayout) {//水平布局
                   this.activeName = f.model.collapseName.toString();
@@ -549,13 +573,16 @@
                   setTimeout(function () {
                     if (f.$el.offsetParent && f.$el.offsetParent.offsetParent) {
                       let total = f.$el.offsetParent.offsetParent.offsetTop;
-                      //this.$common.setScrollTop(total);
                       if (f.$el.offsetParent.offsetParent.offsetParent === null 
                       || f.$el.offsetParent.offsetParent.offsetParent.classList[0] === 'app-main'
                       || f.$el.offsetParent.offsetParent.classList[0] === 'app-main') {
                         total = f.$el.offsetParent.offsetTop;
                         this.$common.setScrollTop(total);
                       }
+                      else if (f.$el.offsetParent.offsetParent.offsetParent.classList[0] === 'ct-dialog_wrapper') {
+                        total = f.$el.offsetParent.offsetTop-45;
+                        document.querySelector(".ct-dialog_body").children[0].scrollTop = total;
+                      }
                       else if (f.$el.offsetParent.offsetParent.offsetParent.localName === "body") {
                         this.$common.setScrollTop(total);
                       }
@@ -563,11 +590,8 @@
                         f.$el.offsetParent.offsetParent.offsetParent.scrollTop = total;
                       }
                     }
-                    //let input = f.$el.querySelector('input');
-                    //if (input) {
-                    //  input.focus();
-                    //}
                   }, timeOut);
+
                   jump = true;
                 }
               }
@@ -593,7 +617,22 @@
            return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
         }
         return formData;
-      },     
+      },
+      getFileData(field) {
+        var submitData = {};
+        var tempFormData = this.model.getFormObj();
+        if(field.flagAttachSearchCondition){
+          submitData.jsonData=tempFormData;
+        }
+        else{
+          if(field.submitFormField){
+            field.submitFormField.forEach((v) => {
+              submitData[v] = tempFormData[v];
+            });
+          }
+        }
+        return submitData;
+      },  
     }
   }
 </script>

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -70,6 +70,8 @@
         this.model.value = '';
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
+        this.isShowClear();
+        event.stopPropagation();
       },
       onInputHandler: function (val) {
         this.model.value = this.$common.numFloat(this.model.value, this.model.decimals, this.inputOld);//保留n位小数 
@@ -121,12 +123,6 @@
            this.$set(this, 'showClear', false);
         }
       },
-
-       clearClickHandle: function (event) {
-        this.model.value = '';
-        this.isShowClear();
-        event.stopPropagation();
-      },
     }
   }
 </script>

package/src/centaline/dynamicLayout/index.js

@@ -0,0 +1,11 @@
+import dynamicLayout from './src/dynamicLayout'
+
+dynamicLayout.install = function (Vue) {
+  Vue.component(dynamicLayout.name, dynamicLayout);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicLayout);
+}
+
+export default dynamicLayout;