centaline-data-driven 1.3.38 → 1.3.39

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <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="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/tran-comm-adjust/create'" :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>  
@@ -14,7 +14,11 @@
     data() {
       return {
         apiParam:{
-          originalTraId: "1552573734835798018", actionType: 3, pageStyle: 2, pageTitle: "成交报告", pageOnly: true
+          actionType: 2,
+commAdjustCategory: "CC01020020",
+originalTraId: "1552533586416844802",
+pageOnly: true,
+pageStyle: 2,
         },
         topHeight:10,
       }

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -9,7 +9,7 @@
           <div class="contacts-tips" v-else>
               <component class="el-button el-button--primary el-button--mini max-btn-add" 
               v-if="model && model.buttons!==null && model.buttons.length>0" 
-              v-for="(col, index) in model.buttons" :key="index"
+              v-for="(col, index) in model.buttons" :key="col.key"
               :is="col.is" :vmodel="col" 
               @click="fieldClickHandler(col,$event)"></component>
           </div>

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

@@ -38,7 +38,7 @@
                   <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
-                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" ref="FieldsLabel"></ct-span>
+                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :key="scope.row[v.id].rowKey" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
 

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

@@ -14,7 +14,7 @@
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
-      @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" 
+      @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
@@ -284,6 +284,9 @@
       scrollHandle(scrollTop,scrollLeft){
         this.$emit('scrollHandle',scrollTop,scrollLeft)
       },
+      doClosePopoverHandle(){
+        
+      },
     }
   }
 </script>

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -73,11 +73,10 @@
           case 'showHigh':
             this.$set(this, 'highScreen', !this.highScreen);
             //高级搜索需要切换icon样式
-            if(model.icon==='max-open')
-            {
+            if(model.icon==='max-open'){
               model.icon='max-fold'
-            }else
-            {
+            }
+            else{
               model.icon='max-open'
             }
             break;

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

@@ -1358,10 +1358,7 @@ export default {
     closeCallTel(VueCom) {
       var self = this;
       if (self.model.currentCallTelrouter) {
-        if (
-          typeof VueCom.$refs[self.model.currentCallTelrouter] !== "undefined"
-        ) {
-          console.log(VueCom);
+        if ( typeof VueCom.$refs[self.model.currentCallTelrouter] !== "undefined") {
           VueCom.closeCallTel();
           return true;
         }

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

@@ -43,6 +43,7 @@ const ContactList = function (source,para ,callBack) {
             rtn._buttons = [];
             data.content.toolButtons.forEach((v) => {
               var button = Router(v);
+              button.key = Math.random().toString();
               button.is = "ct-btn";
               button.attrs = { size: "mini", class: 'max-btn-gray' }
               rtn._buttons.push(button);

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

@@ -168,6 +168,7 @@ const FormList = function (source, master) {
         }
         if (item instanceof Object) {
           item.form = rtn.form;
+          item.rowKey=Math.random(),
           row.field.push(item);
         }
       });
@@ -258,6 +259,7 @@ const FormList = function (source, master) {
           }
         });
         if (ref) {
+          ref.vmodel.rowKey=Math.random(),
           ref.$forceUpdate();
         }
       }

package/src/main.js

@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '4fb255a7-6b34-47b7-895b-bc5d40d940e5',
+        oldToken: '75bb9cb0-be2e-4f13-b833-932abc089020',
         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',