centaline-data-driven 1.2.57 → 1.2.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.57",
+  "version": "1.2.58",
   "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/dynamicDetail/src/dynamicContactList.vue

@@ -168,7 +168,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; 
@@ -395,6 +394,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][0].callTelClick(data);
+                }
               })
             }
           }

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/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/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/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',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作