centaline-data-driven 1.5.5 → 1.5.7

package/package.json

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

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

@@ -8,7 +8,7 @@
       
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
       @loaded="loaded" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
-      v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler" :drowerClose="drowerClose"></ct-PropertySimpleDetailRET>
+      v-if="pageType=='PropertySimpleDetailRET' || pageType=='PropertySimpleDetailOFI'" @closeSideHandler="closeSideHandler" :drowerClose="drowerClose"></ct-PropertySimpleDetailRET>
     </div>
 </template>
 

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -22,16 +22,16 @@
             </el-image>
             <span
               class="cover-list-item-span-delete"
-              v-if="!modelPhotoselect.lock"
+              v-if="!model.lock"
             >
-              <i class="el-icon-delete" @click="handleRemove(index)"></i>
+              <i class="el-icon-delete" @click="handleRemove(item,index)"></i>
             </span>
             <span class="cover-list-item-span">
               <span class="el-dropdown-link" v-if="item.mediaLabelName">
                 <span style="width: 80px; height: 26px; display: inline-flex;">
                 &nbsp;{{ item.mediaLabelName }} </span>
               </span>
-              <template v-if="modelPhotoselect.lock">
+              <template v-if="model.lock">
               <span v-if="item.flagDefault &&(item.flagDefault == true || item.flagDefault == 'true')"
                 class="checked isradio"> 
               </span>
@@ -47,7 +47,7 @@
     </ul>
     <div
       class="el-upload el-upload--picture-card"
-      v-if="!modelPhotoselect.lock && photoList.length < max"
+      v-if="!model.lock && photoList.length < max"
       @click="handleOpen()"
     >
       <i class="el-icon-plus"></i>
@@ -78,8 +78,7 @@ export default {
       radio: "1",
       max: 99999,
       validMessage: "",
-      photoList: [],
-      modelPhotoselect: {},
+      photoList: [], 
     };
   },
   computed: {
@@ -100,7 +99,7 @@ export default {
   },
   created() {
     var self = this;
-    this.$nextTick(function () {
+   // this.$nextTick(function () {
       if (self.vmodel) {
         self.load(self.vmodel);
         self.$emit("loaded");
@@ -109,23 +108,22 @@ export default {
           self.load(data);
         });
       }
-    });
+    //});
   },
   methods: {
-    load(data) {
-      this.model = data;
+    load(data) { 
       this.max = data.max ? data.max : 99999;
-      this.modelPhotoselect = data;
-      this.photoList = data.fileList;
+      this.model = data;
+      this.photoList = data.fileList; 
     },
-    handleRemove(index) {
-      this.modelPhotoselect.delete(index);
+    handleRemove(item,index) {
+      this.model.delete(item,index);
       this.photoList.splice(index, 1);
     },
     handleOpen() {      
       var self = this;
       var chooseList = new Array();
-      if (self.modelPhotoselect.action == "") {
+      if (self.model.action == "") {
         self.$message({
           message: "请配置parameterAction！",
           type: 'warning',
@@ -134,8 +132,8 @@ export default {
         return;
       }
       var params = {
-        paramName: self.modelPhotoselect.paramName,
-        parentValue: self.modelPhotoselect.getFormParentFieldPara(),
+        paramName: self.model.paramName,
+        parentValue: self.model.getFormParentFieldPara(),
       };
       self.photoList.forEach((n) => {
         chooseList.push(n);
@@ -148,12 +146,12 @@ export default {
           {
             component: "ct-photoSelectList",
             attrs: {
-              api: self.modelPhotoselect.action, //  self.api,//source.xx
+              api: self.model.action, //  self.api,//source.xx
               showTitle: false,
               Selected: chooseList,
               mediaViewPageType:(self.model.source.mediaViewPageType||0),
-              // width: self.modelPhotoselect.router.pageWidth + 'px',
-              // height: self.modelPhotoselect.router.pageHeight+'px',
+              // width: self.model.router.pageWidth + 'px',
+              // height: self.model.router.pageHeight+'px',
               width: "772px",
               height: "550px",
               para: params,
@@ -161,10 +159,10 @@ export default {
             on: {
               handlePhoto(photoList) {
                 self.$nextTick(function () {
-                  if (this.modelPhotoselect.max) {
-                    if (photoList.length > this.modelPhotoselect.max) {
+                  if (this.model.max) {
+                    if (photoList.length > this.model.max) {
                       self.$message({
-                        message: "图片最多" + this.modelPhotoselect.max + "张",
+                        message: "图片最多" + this.model.max + "张",
                         type: 'warning',
                         showClose:true,
                       });
@@ -172,10 +170,10 @@ export default {
                       setTimeout(() => {
                         self.valid = true;
                       }, 3000);
-                      photoList = photoList.slice(0, this.modelPhotoselect.max);
+                      photoList = photoList.slice(0, this.model.max);
                     }
                   }
-                  self.modelPhotoselect.setFileList(photoList);
+                  self.model.setfileSourceList(photoList);
                   self.photoList = photoList;
 
                   self.$common.closeDialog(dialogOption.dialog);
@@ -202,7 +200,7 @@ export default {
     onEnd(a, b) {
       var self = this;
       self.$nextTick(function () {
-        self.modelPhotoselect.setFileList(self.photoList);
+        self.model.setfileSourceList(self.photoList);
       });
     },
     radiochecked(list, item) {
@@ -211,37 +209,46 @@ export default {
         v.flagDefault = false;
       });
       item.flagDefault = true;
-      self.modelPhotoselect.setFileList(list);
+      self.model.setfileSourceList(list);
     },
     //不能共用的数据校验
     selfValidExcute: function (eventName) {
-      if (this.modelPhotoselect.required) {
-        if (this.modelPhotoselect.getfileListLength() === 0) {
+      if(!this.model.lock)
+      {
+      if (this.model.required) {
+        if (this.model.getfileListLength() === 0) {
           this.validMessage = "必须选择图片";
           this.valid = false;
           return false;
         }
       }
 
-      if (this.modelPhotoselect.max) {
+      if (this.model.max) {
         if (
-          this.modelPhotoselect.getfileListLength() > this.modelPhotoselect.max
+          this.model.getfileListLength() > this.model.max
         ) {
-          this.validMessage = "图片最多" + this.modelPhotoselect.max + "张";
+          this.validMessage = "图片最多" + this.model.max + "张";
           this.valid = false;
           return false;
         }
       }
-      if (this.modelPhotoselect.min) {
+      if (this.model.min) {
         if (
-          this.modelPhotoselect.getfileListLength() < this.modelPhotoselect.min
+          this.model.getfileListLength() < this.model.min
         ) {
-          this.validMessage = "图片最少" + this.modelPhotoselect.min + "张";
+          this.validMessage = "图片最少" + this.model.min + "张";
           this.valid = false;
           return false;
         }
       }
-
+     if (this.model.rightDefault && this.model.rightDefault == 1 && eventName == "valid") {
+          if (this.model.getfileDefault() <= 0) {
+            this.validMessage = "请设置默认封面";
+            this.valid = false;
+            return false;
+          }
+        }
+        }
       this.valid = true;
       return this.valid;
     },

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

@@ -244,6 +244,12 @@
 
           if(this.flagSideBar){
             this.selectIndex=-1;
+
+            if (typeof window.localStorage !== "undefined" && !this.sideBarStatus) {
+              var tagkey = window.localStorage.getItem(this.sideBarPageType+"key");
+              this.sideBarStatus=tagkey;
+            }
+
             if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){
               this.sideMenuClickHandler('close');
             }
@@ -313,6 +319,7 @@
             }
           }
         }
+        window.localStorage.setItem(this.sideBarPageType+"key", this.sideBarStatus);
         this.$refs.table.setTableHeight();
       },
       closeSideHandler() {

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

@@ -68,6 +68,7 @@
         Boolean,
         default:false,
       },
+      categorySource: String,
     },
     created() {
       this.model = this.vmodel;
@@ -239,6 +240,12 @@
 
           if(this.flagSideBar){
             this.selectIndex=-1;
+
+            if (typeof window.localStorage !== "undefined" && !this.sideBarStatus) {
+              var tagkey = window.localStorage.getItem(this.sideBarPageType+this.categorySource+"key");
+              this.sideBarStatus=tagkey;
+            }
+
             if(this.flagDefaultDisplaySideBar && !this.sideBarStatus){
               this.sideMenuClickHandler('close');
             }
@@ -308,6 +315,7 @@
             }
           }
         }
+        window.localStorage.setItem(this.sideBarPageType+this.categorySource+"key", this.sideBarStatus);
         this.$refs.table.setTableHeight();
       },
       closeSideHandler() {

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

@@ -21,7 +21,7 @@
       </div>
       <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"
+          <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">
           </ct-searchlistOne>
         </div>
@@ -119,7 +119,10 @@
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
               self.categorySource.selectItems1[0].screenPara=parm;
               self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
-              self.categorySource.selectItems1[0].loaded=true;
+              self.categorySource.selectItems1[0].loaded=true;              
+              window.addEventListener("resize", (ev) => {
+                self.resize();
+              });
             }
             else{
               self.categoryLoadedError();
@@ -134,6 +137,7 @@
         this.label=this.categorySource.selectItems1[i].displayName;
         if(this.categorySource.selectItems1[i].loaded){
           this.$refs['searchlist'+i][0].resize();
+          this.$refs['searchlist'+i][0].resizeSearchList();
           this.$refs['searchlist'+i][0].resetScrollActivated();
         }
         else {
@@ -157,8 +161,10 @@
         this.$emit('refreshParent');
       },
       resize() {
-        if(this.$refs['searchlist'+this.activeIndex][0]){
+        this.listHeight=(this.$refs.main.offsetHeight-42)+'px';
+        if(this.$refs['searchlist'+this.activeIndex] && this.$refs['searchlist'+this.activeIndex][0]){
           this.$refs['searchlist'+this.activeIndex][0].resize();
+          this.$refs['searchlist'+this.activeIndex][0].resizeSearchList();
         }
       },
     },

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

@@ -128,12 +128,7 @@ export default {
         });
 
       }
-      this.$nextTick(function () {
-        if (document.querySelector('.is-select') != null) {
-          document.querySelector('.is-select').classList.remove("is-select");
-        }
-        document.querySelector('.is-current .el-tree-node__label').classList.add("is-select");
-      })
+     
 
     }
   },
@@ -146,10 +141,12 @@ export default {
 .mytree {
   height: 100%;
 }
-.mytree .is-select {
-  color: var(--centalineBlue) !important;
-}
 
+ .mytree .el-tree-node.is-current > .el-tree-node__content {
+    color: var(--centalineBlue) !important;
+  }
+
+   
 .tree-line:first-child div {
   overflow: hidden;
 }

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

@@ -5,7 +5,7 @@ import Vue from 'vue';
 import common from '../../../common';
 import valid from '../../../validate/index';
 //元数据、图片选择元数据、对应router、下拉框数据api
-const PhotoSelect = function (source, fileSourceList, router, optionApi) {
+const PhotoSelect = function (source, fileSourceList, router, optionApi,sourceList) {
   var self = this;
   var init = function (data) {
     var rtn = {
@@ -14,13 +14,23 @@ const PhotoSelect = function (source, fileSourceList, router, optionApi) {
       },
       get router() {
         return router;
-      },
-      get sourceList() {
-        return fileSourceList;
-      },
+      }, 
       set action(v) {
         data.action = v;
       },
+      get rightDefault() {
+        return data.rightDefault;
+      }, 
+      getfileDefault() {
+        if (!fileSourceList) {
+          return 0;
+        }
+        let fileList = fileSourceList.filter(item => {
+          return item.flagDeleted != true && item.flagDefault == true && item.mediaTypeID == 2
+        })
+        return fileList.length;
+      },
+
       getfileListLength() {
         if (!fileSourceList) {
           return 0;
@@ -41,22 +51,52 @@ const PhotoSelect = function (source, fileSourceList, router, optionApi) {
           })
         }
         return rtn._fileList;
+      },  
+     setfileSourceList(newfileList,self) { 
+        let pushArr = [];
+        let deleteItem =fileSourceList.filter((item) => {
+          return item.flagDeleted == true;
+        });  
+       pushArr =common.deepClone(deleteItem) ;
+        
+       for (let i = 0; i < deleteItem.length; i++) {
+         for (let j = 0; j < newfileList.length; j++) {
+           if (newfileList[j].mediaID == deleteItem[i].mediaID) { 
+             pushArr.splice(i, 1);
+             break;
+           }
+         }
+       }
+       fileSourceList = [...newfileList,...pushArr]; 
       }, 
-      setFileList(fileList) { 
-        fileSourceList= fileList;  
-      }, 
-      delete(index) {
-        fileSourceList.splice(index, 1);
+      delete(delitem,index) { 
+        let newVal = true;
+        let item = null;
+
+        let sourceIndex = sourceList.findIndex(v => v.mediaID === delitem.mediaID);
+        let i = fileSourceList.findIndex(v => v.mediaID === delitem.mediaID);
+        if (sourceIndex === -1) {
+          fileSourceList.splice(i, 1);
+        }
+        else {  
+          fileSourceList[index].flagDefault = false;
+          fileSourceList[index].flagDeleted = true; 
+          item = fileSourceList[index];
+          fileSourceList.splice(index, 1);
+          fileSourceList.push(item);
+        }
       },
+       
       getFormObj() {
         var rtnFormObj = {};
+        
         Object.defineProperty(rtnFormObj, source.fieldName1, {
           get: function () {
             return fileSourceList;
           },
           enumerable: true,
           configurable: true
-        });
+        }); 
         return rtnFormObj;
       }
     };

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -327,7 +327,7 @@ const LibFunction = {
             }
           })
         }
-        item = PhotoSelect(field, files, router, source.parameterAction);
+        item = PhotoSelect(field, files, router, source.parameterAction,files);
         item.is = 'ct-photoselect';
         break;
       case Enum.ControlType.RichText: //富文本框

package/src/main.js

@@ -51,7 +51,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '7227389b-a6c5-4c0a-bc24-d629eaece3cb',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjr0OgjAURt-lMzdpe3_KZYPSLj4EAQIJTkYg0RjfXY26uXuGbzjL-W5m3QdTGZSgdRIHkakEEseglDNEK6KYLWLbdvoBfsyXjkLUuk4ByDYClDmB-pgBlZuWUh3aJKYw0-VkKielF0JkV5il396CWfQl9nU6H6brP84dt-WZ1ZFtL0TAQRGoVw9D8Aw0DzzPOgYUNfcHAAAA__8.sJA4ggjcul71iwN0kmGK210TEUKaipDHTsvmEHQSHBM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2bXXpnP8aThEZCMjhQqRRAIh7k4Q0NEzxSummXcX81rFTqBh55NREDRZIKM0OMoZgjTGYZaIMY7uA_yYLyNxcN4nBpKDAco6getDBnR6iJQ8x2REJ9r1LHbKWOxZsqJOTGV5C2UJX2Kd22Xfbv84d1qmLdtKZavdARo1uWWPBUrDCpJLlb2ysiGLxxMAAP__.06Kf40mgrNwq8plJUsw0kjmXgIvkx62VNnsFBTmRzSo',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',