centaline-data-driven 1.5.25 → 1.5.26

package/package.json

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

package/release-log.md

@@ -1,3 +1,18 @@
+## v1.5.26
+2023-06-21
+
+优化
+
+列表页右侧边栏图标展示计算优化
+
+表单formData添加方法setTabsSelect，可以设置tab选中项
+
+右侧表单保存后，左侧列表刷新行数据
+
+bug修复
+
+异步导入成功，消息没有提示bug处理
+
 ## v1.5.25
 2023-06-19
 

package/src/SearchList.vue

@@ -42,11 +42,11 @@
       :searchDataApi="'/RightValueList/getListOfSearchModel'">
     </ct-searchlist> -->
 
-    <ct-searchlist 
+    <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" :searchStatsApi="'/PropertyPublishList/getListStatsForRET'"
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
@@ -71,6 +71,10 @@
     <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
       :searchDataApi="'/DistrictList/getListOfSearchModel'">
     </ct-searchlist> -->
+
+    <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'"
+      :searchDataApi="'/CustomerImportList/getListOfSearchModel'">
+    </ct-searchlist>
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 

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" :flagScroll="'true'" :drowerClose="drowerClose">
+        <ct-form :api="api" :apiParam="apiParam" @loaded="loaded" @submit="submit" :flagScroll="'true'" :drowerClose="drowerClose">
         </ct-form>
       </div>
 
@@ -89,6 +89,9 @@
         //通知父组件加载完成
         this.$emit('loaded',model);
       },
+      submit(modelForm,responseData) {
+        this.$emit('submit',modelForm,responseData);
+      },
       scrollHandle(scrollTop,scrollLeft){
         this.$emit('scrollHandle',scrollTop,scrollLeft)
       },

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

@@ -255,7 +255,7 @@ export default {
             if (!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)) {
               if (self.$refs['routers' + i] && self.$refs['routers' + i].length > 0 && self.$refs['routers' + i][0] && self.$refs['routers' + i][0].$el) {
                 if (sumWidth + self.$refs['routers' + i][0].$el.offsetWidth -8 > totalWidth && self.showIndex === 0) {
-                  self.showIndex = i -1;
+                  self.showIndex = i ;
                 }
                 else {
                   sumWidth = sumWidth + self.$refs['routers' + i][0].$el.offsetWidth + (i > 0 ? 10 : 0);

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

@@ -253,10 +253,9 @@ export default {
           self.model.actionRoutersSimple.forEach((v, i) => {
             if (!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)) {
               if (self.$refs['routers' + i] && self.$refs['routers' + i].length > 0 && self.$refs['routers' + i][0] && self.$refs['routers' + i][0].$el) {
-                if (sumWidth + self.$refs['routers' + i][0].$el.offsetWidth -8 > totalWidth && self.showIndex === 0) {
-                  self.showIndex = i -1;
-                }
-                
+                if (sumWidth + self.$refs['routers' + i][0].$el.offsetWidth -8 > totalWidth && self.showIndex === 0) {               
+                  self.showIndex = i;
+                }   
                 else {
                   sumWidth = sumWidth + self.$refs['routers' + i][0].$el.offsetWidth + (i > 0 ? 10 : 0);
                 }

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

@@ -348,7 +348,7 @@
                                   self.$common.closeDialog(dialogOption.dialog);
                                   if (data.rtnMsg) {
                                     self.$message({
-                                      message: response.data.rtnMsg,
+                                      message: data.rtnMsg,
                                       type: 'success',
                                       showClose:true,
                                     });
@@ -611,7 +611,7 @@
                               self.$common.closeDialog(dialogOption.dialog);
                               if (data.rtnMsg) {
                                 self.$message({
-                                  message: response.data.rtnMsg,
+                                  message: data.rtnMsg,
                                   type: 'success',
                                   showClose:true,
                                 });
@@ -1107,13 +1107,6 @@
       },
       tabClickHandler(){
         this.$nextTick(() => {
-          // if (this.$el.parentElement.scrollHeight > this.$el.parentElement.clientHeight
-          // && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
-          //   this.isScroll = true;
-          // }
-          // else{
-          //   this.isScroll = false;
-          // }
         });
       },
       refreshPage() {

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

@@ -25,7 +25,7 @@
       :searchConditionApi="sideBarSearchConditionApi" :searchStatsApi="sideBarSearchStatsApi" :searchDataApi="sideBarSearchDataApi" :listHeight="listHeight"
       :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose"
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
-      @closeSideHandler="closeSideHandler"></ct-Detail>
+      @closeSideHandler="closeSideHandler" @submit="submitHandler"></ct-Detail>
       <ct-SearchSideMenu ref="sideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
       @sideMenuClickHandler="sideMenuClickHandler"></ct-SearchSideMenu>
     </div>
@@ -388,6 +388,9 @@
         this.$emit('submit', tempListData);
         this.$common.closeDialog(this);
       },
+      submitHandler(modelForm,responseData){
+        this.$refs.table.updateCurrentRow({flagFreshCurrentRow:true},{responseData:responseData});
+      },
     },
     beforeDestroy() {
       async function destroyDeep(vnode) {

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

@@ -1153,7 +1153,7 @@ export default {
                           self.$common.closeDialog(dialogOption.dialog);
                           if (data.rtnMsg) {
                             self.$message({
-                              message: response.data.rtnMsg,
+                              message: data.rtnMsg,
                               type: 'success',
                               showClose:true,
                             });
@@ -1753,8 +1753,15 @@ export default {
                 height: '165px'
               },
               on: {
-                finished() {
+                finished(data) {
                   self.$common.closeDialog(dialogOption.dialog);
+                  if (data.rtnMsg) {
+                    self.$message({
+                      message: data.rtnMsg,
+                      type: 'success',
+                      showClose:true,
+                    });
+                  }
                   self.getPage(1);
                 },
                 error(data) {

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

@@ -270,6 +270,14 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
           }
         },
+        setTabsSelect(id){
+          if(this.form && this.form.self){
+            var f = this.fieldsDic[id];
+            if(this.form.isHorizontalLayout){
+              this.form.self.activeName = f.collapseName.toString() === '-1' ? this.form.self.activeName : f.collapseName.toString();
+            }
+          }
+        },
 
         //获取列表数据
         get excuteListData() {

package/src/main.js

@@ -55,7 +55,7 @@ Vue.use(centaline, {
       return {
         oldToken: '11c12506-253c-4995-83fb-84cf51cb23a0',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf_lzbyE1772tWy0hcWPIBQ64GQEEo3x39Wom7tnuMNZzr3BumdoILm25thrjJ0yyEkMtr04DNG5OijRHNzgP-CP-TIQsReyHbZeIrJljY6iw8g2cp86HUOCCsrlBA1ZJ0oZ41UFy7i9BWlPL7Gv5Xwo13-cO27LM2tyzhOPBUdfBFmE0Os8YR7nmayiqc4z3B8AAAD__w.o16g-7JqWN22AE4FlElSYeKTamxgcbezCPVyH2Jhydk"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOif57It9povPScMjojg4UqgQSSQQ4u-AgI6eKbaYZvamli2rnUrcaJLOgrSmBkq-hqbzDFGYdTTeUuQ-fIAf86VHpODRtdAEL0COLDAKg5AT6lJrJSZVqXI5qR069mTQka7UPKxvYW1tXmJbynlfrv84d1znZ5bLwY1mzKBz7YAsjxA4FMBhymbyJhAadX8AAAD__w.WTd5dRXlft4LrZ-VT3IZEpes_Ox43KL_WvLCqMgYfZM"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',