centaline-data-driven 1.3.37 → 1.3.38

package/package.json

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

package/src/Form.vue

@@ -2,8 +2,8 @@
   <div id="form-app" 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="'/commissionmanage/apply'" :apiParam="apiParam"></ct-form>
-    <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -14,8 +14,9 @@
     data() {
       return {
         apiParam:{
-          
-        }
+          originalTraId: "1552573734835798018", actionType: 3, pageStyle: 2, pageTitle: "成交报告", pageOnly: true
+        },
+        topHeight:10,
       }
     },
     activated(){

package/src/centaline/dialogList/src/dialog.vue

@@ -146,13 +146,14 @@
                                         mySelf.close();
                                       }
                                     }
-
+                                    //此行代码是为了防止弹出的窗口高度 大于父级页面的高度
+                                    //暂时注释 高度由接口控制
                                     var ph=0;
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }
                                     if(self.vmodel.pane && self.vmodel.pane.$el && self.vmodel.pane.$el.clientHeight<ph){
-                                      item.attrs.height=(self.vmodel.pane.$el.clientHeight-40)+'px';
+                                      item.attrs.height=(self.vmodel.pane.$el.clientHeight-60)+'px';
                                     }
                                     
                                     return h('div', {
@@ -170,6 +171,8 @@
                                       ]);
                                   }
                                   else {
+                                    //此行代码是为了防止弹出的窗口高度 大于父级页面的高度
+                                    //暂时注释 高度由接口控制
                                     var ph=0;
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));

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

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto'}">
+  <div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto','min-height': minHeight}">
     <div v-if="model !== null && !loading" class="ct-form"  :class="{'domDisabled':model.pageDisabled}" :key="formKey">
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
@@ -98,6 +98,10 @@
       apiParam: Object,
       parentModel: Object,
       pageWidth: Number,
+      topHeight:  {
+        type: Number,
+        default: -1
+      },
       showTitle: {
         type: Boolean,
         default: false
@@ -112,11 +116,15 @@
         collapse: [],//分组数组
         collapseActiveNames: [],//默认展开的分组name
         collapseFieldsRow: [],//分组数组对应的行列布局
-        independentItem: []//最后一个独立分组的行列布局
+        independentItem: [],//最后一个独立分组的行列布局
+        minHeight:'auto'
       };
     },
     mounted() {
       this.init();
+      if(this.topHeight>-1){
+        this.minHeight=(document.documentElement.clientHeight-this.topHeight-20)+'px';
+      }
     },
     updated(){
       if(this.$el.parentElement.scrollHeight>this.$el.parentElement.clientHeight 

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

@@ -25,7 +25,7 @@
               <template slot-scope="scope">
                 <span v-if="scope.row.isSet">
                   <component ref="Fields" :is="model.currentRow.data[v.id].locked || model.currentRow.data[v.id].is!==v.is?model.currentRow.data[v.id].is:v.is" 
-                    :vmodel="model.currentRow.data[v.id]" :api="model.OptApi"
+                    :vmodel="model.currentRow.data[v.id]" :api="model.OptApi" :key="model.currentRow.data[v.id].rowKey"
                     @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
                     @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
@@ -103,7 +103,7 @@
       return {
         model: null,
         foucus: false,
-        itemKey: Math.random()
+        itemKey: Math.random(),
       }
     },
     created() {      

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="field-top">
     <div style="width:100%;display:flex;">
-    <div style="flex:1;" v-if="model !== null" class="ct-inputNumber" :class="[model.attrs.size?'ct-font-size-'+model.attrs.size:'',model.lock ? 'ct-inputNumber-lock' : ''
-       ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+    <div style="flex:1;" v-if="model !== null" class="ct-inputNumber" :class="[model.attrs.size?'ct-font-size-'+model.attrs.size:'',model.lock ? 'ct-inputNumber-lock' : '']" 
+      @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
       <div class="ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
           {{model.label}}

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -294,20 +294,19 @@ export default {
             self.$forceUpdate();
             self.$nextTick(() => {
               if (!self.isLayout) {
-                if (
-                  self.$refs.tableParent.scrollHeight <=
-                  self.$refs.tableParent.offsetHeight
-                ) {
+                if ( self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
                   self.tableLoading = true;
                   self.model.nextPage(next);
-                } else {
+                } 
+                else {
                   self.tableLoading = false;
                   self.rowColorChange();
                   self.calculatingRowHeight();
                 }
               }
             });
-          } else {
+          }
+          else {
             self.tableLoading = false;
           }
         };
@@ -403,13 +402,11 @@ export default {
         if (rtn) {
           self.$forceUpdate();
           self.$nextTick(() => {
-            if (
-              self.$refs.tableParent.scrollHeight <=
-              self.$refs.tableParent.offsetHeight
-            ) {
+            if ( self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
               self.tableLoading = true;
               self.model.nextPage(next);
-            } else {
+            } 
+            else {
               self.tableLoading = false;
               self.rowColorChange();
               self.resetScroll();
@@ -418,7 +415,8 @@ export default {
             }
             self.setfixedSize();
           });
-        } else {
+        } 
+        else {
           self.tableLoading = false;
           self.rowColorChange();
         }
@@ -584,34 +582,24 @@ export default {
     setTableHeight() {
       var self = this;
       this.$nextTick(() => {
-        if (
-          this.$refs.searchTable &&
-          this.$refs.toolbar &&
-          this.$refs.searchTable.parentElement &&
-          !self.isLayout
-        ) {
+        if (  this.$refs.searchTable && this.$refs.toolbar &&
+          this.$refs.searchTable.parentElement && !self.isLayout) {
           var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
           var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
           var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-          var h7 = this.$refs.tableStats
-            ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0
-            : 0;
+          var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
           let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 22;
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {
             self.getScrollAttr();
           });
-        } else {
-          if (
-            this.$parent.$parent.$vnode.componentOptions.tag ===
-            "ct-PropertySimpleDetailRET"
-          ) {
-            var h1 =
-              this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight |
-              0;
+        } 
+        else {
+          if (this.$parent.$parent.$vnode.componentOptions.tag === "ct-PropertySimpleDetailRET") {
+            var h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
             var h2 = 0;
             if (this.$parent.$parent.$refs.contact) {
               h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;
@@ -993,13 +981,11 @@ export default {
                           }
                           self.$forceUpdate();
                           self.$nextTick(() => {
-                            if (
-                              self.$refs.tableParent.scrollHeight <=
-                              self.$refs.tableParent.offsetHeight
-                            ) {
+                            if ( self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
                               self.tableLoading = true;
                               self.model.nextPage(next);
-                            } else {
+                            } 
+                            else {
                               self.tableLoading = false;
                               self.rowColorChange();
                               self.resetScroll();

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

@@ -349,7 +349,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
 
             //若该行正在编辑，则取编辑状态的。
-            if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+            if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum>-1
             && data.listData.currentRow.data.$sourceIndex ===  data.listData.source.rows[rowNum].$sourceIndex && data.listData.currentRow.isSet) {
               if(fiedlId=='deleted' || fiedlId=='flagDeleted'){
                 return data.listData.currentRow.data.deleted || false;
@@ -392,14 +392,15 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             if (data) {
                 if (data.field) {
                   data.field.source[attrName] = value;
-                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, rowNum, fiedlId);
+                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
                 }
 
                 //正在编辑的行
-              if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+              if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum>-1
                 && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex) {
                     let currentField = data.listData.currentRow.data[fiedlId];
                     currentField.source[attrName] = value;
+                    data.listData.currentRow.data[fiedlId].rowKey=Math.random();
                     //校验自己
                     if (currentField.self && currentField.self.validExcute) {
                         currentField.self.validExcute();

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

@@ -227,6 +227,7 @@ const FormList = function (source, master) {
       let rowData = rtn.initRow(JSON.parse(JSON.stringify(sourceRow)));
       for (let j = 0; j < rowData.field.length; j++) {//遍历每一列
         row[rowData.field[j].id] = rowData.field[j];
+        row[rowData.field[j].id].rowKey=Math.random();
       }
       row.$sourceIndex =  sourceRow.$sourceIndex+"";
       return row;
@@ -328,7 +329,7 @@ const FormList = function (source, master) {
       self.currentRowIndex=index;
       var dialogOption = {
         title: '修改',
-        pane: common.getParentPane(self),
+        pane: common.getParentPane(self.$self),
         content: [{
           component: 'ct-form',
           attrs: {
@@ -336,7 +337,7 @@ const FormList = function (source, master) {
               scripts: source.scripts,
               parameterAction: self.OptApi,
               fields: JSON.parse(JSON.stringify(source.rows[index].columns)),
-              colSpan: 1,
+              colSpan: rtn.pageColumns,
               buttons: [
                 {
                   "key": "test1",
@@ -345,8 +346,8 @@ const FormList = function (source, master) {
                 }
               ]
             },
-            width:'500px',
-            height: '400px'
+            width: rtn.pageWidth+'px',
+            height: rtn.pageHeight+'px'
           },
           on: {
             submit: function (ev) {
@@ -618,7 +619,16 @@ const FormList = function (source, master) {
         return button;
       }
       return null;
-    }
+    },
+    get pageWidth() {
+      return source.pageWidth || 500;
+    },
+    get pageHeight() {
+      return source.pageHeight || 400;
+    },
+    get pageColumns() {
+      return source.pageColumns || 1;
+    },
   };
   return rtn;
 };

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

@@ -38,6 +38,13 @@ const Tags = function (source, moreActionRouter) {
       return source.code1;
     },
     set text(v) {
+     
+      //由于tags存的数据都是json对象 所以如果传进来的数据是string类型则 需要转成对象
+      if(typeof v=="string")
+      {
+        v=JSON.parse(v);
+      }
+
       if (source.code1 !== '') {
         var tempV1 = JSON.parse(source.code1);
         tempV1.forEach((v1) => {
@@ -68,6 +75,7 @@ const Tags = function (source, moreActionRouter) {
       return '';
     },
     get labelValue() {
+     
       if (source.code1) {
         var rtnLabelValue = '';
         JSON.parse(source.code1).forEach((op) => {

package/src/main.js

@@ -13,10 +13,10 @@ 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/", 
-  // baseUrl: "http://10.88.22.69:8080/", 
-  // flagRouterSelf: true,
+  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://10.88.22.40:8080/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'a0c6a2be-f79e-47ea-8490-212d5f4f4ff4',
+        oldToken: '4fb255a7-6b34-47b7-895b-bc5d40d940e5',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2OGI1YThjLThiZTUtNDQyZi04NTA4LWMyODY4N2NkYmEzMSJ9.Rk26QdZSUzDVdjdRxGxDApOt5W6KYjmyjmsXpWeZb5E5NwZjpXnHYwhYkKjNxIeyg--OV2UrzFa2SxGzZ-Wneg',