centaline-data-driven 1.5.32 → 1.5.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.32",
+  "version": "1.5.34",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -24,7 +24,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-cropper": "^0.5.8",
     "vue-ueditor-wrap": "^2.5.6",
-    "vuedraggable": "^2.24.3"
+    "vuedraggable": "^2.24.3",
+    "js-cookie": "^3.0.1"
   },
   "peerDependencies": {
     "element-ui": "^2.15.7",

package/release-log.md

@@ -1,3 +1,17 @@
+## v1.5.34
+2023-07-13
+
+优化
+
+文件预览组件 图片类型根据flagurl判断，是否加高宽等参数
+
+## v1.5.33
+2023-07-11
+
+优化
+
+房源列表点击颜色变化保存当晚凌晨
+
 ## v1.5.32
 2023-07-11
 

package/src/SearchList.vue

@@ -4,10 +4,10 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'"  :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
-
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'"  :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist> -->
-
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
+      :searchDataApi="'/api/third-dept-tran/tran-list'">
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'" 
@@ -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'"
@@ -60,17 +60,17 @@
       :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="'/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="'/EstateBuildingList/getLayoutOfSearch'"
+      :searchDataApi="'/EstateBuildingList/getListOfSearchModel'">
+    </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/DistrictList/getLayoutOfSearch'"
+      :searchDataApi="'/DistrictList/getListOfSearchModel'">
+    </ct-searchlist> -->
     
     <!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
 

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -64,7 +64,7 @@
   .wb {
     word-break: break-all;
   }
-  .mazarine{
-    color: #541a8b;
+  .mazarine {
+    color: #cb452f;
   }
 </style>

package/src/centaline/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

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

@@ -44,6 +44,10 @@ import dynamicElement from '../../mixins/dynamicElement';
         type: Object,
         default: () => { }
       },
+      prevParam: {
+        type: Object,
+        default: () => { }
+      },
     },
     data() {
       return {
@@ -61,7 +65,7 @@ import dynamicElement from '../../mixins/dynamicElement';
       if(self.categoryLoaded){
         this.$nextTick(function () {
           if (typeof self.api !== 'undefined') {
-            self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
+            self.loaderObj.SearchScreen(self.api, self.load, self.screenPara, self.prevParam);
           }
           if (typeof self.source !== 'undefined') {
             self.load(self.loaderObj.SearchScreen(self.source));

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

@@ -210,7 +210,8 @@ import dynamicElement from "../../mixins/dynamicElement";
 import dynamicTableTip from "./dynamicTableTip.vue";
 import dynamicTableToolbar from "./dynamicTableToolbar.vue";
 import dynamicTableStats from "./dynamicTableStats.vue";
-import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
+  import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
+  import Cookies from 'js-cookie';
 export default {
   name: "ct-searchtable",
   mixins: [dynamicElement],
@@ -1360,6 +1361,9 @@ export default {
           if (self.isIframe) {
             submitData.isIframe = self.isIframe;
           }
+          if (action == "openPropertyDetailRET" || action == "openPropertyDetailOFI") {
+            self.setCookies(action + submitData.chanceID);
+          }
           fun(submitData, title, self.$parent);
         }
       };
@@ -1710,6 +1714,20 @@ export default {
       this.selectAllType = this.model.getSelectAll();
       this.$forceUpdate();
     },
+    setCookies(key) {
+      var curDate = new Date();
+      //当前时间戳
+      var curTamp = curDate.getTime();
+      //当日凌晨的时间戳,减去一毫秒是为了防止后续得到的时间不会达到00:00:00的状态
+      var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
+      //当日已经过去的时间（毫秒）
+      var passedTamp = curTamp - curWeeHours;
+      //当日剩余时间
+      var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
+      var expires = new Date();
+      expires.setTime(leftTamp + curTamp);
+      return Cookies.set(key, "", { expires: expires })
+    },
     calculatingRowHeight() {
       let self = this;
 

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue

@@ -2,7 +2,7 @@
   <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
     <div class="ct-search-list" :style="{'height': pageHeight? pageHeight:'100%','width':searchWidth?searchWidth+'px':'100%'}" >
       <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
-      @loaded="screenLoaded" :screenPara="screenPara" 
+      @loaded="screenLoaded" :screenPara="screenPara" :prevParam="prevParam" 
       :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
@@ -52,6 +52,10 @@
         type: Object,
         default: () => { }
       },
+      prevParam: {
+        type: Object,
+        default: () => { }
+      },
       from: {
         String,
         default:'searchlist'
@@ -347,6 +351,9 @@
         this.$emit('submit', tempListData);
         this.$common.closeDialog(this);
       },
+      getPrevParam(){
+        return this.$refs.screen.model.getPrevParam();
+      },
     },
     beforeDestroy() {
       async function destroyDeep(vnode) {

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -12,9 +12,16 @@
           </div>
           <div class="ct-radios">
             <el-radio-group v-model="activeIndex" @change="categorychangeHandler($event)">
-              <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index">
-                {{col.name}}
-              </el-radio-button >
+              <template v-if="categorySource.routerKey && categorySource.routerKey=='openMultiList'">
+                <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index" @click.native.prevent="categoryClickHandler(col,index)">
+                  {{col.name}}
+                </el-radio-button>
+              </template>
+              <template v-else>
+                <el-radio-button v-bind="{class:'ct-font-size-mini'}" v-for="(col, index) in categorySource.selectItems1" :key="index" v-model="col.code" :label="index">
+                  {{col.name}}
+                </el-radio-button>
+              </template>
             </el-radio-group>
           </div>
         </div>
@@ -22,7 +29,7 @@
       <div v-if="categorySource" class="el-tabs__content">
         <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
           <ct-searchlistOne v-if="col.loaded" :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight" :categorySource="col.code"
-            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="col.screenPara" @tableLoaded="tableLoaded">
+            :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="col.screenPara" :prevParam="prevParam" @tableLoaded="tableLoaded">
           </ct-searchlistOne>
         </div>
       </div>
@@ -50,6 +57,10 @@
         type: Object,
         default: () => { }
       },
+      prevParam: {
+        type: Object,
+        default: () => { }
+      },
       from: {
         String,
         default:'searchlist'
@@ -137,13 +148,14 @@
           }
         );
       },
-      categorychangeHandler() {
-        if(this.categorySource.routerKey && this.categorySource.routerKey=='openMultiList1212'){
-          this.activeIndex=this.openMultiListIndex>-1?this.openMultiListIndex:0;
-          this.$common.getDataDrivenOpts().handler.openTabRouter('ofi_propertyList', '');
+      categoryClickHandler(col,index) {
+        if(this.categorySource.routerKey && this.categorySource.routerKey=='openMultiList'){          
+          let prevParam = this.$refs['searchlist'+this.activeIndex][0].getPrevParam();
+          this.$common.getDataDrivenOpts().handler.openTabSearchRouter('ofi_propertyList', index, prevParam);
           return;
         }
-
+      },
+      categorychangeHandler() {
         let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -54,9 +54,8 @@ export default {
       currentNodeIndex: 0,// 当前节点索引
     };
   },
-
   mounted() {
-
+ 
   },
   methods: {
     search(m) {
@@ -123,6 +122,10 @@ export default {
       self.loading = false;
       self.LastResolve = treeResolve;
       self.menuVisible = false;
+      self.$nextTick(() => {
+        self.$refs.Tree.setCurrentKey(self.model.modeltree[0].code)
+    });
+      self.handleNodeClick(self.model.modeltree[0]);
     },
     searchComplate(m, defaultSearch, resolve) {
       var self = this;

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -46,7 +46,7 @@
           <!--Photo-->
           <template v-else-if="itemFile.mediaTypeID == '2'">
             <ct-viewerImage ref="viewerImage"
-                            :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0'"
+                            :imgUrl="resultObject+((!itemFile.flagUrl)?'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0':'')"
                             :rotate="rotate"></ct-viewerImage>
           </template>
           <!--ThreeDimensional-->

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

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

@@ -201,6 +201,7 @@ const Repeat = function (source, master, formobj) {
           source.colSpan = formobj.colSpan;
         }
         let item = LibFunction.GetControl(value, source, showLabel, false);
+        item.locked=!r.rightEdit;
         if (item instanceof Object) {
           item.form = rtn.form;
           row.field.push(item);

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

@@ -8,8 +8,8 @@ import Axios from 'axios';
 import Vue from 'vue';
 import formData from '../../../formData';
 
-const SearchScreen = function (source, callBack, screenPara) {
-  var init = function (source) {
+const SearchScreen = function (source, callBack, screenPara, prevParam) {
+  var init = function (source,prevParam) {
     var rtn = {
       $vue: null,
       formData: formData,
@@ -101,6 +101,28 @@ const SearchScreen = function (source, callBack, screenPara) {
         }
         return rtnFormObj;
       },
+      prevParams:["e.DistrictID","e.AreaID","p.EstateID"],
+      getPrevParam() {
+        var rtnFormObj = {};
+        rtn.screen.forEach((f) => {
+          if (typeof f.id !== 'undefined' && rtn.prevParams.includes(f.id) && f.value!='') {
+            rtnFormObj[f.id]={code1:f.code1,name1:f.name1};
+            switch(f.type){
+              case 19:
+              case 20:
+              case 21:
+              case 22:
+              case 6:
+              case 7:
+                rtnFormObj[f.id].code2=f.code2;
+                break;
+              default:
+               break;  
+            }
+          }
+        });
+        return rtnFormObj;
+      },
       _scripts: null,
       get scripts() {
         if (rtn._scripts !== null) {
@@ -399,6 +421,18 @@ const SearchScreen = function (source, callBack, screenPara) {
           let item = LibFunction.GetControl(value, source.content, true, true);
           
           if (item instanceof Object) {
+            if(prevParam && typeof item.id !== 'undefined' && rtn.prevParams.includes(item.id) && prevParam[item.id]){
+              if(prevParam[item.id].code1){
+                item.code1=prevParam[item.id].code1;
+              }
+              if(prevParam[item.id].code2){
+                item.code2=prevParam[item.id].code2;
+              }
+              if(prevParam[item.id].name1){
+                item.name1=prevParam[item.id].name1;
+              }
+            }
+
             item.form = rtn;
             item.isScreen=true;
             item.keyScreen=item.id+Math.random();
@@ -549,7 +583,7 @@ const SearchScreen = function (source, callBack, screenPara) {
     Vue.prototype.$api.postHandler(common.globalUri(), { action: source, para: screenPara }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
-          var rtn = init(response);
+          var rtn = init(response,prevParam);
           if (callBack) {
             callBack(rtn);
           }

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -35,6 +35,7 @@
 </template>
 
 <script>
+  import Cookies from 'js-cookie';
   export default {
     name: 'ct-tablecurrency',
     props: {
@@ -64,9 +65,10 @@
           return true
         }
         return false;
-      }
+      },
     },
     created() {
+      this.isVisited();
     },    
     data() {
       return {
@@ -97,6 +99,12 @@
         this.labelColor='mazarine'
 
       },
+      isVisited() {
+        var key = this.router.action + this.rowData.chanceID;
+        if (typeof Cookies.get(key) !== "undefined") {
+          this.labelColor = 'mazarine'
+        }
+      },
       closeListenVoice() {
         this.$refs.video.pause();
         this.visible=false;
@@ -140,7 +148,7 @@
     width: 24px;
     margin-top: 2px;
   }
-  .mazarine{
-    color: #541a8b;
+  .mazarine {
+    color: #cb452f;
   }
 </style>

package/src/main.js

@@ -37,9 +37,6 @@ Vue.use(centaline, {
     openTabSearch: function (field, submitData) {
       alert("打开tab页Search:" + field.action)
     },
-    openTabRouter: function (action) {
-      alert("打开tab页:" + action)
-    },
     openDetail: function (action) {
       alert("打开tab页:" + action)
     },
@@ -56,9 +53,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f9baa4f5-069e-4bae-8438-a89365fb067e',
+        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-lMy9p-x7tKxttYfEjSFsgwckIJBrjv6tRN3fPcIeznHsT655FIyK3kkKPEDpdA0VbQ9tbBh-YpdcWyfPgPsCP-TIoRc4q00HrbAAyhMAqMAQygfrYYfBRVGK6nESjDDulsSZXiSVtbyHRqpfY1-l8mK7_OHfclmc2jSMpqQ1kxBkIZ4JckgPUxaXMXEptxf0BAAD__w.yb_P0UjgJEHUMipFMJIHEge9cR5lopQH8Wvz1qvQQos"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ71ep4vtpOEQUQiOFCpEEgmEuDsgoKNnildMM-8Gy7aHGrI0ilJnMbXGIWXvsOm8YEwiKhpvKUofPuCP-dJrTcFrbrEJPiExWRSdBBNxoi63NsUMFZTLCWrNwoGtElvBPKxvIZ75JbalnHfl-o9zx3V-Zt1QggTrUJkwIE1qQlGjQ2dkJPGGlRzg_gAAAP__.AvGloBOPe6P0tfZZUrjROEl8nOpm1A0ih43ut1I75w8"}',
 
         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"}',