centaline-data-driven 1.2.88 → 1.2.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.88",
+  "version": "1.2.89",
   "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: "3"} ,
+        apiParam: {actionType: 1,chanceID: "1508323251514904576"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/finance/refund-apply/refundApplyView'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/salematter/agent/readDetail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,12 +18,18 @@
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
         apiParam:{
-actionType: 1,
-originalTraId: "1491279498301755394",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "放款申请查看",
-paymentId: "1524305327414583297"
+actionType: 2,
+		jsonData: {
+			searchFields: {
+				fields: [{
+					fieldName1: "estateId",
+					groupName: "estateId",
+					operation: 2,
+					searchDataType: 3,
+					searchValue1: "201703020943128D8A8FCF463E4016D6"
+				}]
+			}
+		}
           }
       }
     },

package/src/centaline/common/index.js

@@ -205,7 +205,6 @@ const common = {
    * @desc 打开弹窗
    */
   openDialog(vmodel) {
-    //this.dialogList.List.push(vmodel);
     this.dialogList.addDialog(vmodel);
   },
 
@@ -217,7 +216,6 @@ const common = {
   closeDialog(vmodel) {
     if (vmodel) {
       if (vmodel.name === 'ct-comfirm' || vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
-        //vmodel.dialogTableVisible = false;
         this.dialogList.deleteDialog(vmodel);
         return;
       }

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

@@ -11,7 +11,7 @@
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
             <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
-                       @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
+                       @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                        @input="inputHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
@@ -25,7 +25,7 @@
             <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" :fileData="getFileData(col)"
-                           @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
+                           @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
                            @tableButtonClick="clickHandler"></component>
@@ -44,7 +44,7 @@
             <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" :fileData="getFileData(col)" :from="'form'"
-                           @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
+                           @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
                            @tableButtonClick="clickHandler"></component>
@@ -478,15 +478,33 @@
         self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
-        if(field.routerKeyForEnterKey){
+        if(field.onAfterChanged){
           var router =self.model.actionRouters.find((v) => {
-            return v.id === field.routerKeyForEnterKey;
+            return v.id === field.onAfterChanged;
           });
           self.clickHandler(router);
         }
-        else if(field.onAfterChanged){
+
+        self.$forceUpdate();
+      },
+      enterHandler(field) {
+        var self = this;
+        if (typeof field.change !== 'undefined') {
+          if (typeof this.model.scripts !== 'undefined') {
+            this.model.scripts.formData.setExcuteListData(this.model.fields);
+          }
+          this.model.scripts.$fd = field.id;
+          this.$common.excute.call(this.model.scripts, field.change);
+        }
+
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        if(field.routerKeyForEnterKey){
           var router =self.model.actionRouters.find((v) => {
-            return v.id === field.onAfterChanged;
+            return v.id === field.routerKeyForEnterKey;
           });
           self.clickHandler(router);
         }

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -84,7 +84,7 @@
           this.$emit('click');
         }
         else if(this.model.routerKeyForEnterKey){
-          this.changeHandler(this.model.value);
+          this.$emit('enter');
         }
       },
       quickSelect(v) {

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -28,10 +28,8 @@
       label: function () {
         return (typeof this.colValue === "undefined" || this.colValue === '') ? this.router.label : this.colValue
       },
-      isShowLabel:function()
-      {
-        if(this.label||this.router.imgUrl)
-        {
+      isShowLabel:function(){
+        if(this.label||this.router.imgUrl){
           return true
         }
         return false;

package/src/main.js

@@ -41,8 +41,8 @@ Vue.use(centaline, {
       return {
         oldToken: 'd7a1705d-d8f4-4fee-9778-f9f6e402eacd',
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4NGM0ZjJlLTRhNTgtNDM4YS1iNjkxLWQyMTI4ZjdlYjNlMyJ9.nxO4kEXzIM2RJTXuX_AOoctKFvBiTZUEwHTu1YSFMn8JBjM9p-RK31ZB8ckJvlwgjiDGdbuGt1QOZRRP9KS3qQ',
+        EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc4N2U5ZDA1LThlMGItNDY0ZS1iMThjLTQzNjEyZWIyZDQ1ZCJ9.1W1c_YwAF9jfjAtOq9twaB6FH4KiySPuZmWIzcLSDxjfJTgXu7fcf4Cu8kyWcRC2bXrzNQoOYsHAR1vfMAQvGA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作