centaline-data-driven 1.2.57 → 1.2.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.57",
+  "version": "1.2.60",
   "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/max.css

@@ -243,3 +243,9 @@
 .ct-table-content .ct-table .ct-tr .cell img{
     display: inherit;
 }
+
+
+.max.el-button.el-button--mini{
+    height: 26px;
+}
+

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

@@ -34,31 +34,31 @@
              <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" class="max"
     :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" 
+    <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" :src="tellImgUrl?tellImgUrl:model.imgUrl" :height="model.buttonHeight+'px'" />
       <span v-else slot="reference">{{model.label}}</span>
     </el-popover>
   </el-button>
-  <el-button v-else 
+  <el-button v-else  class="max"
     :type="model.isHyperLink ? 'text' : 'primary'"
     v-bind="model.attrs" @click="$emit('click',model)"
     :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">
-    <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" height="24px"/>
-     <span v-else>{{model.label}}</span>
+    <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+    <span v-else>{{model.label}}</span>
   </el-button>
 </template>
 <script>
@@ -69,6 +69,8 @@
       vmodel: Object,
       fileData: Object,
       optionApi:String,
+      rowData: Object,
+      rowindex:Number,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -82,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属性
         },
@@ -143,7 +145,7 @@
             this.tellImgUrl='';
           }
           else{
-            this.$emit('click',this.model);
+            this.$emit('click',this.model,this.rowData,this.rowindex);
           }
         }
         else{

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,30 @@
           clickAcion(field,submitData);
         }
       },
+      clickNextHandler() {
+        if(this.parentModel){
+          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];
+          if(oldValue!==newValue){
+            let parm=this.apiParam;
+            parm[this.parentModel.primaryKey]=newValue;
+            this.loaderObj.Detail(this.api,parm, this.load);
+          }
+        }
+      },
+      clickPrevHandler() {        
+        if(this.parentModel){
+          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];
+          if(oldValue!==newValue){
+            let parm=this.apiParam;
+            parm[this.parentModel.primaryKey]=newValue;
+            this.loaderObj.Detail(this.api,parm, this.load);
+          }
+        }
+      },
     }
   }
 </script>

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

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/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;
     },

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

@@ -322,6 +322,9 @@ const Router = function (source) {
         return true;
       }
     },
+    get buttonHeight() {
+      return source.buttonHeight||24;
+    },
   };
   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;

package/src/main.js

@@ -13,6 +13,7 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -36,9 +37,9 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '1c37d6b7-9259-4835-88f6-a389900244f7',
-        estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
+        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgyZjdlZWUzLTY1ODctNDk4NS1hMTE3LTE3ODQxNDUxYzY5MCJ9.d8lc203lFjHqjJ6mboxSD7Eo2nJBYyynY9MtH5L0N3L9fYVedUhhvscnaxw08fITffWLxH4Mc7kP7qvHbJ3I8A',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作