centaline-data-driven 1.3.37 → 1.3.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.37",
+  "version": "1.3.40",
   "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/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>  
 </template>
@@ -14,8 +14,13 @@
     data() {
       return {
         apiParam:{
-          
-        }
+          actionType: 2,
+commAdjustCategory: "CC01020020",
+originalTraId: "1552533586416844802",
+pageOnly: true,
+pageStyle: 2,
+        },
+        topHeight:10,
       }
     },
     activated(){

package/src/SearchList.vue

@@ -8,8 +8,8 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyContactImportList/getLayoutOfSearch'" 
-      :searchDataApi="'/PropertyContactImportList/getListOfSearchModel'">
+    <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
+      :searchDataApi="'/api/third-dept-tran/tran-list'">
     </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"

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/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.filter((v, i) => {return v.show==true})" :key="col.key"
               :is="col.is" :vmodel="col" 
               @click="fieldClickHandler(col,$event)"></component>
           </div>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -889,8 +889,29 @@ export default {
           // if (typeof field.onClick !== 'undefined') {
           //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
           // }
-
-          if (field.isOpenForm) {
+          if (field.isBrowseAttachment) {//浏览附件
+            var MediaAlbum = [
+              { albumName: self.model.title || "媒体", medias: [] },
+            ];
+            if (field.action) {
+              var callback = function (data) {
+                MediaAlbum[0].medias = data;
+                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              } 
+              var vsubmitData = {
+                ...field.getActionPara(submitData).para,
+                ...submitData
+              };
+              self.model.getAction(field.action, vsubmitData, callback);
+            }
+            else {
+              submitData.mediaData.forEach((v) => {
+                MediaAlbum[0].medias.push(v);
+              });
+              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+            }
+          }
+         else if (field.isOpenForm) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),

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>
@@ -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>
 
@@ -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/dynamicL/src/dynamicL.vue

@@ -23,7 +23,9 @@
           </span>
         </span>
         <label v-else class="ct-lable" :class="{ isWidth: model.labelValue.length > 30 }">
+		   <el-tooltip :content="model.labelValue" placement="top" effect="light">
                <span :class="{ isEllipsis: model.labelValue.length > 30 }"> {{ model.labelValue }}</span>
+		   </el-tooltip>
         </label>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>
         <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span>

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(){
+        this.$refs.screen.$refs.doClosePopover.click();
+      },
     }
   }
 </script>

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

@@ -21,8 +21,8 @@
       </el-popover>
     </div>
     <div v-if="isLoading" v-loading="isLoading" style="min-height:100px">
-
     </div>
+    <div ref="doClosePopover"></div>
   </div>
 </template>
 <script>
@@ -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

@@ -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;
@@ -825,10 +813,12 @@ export default {
             if (field.pageStyle) {
               submitData.pageStyle = field.pageStyle;
             }
+            self.$emit('doClosePopoverHandle');
             self.$common.getDataDrivenOpts().handler.openTab(action,submitData,field.pageTitle,self.model,field.dialogWidth);
           } 
           else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
+            self.$emit('doClosePopoverHandle');
             self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
           } 
           else if (field.isBrowserNewTab) {// 浏览器打开
@@ -993,13 +983,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();
@@ -1372,10 +1360,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;
         }