centaline-data-driven 1.4.57 → 1.4.59

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

@@ -35,17 +35,20 @@
                 <el-radio v-model="file.flagDefault" :label="true" :class="{'browseDefault':model.lock}" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
               </i>
             </span>
+            <span class="cover-list-item-span-edit" v-if="!model.lock&& file.rightCrop && file.mediaTypeID==2">
+              <i class="el-icon-edit-outline" @click="handleEdit(file)"></i>
+            </span>
             <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
               <i class="el-icon-delete" @click="handleRemove(file)"></i>
             </span>
-              <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
+            <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
               <div class="swiper-i">
-                <img :src="file.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
+                <img :src="file.videoPlayIconUrl" class="hous-icon" @click="viewerfile(file)" />
               </div>
             </span>
-             <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
+            <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
               <div class="swiper-i">
-                <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon"  @click="viewerfile(file)"/>
+                <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" @click="viewerfile(file)" />
               </div>
             </span>
             <span class="cover-list-item-span" v-if="model.lock || model.paramName">
@@ -118,17 +121,20 @@
                 <el-radio v-model="file.flagDefault" :label="true" :class="{'browseDefault':model.lock}" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
               </i>
             </span>
+            <span class="cover-list-item-span-edit" v-if="!model.lock&& file.rightCrop &&file.mediaTypeID==2">
+              <i class="el-icon-edit-outline" @click="handleEdit(file)"></i>
+            </span>
             <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
               <i class="el-icon-delete" @click="handleRemove(file)"></i>
             </span>
-              <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
+            <span class="cover-list-item-play" v-if="file.videoPlayIconUrl">
               <div class="swiper-i">
-                <img :src="file.videoPlayIconUrl" class="hous-icon"  @click="viewerfile(file)"/>
+                <img :src="file.videoPlayIconUrl" class="hous-icon" @click="viewerfile(file)" />
               </div>
             </span>
-             <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
+            <span class="cover-list-item-play" v-else-if="file.mediaTypeID==4 && (file.videoPlayIconUrl||model.videoPlayIconUrl)">
               <div class="swiper-i">
-                <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon"  @click="viewerfile(file)"/>
+                <img :src="(file.videoPlayIconUrl||model.videoPlayIconUrl)" class="hous-icon" @click="viewerfile(file)" />
               </div>
             </span>
 
@@ -259,6 +265,40 @@
         ); 
       self.$common.viewerfile(( this.model.label || "预览媒体"), MediaAlbum,0, index,self.model.mediaViewPageType); 
       },
+      handleEdit(file) {
+        var self = this;
+        var api = self.model.action;
+        var width = parseInt(window.document.body.clientWidth * 0.8);
+        width = width > 1160 ? 1160 : width;
+        var dialogOption = {
+          title: "编辑图片",
+          content: [
+            {
+              component: "ct-editpictures",
+              attrs: {
+                file: file,
+                showTitle: false,
+                api: api,
+                minWidth: self.model.min2,
+                minHeight: self.model.max2,
+                width: width + "px",
+                height: parseInt(window.document.body.clientHeight * 0.8).toString() +
+                  "px",
+              },
+              on: {
+                handleEditPhoto(file) {
+                  self.$nextTick(function () {
+                    this.model.updateFile(file);
+                    self.$common.closeDialog(dialogOption.dialog);
+                    console.log(this.model.fileList);
+                  });
+                },
+              },
+            },
+          ],
+        };
+        self.$common.openDialog(dialogOption);
+      },
       getPreviewSrcList(file) {
         if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
           let arr = this.model.fileList
@@ -435,9 +475,8 @@
         let uid = this.uploadguid();
         try {
           file.uid = uid;
-
           this.model.addfileItem(file);
-          const res = await uploadByPieces(this.model.action, { file }, this.uploadpro, options);
+          const res = await uploadByPieces(this.model.action,  file , this.uploadpro, options);
           return res;
 
         } catch (e) {
@@ -532,6 +571,18 @@
     text-align: center;
   }
 
+  .ct-file .cover-list-item-span-edit {
+    position: inherit;
+    bottom: 160px;
+    left: 65px;
+    color: #000000;
+    text-align: center;
+  }
+
+  .cover-list-item-span-edit i {
+    cursor: pointer;
+  }
+
   .ct-file .cover-list-item-span-delete {
     position: inherit;
     bottom: 160px;

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

@@ -639,7 +639,10 @@ export default {
         }
         else {
           if (this.$parent.$parent.$vnode.componentOptions.tag === "ct-PropertySimpleDetailRET") {
-            var h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
+            var h1 = 0;
+            if (this.$parent.$parent.$parent.$parent.$refs.sidebar) {
+              h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
+            }
             var h2 = 0;
             if (this.$parent.$parent.$refs.contact) {
               h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;

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

@@ -407,6 +407,9 @@
         this.$refs.viewerImage.zoom(n);
       }
     },
+    destroyed() {
+      window.onresize = null;
+    },
   };
 </script>
 

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

@@ -9,6 +9,12 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
   var self = this;
   var init = function (data) {
     var rtn = {
+      get min2() {
+        return source.minValue2;
+      },
+      get max2() {
+        return source.maxValue2;
+      },
       get action() {
         return router && router.action ? router.action : "";//上传完整地址
       },
@@ -170,6 +176,18 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           get fileName() {
             return fileSource.fileName;
           },
+          get savedFileName() {
+            return fileSource.savedFileName;
+          },
+          get originalSavedFileName() {
+            return fileSource.originalSavedFileName;
+          },
+          get mediaDate() {
+            return fileSource.mediaDate;
+          },
+          get originalMediaDate() {
+            return fileSource.originalMediaDate;
+          },
           get mediaUrl() {
             return fileSource.mediaUrl;
           },
@@ -194,6 +212,12 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           set rightDel(v) {
             fileSource.rightDel = v;
           },
+          get rightCrop() {
+            return fileSource.rightCrop;
+          },
+          set rightCrop(v) {
+            fileSource.rightCrop = v;
+          },
           get rightDownload() {
             return fileSource.rightDownload;
           },
@@ -251,10 +275,15 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           Vue.set(file, "source", data.source);
           Vue.set(file, "mediaUrl", data.mediaUrl);
           Vue.set(file, "fileName", data.fileName);
+          Vue.set(file, "savedFileName", data.savedFileName);
+          Vue.set(file, "originalSavedFileName", data.originalSavedFileName);
+          Vue.set(file, "mediaDate", data.mediaDate);
+          Vue.set(file, "originalMediaDate", data.originalMediaDate);
           Vue.set(file, "flagDefault", data.flagDefault);
           Vue.set(file, "mediaTypeID", data.mediaTypeID);
           Vue.set(file, "flagDeleted", data.flagDeleted);
           Vue.set(file, "actionType", data.actionType);
+          Vue.set(file, "rightCrop", data.rightCrop);
           Vue.set(file, "rightDel", data.rightDel);
           Vue.set(file, "rightEdit", data.rightEdit);
           Vue.set(file, "rightDownload", data.rightDownload);
@@ -282,10 +311,15 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           "source": {},
           "mediaUrl": "",
           "fileName": "",
+          "savedFileName": "",
+          "originalSavedFileName": "",
+          "mediaDate": "",
+          "originalMediaDate": "",
           "flagDefault": "",
           "mediaTypeID": "",
           "flagDeleted": "",
           "actionType": "",
+          "rightCrop": "",
           "rightDel": "",
           "rightEdit": "",
           "rightDownload": "",
@@ -295,7 +329,7 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           "progressFlag": true,
           "loadProgress": 0,
           "uid": file.uid,
-          "videoPlayIconUrl":""
+          "videoPlayIconUrl": ""
         }
         rtn.fileList.push(awaitfile);
       },
@@ -316,10 +350,15 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             Vue.set(file, "source", data.source);
             Vue.set(file, "mediaUrl", data.mediaUrl);
             Vue.set(file, "fileName", data.fileName);
+            Vue.set(file, "savedFileName", data.savedFileName);
+            Vue.set(file, "originalSavedFileName", data.originalSavedFileName);
+            Vue.set(file, "mediaDate", data.mediaDate);
+            Vue.set(file, "originalMediaDate", data.originalMediaDate);
             Vue.set(file, "flagDefault", data.flagDefault);
             Vue.set(file, "mediaTypeID", data.mediaTypeID);
             Vue.set(file, "flagDeleted", data.flagDeleted);
             Vue.set(file, "actionType", data.actionType);
+            Vue.set(file, "rightCrop", data.rightCrop);
             Vue.set(file, "rightDel", data.rightDel);
             Vue.set(file, "rightEdit", data.rightEdit);
             Vue.set(file, "rightDownload", data.rightDownload);
@@ -342,10 +381,15 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             source: data.source,
             mediaUrl: data.mediaUrl,
             fileName: data.fileName,
+            savedFileName: data.savedFileName,
+            originalSavedFileName: data.originalSavedFileName,
+            mediaDate: data.mediaDate,
+            originalMediaDate: data.originalMediaDate,
             flagDefault: data.flagDefault,
             mediaTypeID: data.mediaTypeID,
             flagDeleted: data.flagDeleted,
             actionType: data.actionType,
+            rightCrop: data.rightCrop,
             rightDel: data.rightDel,
             rightEdit: data.rightEdit,
             rightDownload: data.rightDownload,
@@ -354,7 +398,7 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             fileExtension: data.fileExtension,
             progressFlag: data.progressFlag,
             loadProgress: data.loadProgress,
-            videoPlayIconUrl:data.videoPlayIconUrl,
+            videoPlayIconUrl: data.videoPlayIconUrl,
             "uid": file.uid,
           })
         }
@@ -391,6 +435,21 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
           }
         }
       },
+      updateFile(file) {
+        for (let i = 0; i < rtn.fileList.length; i++) {
+          if (rtn.fileList[i].uid === file.uid) {
+            for (let j = 0; j < fileSourceList.length; j++) {
+              if (file.source === fileSourceList[j]) {
+                fileSourceList[j].mediaUrl = file.mediaUrl;
+                fileSourceList[j].savedFileName = file.savedFileName;
+                fileSourceList[j].mediaDate = file.mediaDate;
+                break;
+              }
+            }
+            break;
+          }
+        }
+      },
       setDefault(file) {
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {

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

@@ -23,7 +23,7 @@ async function postFile(api, data, callback) {
 }
 
 //分片上传
-const uploadByPieces = async (url, { file }, callback, uploadOptions) => {
+const uploadByPieces = async (url,  file , callback, uploadOptions) => {
   var uploadData = { blockSize: 1 * 218 * 1024, nextOffSet: 0 };
   // 获取当前chunk数据
   const getChunkInfo = (file, data) => {

package/src/main.js

@@ -44,7 +44,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMw7DizQ6cLNh6CsGFJsDICicZ4d9FAR-8rXvGb_14wzhFK0BXc0UZjK7ijjYaITUlqPJoGZGGHnoLHwBL4XNUunCrIID1uUJKo5izqLIOhnX6DmOTuO8xjul_S8x9x12lYbpeY2JnvsVdPyDE5jFYYprY7kKOiW7rh_QEAAP__.5JCaEz5Jd4ZZk9bHH5f2BtSoZLapz5MX2JzWPHwZapA',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPs7MzO7tDpgo2HIKAUWBmBRGO8uxqho_cVr3jN_08Y5w5KiAu4oZXGFnBDKw2RWCStcWcxo6gwJsoJs2iWQ1Vz3ldQQH-_QkkaI3FScwUM7fQLLnj_DfPY34794x_nLtPwmVWXWs-mSBQYhc-ExkLo2CSY706JO3i9AQAA__8._Mi7hEb24cV9OSQp0CR2iKvbIWspEBgTdVKFTeAXyAU',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',