centaline-data-driven 1.4.16 → 1.4.17

package/package.json

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

package/src/SearchList.vue

@@ -11,10 +11,10 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist 
-      :searchConditionApi="'/api/distribution/distributionList/getLayoutOfSearch'" 
-      :searchDataApi="'/api/distribution/distributionList'">
-    </ct-searchlist> -->
+    <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/PropertyRETList/getLayoutOfSearchForCustomerReqMatch'" 
+      :searchDataApi="'/PropertyRETList/getListOfSearchModel'">
+    </ct-searchlist>
 
     <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
@@ -22,11 +22,11 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
@@ -45,6 +45,7 @@
     data() {
       return {
         para:{
+          customerReqID:'D113B951-0BF0-428E-BE73-584BAC0D0044'
         },
         // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}

package/src/centaline/common/index.js

@@ -288,13 +288,13 @@ const common = {
       this.openDialog(dialogOption);
     })
   },
-  viewerfile(router, MediaAlbum, groupIndex, index) {
+  viewerfile(pageTitle, MediaAlbum, groupIndex, index) {
     var self = this;
     var width = parseInt(window.document.body.clientWidth * 0.8);
     width = width > 1160 ? 1160 : width;
     return new Promise((resolve, reject) => {
       var dialogOption = {
-        title: router.pageTitle,
+        title: pageTitle,
         name: 'ct-viewerfile',
         content: [{
           component: 'ct-viewerfile',

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

@@ -119,36 +119,9 @@ export default {
       }
     },
     viewerfile(index) {
-      var self = this;
-
-      var width = parseInt(window.document.body.clientWidth * 0.8);
-      width = width > 1160 ? 1160 : width;
-      var dialogOption = {
-        title: this.title || "预览媒体",
-        pane: self.$common.getParentPane(self),
-        content: [
-          {
-            component: "ct-viewerfile",
-            attrs: {
-              showTitle: false,
-              MediaAlbum: this.newMediaAlbums,
-              groupIndex: this.activeAlbumsIndex,
-              index: index || 0,
-              // width: self.modelPhotoselect.router.pageWidth + 'px',
-              // height: self.modelPhotoselect.router.pageHeight+'px',
-              width: width + "px",
-              height:
-                parseInt(window.document.body.clientHeight * 0.8).toString() +
-                "px",
-            },
-            on: {
-              handlePhoto(photoList) {},
-            },
-          },
-        ],
-      };
-      self.$common.openDialog(dialogOption);
-    },
+      var self = this; 
+      self.$common.viewerfile((this.title || "预览媒体"), this.newMediaAlbums, this.activeAlbumsIndex, (index || 0));
+    }
   },
   watch: {
     mediaAlbums(newValue, oldValue) {

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

@@ -816,7 +816,7 @@ export default {
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
               }
               var vsubmitData = {
                 ...field.getActionPara(submitData).para,
@@ -828,7 +828,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
             }
           }
           else if (field.isOpenForm) {

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

@@ -806,7 +806,7 @@ export default {
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
               } 
               var vsubmitData = {
                 ...field.getActionPara(submitData).para,
@@ -818,7 +818,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
             }
           }
           else if (field.isOpenForm) {

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -235,34 +235,8 @@
         });
         var index = MediaAlbum[0].medias.findIndex(
           (v) => (v === file.source)
-        );
-
-        var width = parseInt(window.document.body.clientWidth * 0.8);
-        var height = parseInt(window.document.body.clientHeight * 0.8);
-        width = width > 1160 ? 1160 : width;
-        var dialogOption = {
-          title: this.model.label || "预览媒体",
-          //pane: self.$common.getParentPane(self),
-          content: [
-            {
-              component: "ct-viewerfile",
-              attrs: {
-                showTitle: false,
-                MediaAlbum: MediaAlbum,
-                groupIndex: 0,
-                index: index,
-                // width: self.modelPhotoselect.router.pageWidth + 'px',
-                // height: self.modelPhotoselect.router.pageHeight+'px',
-                width: width + "px",
-                height: height + "px",
-              },
-              on: {
-                handlePhoto(photoList) { },
-              },
-            },
-          ],
-        };
-        self.$common.openDialog(dialogOption);
+        ); 
+      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index); 
       },
       getPreviewSrcList(file) {
         if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {

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

@@ -17,7 +17,7 @@
               :src="item.thumbnailUrl"
               style="width: 100px; height: 100px"
               :z-index="previewZIndex"
-              @click="viewerOpen(photoList, index)"
+              @click="viewerfile(photoList, index)"
             >
             </el-image>
             <span
@@ -126,6 +126,7 @@ export default {
       this.photoList.splice(index, 1);
     },
     handleOpen() {
+      
       var self = this;
       var chooseList = new Array();
       if (self.modelPhotoselect.action == "") {
@@ -184,6 +185,7 @@ export default {
       self.$common.openDialog(dialogOption);
     },
     viewerOpen(list, index) {
+      debugger
       var showList = [];
       var viewerList = [];
       list.forEach((v) => {
@@ -191,7 +193,24 @@ export default {
         viewerList.push({ url: v.mediaUrl, title: v.mediaLabelName });
       });
       this.$refs.photoSelectViewer.open(showList, index, viewerList);
+
+      self.$common.viewerfile((this.title || "预览媒体"), this.newMediaAlbums, this.activeAlbumsIndex, (index || 0));
+
+
     },
+  viewerfile(list,index) {
+        var self = this;
+        var MediaAlbum = [{ albumName: this.model.label || "媒体", medias: [] }];
+
+        let fileList =list.filter((item) => {
+          return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+          MediaAlbum[0].medias.push(v);
+        });
+      self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index); 
+      },
+
     onEnd(a, b) {
       var self = this;
       self.$nextTick(function () {

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

@@ -887,7 +887,7 @@ export default {
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
               }
               self.model.getAction(field.action, submitData, callback);
             }
@@ -895,7 +895,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
             }
           }
           else if (field.isUrlInLayer) {//URL页面（弹层iframe）

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

@@ -95,7 +95,7 @@ export default {
             if (field.action) {
               var callback = function (data) {
                 MediaAlbum[0].medias = data;
-                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
               }
               self.model.getAction(field.action, submitData, callback);
             }
@@ -103,7 +103,7 @@ export default {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0);
             }
           }
           else if (field.isUrlInLayer) {//URL页面（弹层）

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

@@ -736,10 +736,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           }
         }
       },
-      getFieldValue(field)
-      {
-        if(field.type==Enum.ControlType.Switch)
-        {
+      getFieldValue(field){
+        if(field.type==Enum.ControlType.Switch 
+          || field.type==Enum.ControlType.CheckBox){
           return field.value?'1':'0';
         }
         return field.value;

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

@@ -35,7 +35,6 @@ const Iti = function (source) {
       else
         return '';
     },
-    defaultValue1: source.code2,
     get id1() {
       return source.fieldName2;
     },

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

@@ -9,7 +9,6 @@ const Ttts = function (source) {
     set value1(v) {
       source.code2 = v;
     },
-    defaultValue1: source.defaultCode2,
     get id1() {
       return source.fieldName2;
     },

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

@@ -253,6 +253,10 @@ const LibFunction = {
         item = L(field);
         item.is = 'ct-labelText';
         break;
+      case Enum.ControlType.CheckBox: //复选框
+        item = Cb(field);
+        item.is = 'ct-cb';
+        break;
       case Enum.ControlType.CheckBoxList: //复选列表
         item = Checkbox(field);
         item.is = 'ct-checkbox';
@@ -372,10 +376,6 @@ const LibFunction = {
         item = SensitiveEye(field);
         item.is = 'ct-sensitiveeye';
         break;
-      case Enum.ControlType.CheckBox: //复选框
-        item = Cb(field);
-        item.is = 'ct-cb';
-        break;
       case Enum.ControlType.CustomizeColumns: //拖拽排序
         item = DragSort(field);
         item.is = 'ct-dragSort';

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZx3GFnh04XbPwIsg9IsDICicb472qEjt5TnOI09z5hnCNUIAu4oZVWF3BDKy0Rq5Bt8KDikS0bdOQderaeT3Vj_LGGArr7FSqyVo01qlTAEKZf2IuU3zCP3e3cPf5x7jINn9nsovSZMnIfBDn1CWOiEnmnmiNLDNHB6w0AAP__.S8GpMp0QsAvU3rUclegNyD0VCgVWxpMFKmKQNFPcn-4',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzrEOwjAMBNB_8VxLdWKcpBtNy8JHVIkSpDIh2kogxL-TId2684Ybbrn7wLJF6MBUeBC7yVV4ELuJiJ0hGfHsjEcW1mjJW_Qsni_DqH0_QAP59YCORJxY4ZYbmMNai7Yoxbbk5zW__3Huvs5lNqSgFN0UBiuCnAKhO8WI0eUcI6uUk4bvDwAA__8.7hkTnbfWX2X-x8TQqtnB1Va0K3FyZSL7ajbd0TdZds8',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',