centaline-data-driven 1.3.96 → 1.3.98

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
+    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1524955049590132736"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -11,16 +11,21 @@
     name: 'DataDrivenForm',
     data() {
       return {
-        apiParam:{
-          actionType: "2",
-buildingID: "1",
-estateID: "1",
-floorID: "1",
-pageOnly: "true",
-pageTitle: "开盘",
-propertyID: "",
-roomNo: "1563",
-tradeID: "200",
+        apiParam:{actionType
+: 
+"3",
+originalTraId
+: 
+"1572420664851103746",
+pageOnly
+: 
+"true",
+pageStyle
+: 
+"2",
+pageTitle
+: 
+"修改成交单",
         },
         topHeight:10,
       }

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

@@ -599,6 +599,15 @@
           }
         }
       },
+      inputHandler(field) {
+        if (typeof field.input !== '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.input);
+        }
+      },
       changeHandler(field) {
         var self = this;
         if (typeof field.change !== 'undefined') {
@@ -665,15 +674,6 @@
         }
         self.$forceUpdate();
       },
-      inputHandler(field) {
-        if (typeof field.input !== '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.input);
-        }
-      },
       popupSearchListHandler(singleSelectio, field, router, callBack) {
         var self = this;
         var submitData = {};

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

@@ -10,7 +10,7 @@
       <div ref="highlights" v-if="model.firbiddenWords" class="backdrop" :style="{width:firbiddenWordsWidth+'px',height:firbiddenWordsHeight+'px',left:firbiddenWordsLeft+'px',top:firbiddenWordsTop+'px'}">
         <div  class="highlights" v-html="firbiddenWordsValue"></div>
       </div>
-      <el-input ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear()" @change="changeHandler($event)"
+      <el-input ref="input" :title="model.lock?model.value:''" :type="model.inputType" v-model="model.value" v-bind="model.attrs" @input="inputHandler($event);isShowClear();applyHighlights()" @change="changeHandler($event)"
                 class="ct-flex-div-input max-input" :class="[model.showLabel?'showLabel':'',!valid?'inputError':'',model.firbiddenWords?'inputHighlights':'']" 
                 :disabled="model.lock" :rows="model.rows" 
                 :readonly="model.readonly" :show-password="model.isPassword" autocomplete="on" :maxlength="model.max" :show-word-limit="model.showWordLimit"
@@ -153,10 +153,6 @@
           });          
         });
       },
-      inputHandler(e) {
-        this.applyHighlights();
-        this.$emit('inputHandler',e);
-      },   
       scrollHandler() {
         var scrollTop = this.$refs.input.$el.children[0].scrollTop;
         var scrollHeight = this.$refs.input.$el.children[0].scrollHeight;

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

@@ -69,7 +69,6 @@ const FormList = function (source, master) {
     },
     getFormObj() {
       let rtnFormArr = [];
-      debugger
       for (let i = 1; i < rtn.rows.length; i++) {
         let rtnFormObj = {};
         rtn.rows[i].field.forEach((s) => {

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

@@ -625,7 +625,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
 
                   source.page.rows = source.page.rows + response.content.rows.length;
                   rtn.$vue.calculatingRowHeight()
-                } else {
+                } 
+                else {
                   response.content.rows.forEach((row) => {
                     for (var vkey in row) {
                       rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
@@ -649,6 +650,32 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               if (typeof response.content.bottomText !== 'undefined') {
                 self.listFooter = response.content.bottomText;
               }
+              if (response.content.updateTableColumns) {
+                self.columns = response.content.columns;
+                if (self.template) {
+                  var tempLoader = template.loader(self.template).default;
+                  tempLoader.init(self);
+                }
+                else{
+                  self.$vue.refreshTableColumns(response);
+                }
+              }
+              if(response.content.updateToolButtons){
+                if (response.content.toolButtons) {
+                  self._buttons=[];
+                  response.content.toolButtons.forEach((v) => {
+                    var button = Router(v);
+                    button.is = "ct-btn";
+                    button.attrs = {
+                      size: "mini",
+                      class: 'max-btn-gray'
+                    }
+                    self._buttons.push(button);
+                  });
+                  self.toolbarKey=self.toolbarKey+1;
+                  self.$vue.setTableHeight();
+                }
+              }
             }
 
             if (typeof callback !== 'undefined') {

package/src/main.js

@@ -42,7 +42,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '823894f8-bbf3-4d54-b3fb-4c697801c5c4',
+        oldToken: '854e91e2-3a5e-42af-a522-c51a0f5c09bc',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbC9rL2pgMnNBwicpxFChXKRwIh7g6IpEvPFFNM894TxrmFEvwCbmilkQXc0EpjDIk3XONBfERichhMDBiJI52q2sVjBQXo_QalYfaWhfe-gD5Nv2CCs98wjzqc9fGPc9ep_8zmJGJDzthaViQVxbQjwtSpdqSOLjbB6w0AAP__.nf7jF3ewbimJ8eNFZ72RKXS7qN0SgN5OnkZ0ZEk82Rc',
         
         originalRequestURL: 'http://10.88.22.67:8080',