centaline-data-driven 1.5.26 → 1.5.27

package/package.json

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

package/release-log.md

@@ -1,3 +1,16 @@
+## v1.5.27
+2023-06-27
+
+优化
+
+CCES form表单中的表格数据全展示
+
+列表统计栏和详情页统计栏，点击更多里面的选项交换位置，体验优化
+
+formData添加submit方法
+
+列表行删除完后，要关闭右侧
+
 ## v1.5.26
 2023-06-21
 

package/src/SearchList.vue

@@ -60,21 +60,15 @@
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'"
-      :searchDataApi="'/EstateList/getListOfSearchModel'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'"
-      :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
-      :searchDataApi="'/DistrictList/getListOfSearchModel'">
-    </ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'" :searchDataApi="'/DistrictList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'"
-      :searchDataApi="'/CustomerImportList/getListOfSearchModel'">
-    </ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist>
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -237,7 +237,7 @@ export default {
                 attrs: {
                   searchConditionApi: field.actionForSearchLayout,
                   searchDataApi: field.actionForSearch,
-                  apiParam: field.getActionPara(submitData).para,
+                  apiParam: submitData,
                   width: field.dialogWidth + 'px',
                   height: field.dialogHeight + 'px'
                 },

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

@@ -23,7 +23,7 @@
       </ct-SearchList>
 
       <div ref="detailForm" v-if="pageType=='Form'" style="overflow: auto;" :style="{height:(listHeight-5)+'px'}">
-        <ct-form :api="api" :apiParam="apiParam" @loaded="loaded" @submit="submit" :flagScroll="'true'" :drowerClose="drowerClose">
+        <ct-form :api="api" :apiParam="apiParam" @loaded="loaded" @submit="submit" :flagScroll="'true'" :drowerClose="drowerClose" :openType="'detail'">
         </ct-form>
       </div>
 

package/src/centaline/dynamicDetail/src/dynamicEstateBuildingDetail.vue

@@ -196,7 +196,7 @@
                 </div>
                 <div v-if="showData.length > 1" style="position: relative">
                   <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
-                    <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                    <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
                       <div slot="label" v-html="col.appName"></div>
                     </el-tab-pane>
                   </el-tabs>
@@ -280,6 +280,7 @@ export default {
       flagDisabledPrev:false,
       flagDisabledNext:false,
 	    showData: [],
+      lastWidth:0,
       FlagStatistics: false,
       dropDownSelected: false,
       iconSort: require("../../../assets/sort.png"),
@@ -351,6 +352,9 @@ export default {
             }
           }
           if (showIndex > 0) {
+            const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
+            const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
+           self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
             self.showData = [
               self.model.tags1.slice(0, showIndex),
               self.model.tags1.slice(showIndex),
@@ -507,7 +511,7 @@ export default {
     },
 	  handleDropDown(key, index) {
       let i = index;
-      this.model.activeIndex1 = (this.showData[0].length + i).toString();
+      // this.model.activeIndex1 = (this.showData[0].length + i).toString();
       let dropDownData = this.showData[1];
       this.dropDownSelected = true;
       if (dropDownData && dropDownData[i]) {
@@ -515,7 +519,16 @@ export default {
         this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
         this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
         this.model.paramDataTags1 = dropDownData[i].paramData || "";
-        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
+        //交换位置
+       let lastItemIndex = this.showData[0].length - 1;
+       let lastItem = this.showData[0][lastItemIndex];
+       this.showData[0][lastItemIndex]=col;
+       this.showData[1][index]=lastItem;
+       this.model.activeIndex1 = lastItemIndex.toString();
+       this.model.tags1[lastItemIndex]=col;
+       this.model.tags1[lastItemIndex +1 +index]=lastItem;
+       //存储
+        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); 
       }
     },
     fieldClickHandler(field) {

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -201,7 +201,7 @@
                 </div>
                 <div v-if="showData.length > 1" style="position: relative">
                   <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
-                    <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                    <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()"  :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
                       <div slot="label" v-html="col.appName"></div>
                     </el-tab-pane>
                   </el-tabs>
@@ -483,6 +483,7 @@ export default {
       flagDisabledPrev:false,
       flagDisabledNext:false,
 	    showData: [],
+      lastWidth:0,
       FlagStatistics: false,
       dropDownSelected: false,
       iconSort: require("../../../assets/sort.png"),
@@ -554,6 +555,9 @@ export default {
             }
           }
           if (showIndex > 0) {
+            const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
+            const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
+           self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
             self.showData = [
               self.model.tags1.slice(0, showIndex),
               self.model.tags1.slice(showIndex),
@@ -708,9 +712,9 @@ export default {
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
     },
-	  handleDropDown(key, index) {
+	  handleDropDown(col, index) {
       let i = index;
-      this.model.activeIndex1 = (this.showData[0].length + i).toString();
+      // this.model.activeIndex1 = (this.showData[0].length + i).toString();
       let dropDownData = this.showData[1];
       this.dropDownSelected = true;
       if (dropDownData && dropDownData[i]) {
@@ -718,6 +722,16 @@ export default {
         this.model.searchConditionApiTags1 = dropDownData[i].searchConditionAction || "";
         this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
         this.model.paramDataTags1 = dropDownData[i].paramData || "";
+
+       //交换位置
+       let lastItemIndex = this.showData[0].length - 1;
+       let lastItem = this.showData[0][lastItemIndex];
+       this.showData[0][lastItemIndex]=col;
+       this.showData[1][index]=lastItem;
+       this.model.activeIndex1 = lastItemIndex.toString();
+       this.model.tags1[lastItemIndex]=col;
+       this.model.tags1[lastItemIndex +1 +index]=lastItem;
+
         window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
       }
     },

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

@@ -204,7 +204,7 @@
                 <div v-if="showData.length > 1" style="position: relative">
                   <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
                     <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID"
-                      :index="index.toString()" :name="index.toString()">
+                      :index="index.toString()" :name="index.toString()" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
                       <div slot="label" v-html="col.appName"></div>
                     </el-tab-pane>
                   </el-tabs>
@@ -481,6 +481,7 @@ export default {
       flagDisabledPrev: false,
       flagDisabledNext: false,
       showData: [],
+      lastWidth:0,
       FlagStatistics: false,
       dropDownSelected: false,
 	    iconSort: require("../../../assets/sort.png"),
@@ -564,6 +565,9 @@ export default {
             }
           }
           if (showIndex > 0) {
+            const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
+            const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
+           self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
             self.showData = [
               self.model.tags1.slice(0, showIndex),
               self.model.tags1.slice(showIndex),
@@ -716,9 +720,9 @@ export default {
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
     },
-    handleDropDown(key, index) {
+    handleDropDown(col, index) {
       let i = index;
-      this.model.activeIndex1 = (this.showData[0].length + i).toString();
+      // this.model.activeIndex1 = (this.showData[0].length + i).toString();
       let dropDownData = this.showData[1];
 
       this.dropDownSelected = true;
@@ -728,6 +732,15 @@ export default {
           dropDownData[i].searchConditionAction || "";
         this.model.searchDataApiTags1 = dropDownData[i].searchDataAction || "";
         this.model.paramDataTags1 = dropDownData[i].paramData || "";
+            //交换位置
+        let lastItemIndex = this.showData[0].length - 1;
+       let lastItem = this.showData[0][lastItemIndex];
+       this.showData[0][lastItemIndex]=col;
+       this.showData[1][index]=lastItem;
+       this.model.activeIndex1 = lastItemIndex.toString();
+       this.model.tags1[lastItemIndex]=col;
+       this.model.tags1[lastItemIndex +1 +index]=lastItem;
+
         window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
       }
     },

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

@@ -129,6 +129,10 @@
         String,
         default: 'close',
       },
+      openType:{
+        String,
+        default: '',
+      },
     },
     data() {
       return {
@@ -401,7 +405,7 @@
                             });
                           }
                           else {
-                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0 
+                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0  && self.openType !=='detail'
                               && field.actionType && field.actionType===2 && data.notification !== 17) {
                               if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
                                 self.$common.getDataDrivenOpts().handler.closeTab();

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

@@ -14,7 +14,7 @@
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight" 
       @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
-      @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
+      @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" @closeSideBar="closeSideBar" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
     </div>
@@ -364,6 +364,10 @@
       closeSideHandler() {
         this.$refs.sideMenu.clickHandler();
       },
+      closeSideBar() {
+        this.flagSideBarOfData=false;
+        this.searchWidth=0;
+      },
       clickNextHandler() {
         this.$refs.table.rowKeyDownHandle(null,1);
       },
@@ -388,8 +392,20 @@
         this.$emit('submit', tempListData);
         this.$common.closeDialog(this);
       },
-      submitHandler(modelForm,responseData){
-        this.$refs.table.updateCurrentRow({flagFreshCurrentRow:true},{responseData:responseData});
+      submitHandler(responseData){
+        if(responseData && responseData.responseData && responseData.responseData.notification===4){
+          this.$refs.table.model.doAction(responseData);
+          if(this.$refs.table.model.listData.length>0){
+            this.selectIndex=-1;
+            this.rowClickHandle();
+          }
+          else{
+            this.closeSideBar();
+          }
+        }
+        else{
+          this.$refs.table.updateCurrentRow({flagFreshCurrentRow:true},{responseData:responseData});
+        }
       },
     },
     beforeDestroy() {

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

@@ -74,7 +74,7 @@
           <tbody>
             <!--可视区域的行数据-->
             <tr v-for="(row, rowindex) in model.listData" :key="rowindex"
-                v-if="pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
+                v-if="from == 'form' || pageRowMin <= rowindex && rowindex <= pageRowMax" :ref="'rows.' + rowindex"
                 @click="rowClickHandle($event, rowindex)" class="ct-tr" :style="row.$style">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass,rowindex === model.selectIndex ? 'select' : null,]"
                   align="center">
@@ -252,7 +252,7 @@ export default {
     screenTop: {
       Number,
       default: 0,
-    },
+    },   
   },
   computed: {},
   data() {
@@ -290,7 +290,6 @@ export default {
       disabledStats:false,
       searchStrat:0,
       searchEnd:0,
-
       visible:false,
       theadTitleShow:false,
       theadTitleTop:0,

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

@@ -20,9 +20,10 @@
           @click="handleClick($event, item,true)"
         >
           <ul class="btnTab">
+            <div :style="{'width':(item.width ? item.width + 'px' : '' )}">
             <li
               :class="[
-                selectStats == item.fieldName1 + '*' + item.code1 
+                selectStats ==item.fieldName1 + '*' + item.code1 
                   ? 'activecolor'
                   : '',
               ]"
@@ -38,6 +39,7 @@
                 ]"
               ></span>
             </li>
+           </div>
           </ul>
         </div>
       </template>
@@ -46,7 +48,8 @@
           v-for="(item, index) in showData[0]"
           @click="handleClick($event, item,true)"
         >
-          <ul class="btnTab" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),'white-space':(index == showData[0].length-1 ? 'nowrap' : '' )}">
+          <ul class="btnTab" :style="{'width':(index == showData[0].length-1 ? lastWidth + 'px' : '' ),}">
+            <div :style="{'width':(item.width ? item.width + 'px' : '' ),'white-space': 'nowrap' }">
             <li
               :class="[
                 selectStats ==item.fieldName1 + '*' + item.code1 
@@ -65,6 +68,7 @@
                 ]"
               ></span>
             </li>
+            </div>
           </ul>
         </div>
         <el-popover
@@ -142,6 +146,8 @@ export default {
       showData: [],
       lastWidth:0,
       sortData: null,
+      sliceIndex: null,
+      flagClick: false,
       option: {
         isHidden: true, //是否开启操作栏隐藏设置，默认开启
         showNum: 3, //如果isHidden为true时，个数大于3就会隐藏，默认是3
@@ -166,34 +172,36 @@ export default {
       var self = this;
       self.model = data;
       self.FlagStatistics = false;
-      self.data = data.source.content;
+      // self.data = data.source.content;
       self.selectVa = "";
- if (self.data.length > 0) {
+     if (data.source.content.length > 0) {
         if (self.sortData == null) {
           self.sortData = {};
-          self.data.forEach((item, index) => {
+          data.source.content.forEach((item, index) => {
             self.sortData[item.fieldName1 + "*" + item.code1] = index;
             item.sort = index;
           });
         }
         else {
-          self.data.forEach((item, index) => {
+          data.source.content.forEach((item, index) => {
             item.sort = self.sortData[item.fieldName1 + "*" + item.code1];
           });
         }
-        self.data.sort(function (a, b) {
+        data.source.content.sort(function (a, b) {
           if (a.sort > b.sort) {
             return 1; // 交换顺序
           } else {
             return -1; // 顺序不变
           }
         });
+        self.data = data.source.content;
         let i = self.data.findIndex(
           (v) => self.selectStats === v.fieldName1 + "*" + v.code1 
         );
         if (i == -1 || self.selectStats == []) {
           self.handleClick(null, self.data[0], false);
         }
+    
         self.FlagStatistics = true;
         self.showStats();
       }
@@ -205,11 +213,21 @@ export default {
           var showIndex = 0;
           var sumWidth = 0;
           for (var i = 0; i < self.data.length; i++) {
+            self.data[i].width= self.$refs["StatisticsItem" + i][0].getBoundingClientRect().width-36;
+          }
+          
+          if(self.flagClick&&self.sliceIndex!==null)
+          {
+            showIndex= self.sliceIndex;
+          }
+          else
+          {
+            for (var i = 0; i < self.data.length; i++) {
             var moreWidth = 20;
             // sumWidth =
             //   sumWidth + self.$refs["StatisticsItem" + i][0].offsetWidth;
               sumWidth += self.$refs["StatisticsItem" + i][0].getBoundingClientRect().width;
-              sumWidth = Math.ceil(sumWidth * 100) / 100;
+              sumWidth = Math.ceil(sumWidth * 100) / 100 ;
             var nextWidth = 0;
             if (i + 1 < self.data.length) {
               try {
@@ -228,7 +246,9 @@ export default {
               break;
             }
           }
+          }
           if (showIndex > 0) {
+            self.sliceIndex=showIndex;
             const ExceptShowIndexWidth = self.$refs["StatisticsItem"+(showIndex)][0].offsetLeft;
             const preShowIndexWidth =self.$refs["StatisticsItem" + (showIndex-1)][0].getBoundingClientRect().width;
            self.lastWidth=self.showWidth-ExceptShowIndexWidth + preShowIndexWidth -20;
@@ -246,6 +266,7 @@ export default {
     },
     handleClick(ev, obj, flagRefreshTable,type,index) {
       var self = this;
+      self.flagClick=true;
       self.selectStats = obj.fieldName1 + "*" + obj.code1 ;
       var fields = self.model.searchData(
         obj.fieldName1,
@@ -283,6 +304,7 @@ export default {
   },
   watch: {
     showWidth: function (newVal, oldVal) {
+      this.flagClick = false;
       this.showStats();
     },
   },
@@ -309,6 +331,7 @@ export default {
   cursor: pointer;
   float: left;
   list-style-type: none;
+  white-space: nowrap;
 }
 
 .tab-list .btnTab:hover,
@@ -349,6 +372,7 @@ export default {
   float: left;
   list-style-type: none;
   padding: 0px 20px 0px 20px;
+  white-space: nowrap;
 }
 
 .tab-list .tdcenter {