centaline-data-driven 1.5.39 → 1.5.41

package/package.json

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

package/release-log.md

@@ -1,10 +1,40 @@
+## v1.5.41
+2023-07-25
 
-## v1.5.38
+优化
+
+tree组件搜索不存在时优化
+
+Repeat组件优化
+
+zip文件导出优化
+
+客户侧边栏详情
+
+右侧详情页tab高度计算优化
+
+合并行更新优化
+
+列表刷新行后，侧边栏需要刷新
+
+列表查询按钮后面的插件没有支持自定义宽度
+
+## v1.5.40
+2023-07-19
+
+bug修复
+
+form表单固定按钮位置优化，兼容ccai
+
+## v1.5.39
 2023-07-19
 
 bug修复
 
 表格表头刷新时闪动问题修复
+
+图片编辑打开不显示图片兼容性修复
+
 ## v1.5.38
 2023-07-18
 

package/src/SearchList.vue

@@ -13,6 +13,9 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/finance/tran-commission-allocate/process-layout'"  :searchDataApi="'/api/finance/tran-commission-allocate/process-list'"></ct-searchlist> -->
 
 
+     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/filemanage/batchdownlist/getLayoutOfSearch'"  :searchDataApi="'/filemanage/batchdownlist/getList'"></ct-searchlist> -->
+
+
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
       :searchDataApi="'/api/transaction/adjustRecord/getTableList'">
@@ -64,17 +67,15 @@
       :searchStatsApi="'/PropertyOFIList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/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="'/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="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
     

package/src/centaline/css/ccai.css

@@ -6,6 +6,8 @@
    /* bottom: 26px; */
    width: calc(100% - 52px);
    margin-bottom: 20px;
+   left: -11px;
+   right: 1px;
 }
 .btnPadBom {
    padding-bottom: 4px !important;

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

@@ -99,7 +99,6 @@ export default {
           self.setCss();
         });
       });
-
     },
     focusHandle: function () {
       this.$refs['ct-input'].focus();

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

@@ -19,8 +19,7 @@
         alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
       <div v-if="!model.flagAppMode && showIndex < 4" class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler">
       </div>
-      <span v-if="model.flagAppMode ||showIndex > 3 " :slot="showIndex > 0 ? 'reference' : ''" class="more" style="margin-right: 10px;"
-        @click="drawer = true"></span>
+      <span v-if="model.flagAppMode ||showIndex > 3 " :slot="showIndex > 0 ? 'reference' : ''" class="more" style="margin-right: 10px;" @click="drawer = true"></span>
       <el-drawer title="更多操作" :visible.sync="drawer" direction="ttb" :modal="false" class="drawerMore" size="30%"  style="position: absolute;">
         <div style="display: flex;flex-flow:row wrap ">
           <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index"
@@ -37,9 +36,8 @@
         <div style="font-weight: Bold;font-size: 16px;color: #333333;display: flex;">
           <img v-if="model.actionRouterFavorite" :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="Simplecollection" />          
           <span>{{ model.fields1Dic.CustName.value }}</span>
-          <div style="border: 1px solid #E0E0E0;font-size: 12px;color: #333333;padding-top: 3px;
-                width: 68px;height: 26px;border-radius: 6px;text-align: center;margin-left: auto;">
-            {{ model.fields1Dic.StatusName.value }}
+          <div style="border: 1px solid #E0E0E0;font-size: 12px;color: #333333;padding-top: 3px; width: 68px;height: 26px;border-radius: 6px;text-align: center;margin-left: auto;">
+            {{ model.fields1Dic.OwnerShipName.value }}
           </div>
         </div>
         <div v-if="model.fields1Dic.DistrictName" style="font-size: 12px;color: #999999;margin-top: 7px;">
@@ -60,7 +58,11 @@
       <div v-if="model.flagHiddenSensitiveInfo" style="display: flex;align-items: center;justify-content: center;margin-top: 50%;height: 0px;">
         <div v-html="model.hiddenSensitiveInfoReason"></div>
       </div>
-      <div v-if="!model.flagHiddenSensitiveInfo" class="areaValue">
+      <div ref="sensitiveInfo" v-if="!model.flagHiddenSensitiveInfo" class="areaValue">
+        <div style="width: 33.33%;">
+          <div class="areaValuetile">{{ model.fields1Dic.BusinessUnit.label.replace('：', '') }}</div>
+          <div class="areaValueRed">{{ model.fields1Dic.BusinessUnit.value }}</div>
+        </div>
         <div style="width: 33.33%;">
           <div class="areaValuetile">{{ model.fields1Dic.Area.label.replace('：', '') }}</div>
           <div class="areaValueRed"> {{ model.fields1Dic.Area.value }}{{ model.fields1Dic.Area.unitName }}</div>
@@ -69,10 +71,6 @@
           <div class="areaValuetile">{{ model.fields1Dic.Price.label.replace('：', '') }}</div>
           <div class="areaValueRed"><span v-html="model.fields1Dic.Price.value"></span><span>{{ model.fields1Dic.Price.unitName }}</span></div>
         </div>
-        <div style="width: 33.33%;">
-          <div class="areaValuetile">{{ model.fields1Dic.BusinessUnit.label.replace('：', '') }}</div>
-          <div class="areaValueRed">{{ model.fields1Dic.BusinessUnit.value }}</div>
-        </div>
       </div>
       <div ref="contact" id="contact" style="margin-top: 16px;"
         v-if="!model.flagHiddenSensitiveInfo && model.contactApiRouter !== null">
@@ -96,12 +94,11 @@
       <div v-if="!model.flagHiddenSensitiveInfo" class="tablist-info base-box">
         <div class="details-tabs-box">
           <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
-            <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()"
-              :name="index.toString()">
+            <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
               <div slot="label" v-html="col.appName"></div>
             </el-tab-pane>
           </el-tabs>
-          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1"
+          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1" :from="'simpleDetail'"
             :key="'list' + listKey.toString() + refershKey" :apiParam="model.paramDataTags1" :flagFocus="false"
             :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1"
             :flagAppMode="model.flagAppMode"></ct-searchlist>
@@ -109,6 +106,8 @@
       </div>
     </div>
     <div v-if="isLoading" v-loading="isLoading" :style="{'height': loadingHeight+'px',}"></div>
+    <div v-if="model !== null && model.fields1Dic.StatusName" v-html="model.fields1Dic.StatusName.value" 
+      :style="{'position': 'absolute','font-size': '12px','top':statusTop+'px','right':statusRight+'px'}"></div>
   </div>
 </template>
 
@@ -149,6 +148,8 @@ export default {
       drawer: false,
       isLoading:true,
       loadingHeight:0,
+      statusTop:0,      
+      statusRight:0,
     }
   },
   watch: {
@@ -216,7 +217,17 @@ export default {
       let self = this;
       this.$nextTick(() => {
         if (this.$refs.main) {
-          this.topWidth = this.$refs.main.clientWidth - 140;
+          if(this.model.routerForQRCode){
+            this.topWidth = this.$refs.main.clientWidth - 140;
+          }
+          else{
+            this.topWidth = this.$refs.main.clientWidth - 100;
+          }
+        }
+
+        if(this.$refs.sensitiveInfo){
+          this.statusTop=this.$refs.sensitiveInfo.offsetTop;
+          this.statusRight=23;
         }
 
         let totalWidth = 0;

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

@@ -120,7 +120,7 @@
               <div slot="label" v-html="col.appName"></div>
             </el-tab-pane>
           </el-tabs>
-          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1"
+          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1" :from="'simpleDetail'"
             :key="'list' + listKey.toString() + refershKey" :apiParam="model.paramDataTags1" :flagFocus="false"
             :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1"
             :flagAppMode="model.flagAppMode"></ct-searchlist>

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

@@ -125,7 +125,7 @@
               <div slot="label" v-html="col.appName"></div>
             </el-tab-pane>
           </el-tabs>
-          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1"
+          <ct-searchlist ref="searchlist" v-if="model.searchConditionApiTags1" :from="'simpleDetail'"
             :key="'list' + listKey.toString() + refershKey" :apiParam="model.paramDataTags1" :flagFocus="false"
             :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1"
             :flagAppMode="model.flagAppMode"></ct-searchlist>

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

@@ -649,33 +649,33 @@
                 }
                 else {
                   if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
-                    //var tempwindow = window.open('about:blank');
-                    //tempwindow.location = field.action;
-                    if (field.action.indexOf("?") > -1) {
-                      self.downloadUrl = field.action + "&" + Math.random();
+                    if(field.action.indexOf(".zip") > -1){
+                      window.location.href = encodeURI(field.action);
                     }
-                    else {
-                      self.downloadUrl = field.action + "?" + Math.random();
+                    else{
+                      if (field.action.indexOf("?") > -1) {
+                        self.downloadUrl = field.action + "&" + Math.random();
+                      }
+                      else {
+                        self.downloadUrl = field.action + "?" + Math.random();
+                      }
                     }
-                    // document.body.addEventListener('click', function() {
-                    //   window.open(field.action, "_blank");
-                    // });
                   }
                   else {
                     field.doAction(submitData, (data) => {
                       if (data.content) {
                         if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                          //var tempwindow = window.open('about:blank');
-                          //tempwindow.location = data.content;
-                          if (data.content.indexOf("?") > -1) {
-                            self.downloadUrl = data.content + "&" + Math.random();
+                          if(data.action.indexOf(".zip") > -1){
+                            window.location.href = encodeURI(data.action);
                           }
-                          else {
-                            self.downloadUrl = data.content + "?" + Math.random();
+                          else{
+                            if (data.content.indexOf("?") > -1) {
+                              self.downloadUrl = data.content + "&" + Math.random();
+                            }
+                            else {
+                              self.downloadUrl = data.content + "?" + Math.random();
+                            }
                           }
-                          // document.body.addEventListener('click', function() {
-                          //   window.open(data.content, "_blank");
-                          // });
                         }
                         else {
                         }
@@ -1150,6 +1150,7 @@
     /* bottom: 6px; */
     bottom: 0;
     left: 0;
+    right: 0;
     border-radius: 0 0 4px 4px;
     position: absolute;
     line-height: 34px;