centaline-data-driven 1.2.72 → 1.2.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.72",
+  "version": "1.2.73",
   "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="'/third-dept-tran/tran-comm-adjust/create'" :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,12 +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:{actionType: 2
-,commAdjustCategory: "6"
-,originalTraId: "1478187254032572417"
-,pageOnly: true
-,pageStyle: 2
-,pageTitle: "新增业绩调整"}
+        apiParam:{"actionType":2,"jsonData":{}}
       }
     },
     methods: {

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)">

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

@@ -110,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" 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">
@@ -604,11 +604,11 @@
         }
       },
       clickNextHandler() {
-        let key='chanceID';        
+        let key='chanceID';
         if(this.parentModel && this.parentModel.$refs.table){
-          let oldValue=this.parentModel.$refs.table.model.listData[this.parentModel.selectIndex][key];
+          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.selectIndex][key];
+          let newValue=this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
           if(oldValue!==newValue){
             let parm=this.apiParam;
             parm[key]=newValue;
@@ -619,9 +619,9 @@
       clickPrevHandler() {
         let key='chanceID';
         if(this.parentModel && this.parentModel.$refs.table){
-          let oldValue=this.parentModel.$refs.table.model.listData[this.parentModel.selectIndex][key];
+          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.selectIndex][key];
+          let newValue=this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
           if(oldValue!==newValue){
             let parm=this.apiParam;
             parm[key]=newValue;

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>
@@ -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/dynamicT/src/dynamicT.vue

@@ -67,6 +67,8 @@
       },
       clearClickHandle: function (event) {
         this.model.value = '';
+        this.inputHandler(this.model.value);
+        this.changeHandler(this.model.value);
         this.isShowClear();
         event.stopPropagation();
       },

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

@@ -38,6 +38,9 @@ const Button = function (source, router) {
     },
     icon:'',
   };
+  if(router){
+    rtn=base.copy(rtn,router);
+  }
   rtn = base.copy(Base(source), rtn);
   return rtn;
 }

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

@@ -356,6 +356,32 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         button.is = "ct-btn";
         return button;
       },
+      export(btn, submitData) {
+        Vue.prototype.$api.postHandler(common.globalUri(),{
+          action: btn.action,
+          para: submitData
+        });
+      },
+      doAction(response) {
+        if (response.responseData) {
+          response = response.responseData;
+        }
+        switch (response.notification) {
+          case Enum.ActionType.Export://导出
+            var fileName = response.content.fieldName1;
+            var fileContent = window.atob(response.content.code1);
+            common.saveFile(fileName, fileContent);
+            break;
+          case Enum.ActionType.Refersh://刷新            
+            break;
+          case Enum.ActionType.RefreshParent://刷新父页面
+            rtn.self.$emit('refreshParent');
+            break;
+          default:
+            break;
+        }
+        rtn.self.$forceUpdate();
+      },
     };
     valid.InitForm(rtn);
     return rtn;

package/src/main.js

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.13:7070/v1/form/router",
-  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  baseUrl: "http://10.88.23.22:9999/v1/form/router",
   // baseUrl: "http://10.1.245.111:38028/api", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -38,8 +38,8 @@ Vue.use(centaline, {
       return {
         oldToken: '6613f67c-ba83-4065-9570-175c2f74e6d5',
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgyZjdlZWUzLTY1ODctNDk4NS1hMTE3LTE3ODQxNDUxYzY5MCJ9.d8lc203lFjHqjJ6mboxSD7Eo2nJBYyynY9MtH5L0N3L9fYVedUhhvscnaxw08fITffWLxH4Mc7kP7qvHbJ3I8A',
+        EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI4ODM0MDAwLWNlZjktNGFmOS05MzRiLTk5NWIyZDJiMDEzMiJ9.wFh2luYleY--3_GmdkU34YsE4-sFNRhG9E8npQ14m2KFIromh674-kV7oXmxAgF3KbqqjsrcC0iGAwIUfI1vWQ',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作