cloud-web-corejs 1.0.54-dev.73 → 1.0.54-dev.731

package/src/components/Tinymce/index.vue

@@ -1,19 +1,31 @@
 <template>
-  <div :class="[fullscreen?'fullscreen':null,readonly?'readonly':null,]" class="tinymce-container"
-       :style="{ width: containerWidth }">
-    <textarea :id="tinymceId" class="tinymce-textarea" v-if="isActivated"/>
+  <div
+    :class="[fullscreen ? 'fullscreen' : null, readonly ? 'readonly' : null]"
+    class="tinymce-container"
+    :style="{ width: containerWidth }"
+  >
+    <textarea :id="tinymceId" class="tinymce-textarea" v-if="isActivated" />
     <!-- <div class="editor-custom-btn-container">
       <editorImage color="#ED6C44 " class="editor-upload-btn" @successCBK="imageSuccessCBK" />
     </div> -->
     <template v-if="!readonly">
       <div class="editor-custom-btn-container">
         <div class="upload-container">
-          <el-button icon="el-icon-upload" size="mini" type="primary" @click="handleShow({ key: 'value' })">
-            {{ $t2('上传', 'components.Tinymce.uploadButton') }}
+          <el-button
+            icon="el-icon-upload"
+            size="mini"
+            type="primary"
+            @click="handleShow({ key: 'value' })"
+          >
+            {{ $t2("上传", "components.Tinymce.uploadButton") }}
           </el-button>
         </div>
       </div>
-      <vab-upload ref="vabUpload" accept="image/png, image/jpeg" @callback="fileConfirm"></vab-upload>
+      <vab-upload
+        ref="vabUpload"
+        accept="image/png, image/jpeg"
+        @callback="fileConfirm"
+      ></vab-upload>
     </template>
   </div>
 </template>
@@ -23,56 +35,56 @@
  * docs:
  * https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
  */
-import plugins from './plugins';
-import toolbar from './toolbar';
-import load from './dynamicLoadScript';
+import plugins from "./plugins";
+import toolbar from "./toolbar";
+import load from "./dynamicLoadScript";
 // import EditorImage from './components/EditorImage.vue'
 
 // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
-const tinymceCDN = window.WEB_PREFIX + '/base/tinymce/tinymce.min.js';
+const tinymceCDN = window.WEB_PREFIX + "/base/tinymce/tinymce.min.js";
 
 export default {
-  name: 'Tinymce',
-  components: {VabUpload: () => import('../../components/VabUpload/index.vue')},
+  name: "Tinymce",
+  components: { VabUpload: () => import("../../components/VabUpload/index.vue") },
   props: {
     id: {
       type: String,
       default: function () {
-        return 'vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + '');
-      }
+        return "vue-tinymce-" + +new Date() + ((Math.random() * 1000).toFixed(0) + "");
+      },
     },
     value: {
       type: String,
-      default: ''
+      default: "",
     },
     toolbar: {
       type: Array,
       required: false,
       default() {
         return [];
-      }
+      },
     },
     menubar: {
       type: String,
-      default: 'file edit insert view format table'
+      default: "file edit insert view format table",
     },
     height: {
       type: [Number, String],
       required: false,
-      default: 360
+      default: 360,
     },
     width: {
       type: [Number, String],
       required: false,
-      default: 'auto'
+      default: "auto",
     },
     color: {
       type: String,
-      default: '#1890ff'
+      default: "#1890ff",
     },
     readonly: {
       type: Boolean,
-      default: () => false
+      default: () => false,
     },
   },
   data() {
@@ -83,11 +95,11 @@ export default {
       tinymceId: this.id,
       fullscreen: false,
       languageTypeList: {
-        en: 'en',
-        zh: 'zh_CN',
-        es: 'es_MX',
-        ja: 'ja'
-      }
+        en: "en",
+        zh: "zh_CN",
+        es: "es_MX",
+        ja: "ja",
+      },
     };
   },
   computed: {
@@ -98,14 +110,14 @@ export default {
         return `${width}px`;
       }
       return width;
-    }
+    },
   },
   watch: {
     value(val) {
       if (!this.hasChange && this.hasInit) {
-        this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val || ''));
+        this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val || ""));
       }
-    }
+    },
   },
   mounted() {
     this.init();
@@ -115,7 +127,7 @@ export default {
       this.isActivated = true;
       this.$nextTick(() => {
         this.initTinymce();
-      })
+      });
     }
   },
   deactivated() {
@@ -127,11 +139,18 @@ export default {
   },
   methods: {
     handleShow(data) {
-      this.$refs['vabUpload'].handleShow(data);
+      this.$baseUpload.open({
+        accept: "image/png, image/jpeg",
+        callback: this.fileConfirm,
+        // pickPrivateProfile:this.pickPrivateProfile,
+        // confirmUpload: this.confirmUpload,
+        // otherParams: this.$attrs,
+      });
+      // this.$refs['vabUpload'].handleShow(data);
     },
     init() {
       // dynamic load tinymce from cdn
-      load(tinymceCDN, err => {
+      load(tinymceCDN, (err) => {
         if (err) {
           this.$message.error(err.message);
           return;
@@ -142,47 +161,47 @@ export default {
     },
     initTinymce() {
       const _this = this;
-      let locale = this.$i18n && this.$i18n.locale ? this.$i18n.locale : 'zh';
+      let locale = this.$i18n && this.$i18n.locale ? this.$i18n.locale : "zh";
       window.tinymce.init({
         selector: `#${this.tinymceId}`,
         language: this.languageTypeList[locale],
         height: this.height,
-        body_class: 'panel-body ',
+        body_class: "panel-body ",
         object_resizing: false,
         toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
         menubar: this.menubar,
         plugins: plugins,
         end_container_on_empty_block: true,
-        powerpaste_word_import: 'clean',
+        powerpaste_word_import: "clean",
         code_dialog_height: 450,
         code_dialog_width: 1000,
-        advlist_bullet_styles: 'square',
-        advlist_number_styles: 'default',
-        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
-        default_link_target: '_blank',
+        advlist_bullet_styles: "square",
+        advlist_number_styles: "default",
+        imagetools_cors_hosts: ["www.tinymce.com", "codepen.io"],
+        default_link_target: "_blank",
         link_title: false,
         nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
         paste_data_images: true, // 允许粘贴图像
         readonly: this.readonly,
-        init_instance_callback: editor => {
+        init_instance_callback: (editor) => {
           if (_this.value) {
             editor.setContent(_this.value);
           }
           _this.hasInit = true;
-          editor.on('NodeChange Change KeyUp SetContent', () => {
+          editor.on("NodeChange Change KeyUp SetContent", () => {
             this.hasChange = true;
-            this.$emit('input', editor.getContent());
+            this.$emit("input", editor.getContent());
           });
         },
         setup(editor) {
-          editor.on('FullscreenStateChanged', e => {
+          editor.on("FullscreenStateChanged", (e) => {
             _this.fullscreen = e.state;
           });
         },
         // it will try to keep these URLs intact
         // https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
         // https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
-        convert_urls: false
+        convert_urls: false,
         // 整合七牛上传
         // images_dataimg_filter(img) {
         //   setTimeout(() => {
@@ -198,31 +217,50 @@ export default {
         //   }, 0);
         //   return img
         // },
-        // images_upload_handler(blobInfo, success, failure, progress) {
-        //   progress(0);
-        //   const token = _this.$store.getters.token;
-        //   getToken(token).then(response => {
-        //     const url = response.data.qiniu_url;
-        //     const formData = new FormData();
-        //     formData.append('token', response.data.qiniu_token);
-        //     formData.append('key', response.data.qiniu_key);
-        //     formData.append('file', blobInfo.blob(), url);
-        //     upload(formData).then(() => {
-        //       success(url);
-        //       progress(100);
-        //     })
-        //   }).catch(err => {
-        //     failure('出现未知问题，刷新页面，或者联系程序员')
-        //     console.log(err);
-        //   });
-        // },
+        images_upload_handler(blobInfo, success, failure, progress) {
+          /* progress(0);
+          _this.$baseUpload.upload({
+            file:blobInfo.blob(),
+            onProgress:(e)=>{
+              progress(e.percent)
+            },
+            callback:(res)=>{
+              if(res.type=="success"){
+                let url =  res.objx.domain + res.objx.url;
+                success(url);
+                progress(100);
+              }else{
+                failure(res.content)
+              }
+            },
+            error:(e)=>{
+              failure(e.message)
+            }
+          }) */
+          /* progress(0);
+          const token = _this.$store.getters.token;
+          getToken(token).then(response => {
+            const url = response.data.qiniu_url;
+            const formData = new FormData();
+            formData.append('token', response.data.qiniu_token);
+            formData.append('key', response.data.qiniu_key);
+            formData.append('file', blobInfo.blob(), url);
+            upload(formData).then(() => {
+              success(url);
+              progress(100);
+            })
+          }).catch(err => {
+            failure('出现未知问题，刷新页面，或者联系程序员')
+            console.log(err);
+          }); */
+        },
       });
     },
     destroyTinymce() {
       if (window.tinymce && window.tinymce.get) {
         const tinymce = window.tinymce.get(this.tinymceId);
         if (this.fullscreen) {
-          tinymce.execCommand('mceFullScreen');
+          tinymce.execCommand("mceFullScreen");
         }
 
         if (tinymce) {
@@ -237,17 +275,21 @@ export default {
       window.tinymce.get(this.tinymceId).getContent();
     },
     imageSuccessCBK(arr) {
-      arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`));
+      arr.forEach((v) =>
+        window.tinymce
+          .get(this.tinymceId)
+          .insertContent(`<img class="wscnph" src="${v.url}" >`)
+      );
     },
     fileConfirm(arr) {
-      let txt = ''
-      arr.forEach(v => {
-        let realUrl = v.fileData.domain + v.fileData.url;
-        txt = txt + '<img class="wscnph" src="' + realUrl + '" >'
+      let txt = "";
+      arr.forEach((v) => {
+        let realUrl = v.domain + v.url;
+        txt = txt + '<img class="wscnph" src="' + realUrl + '" >';
       });
       window.tinymce.get(this.tinymceId).insertContent(`<p>${txt}</p>`);
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -291,5 +333,4 @@ export default {
 .editor-upload-btn {
   display: inline-block;
 }
-
 </style>

package/src/components/VabUpload/fileLibraryDialog.vue

@@ -0,0 +1,296 @@
+<template>
+  <div>
+    <el-dialog
+      ref="privateProfileDialog"
+      :title="title"
+      :visible.sync="showDialog"
+      v-if="showDialog"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      width="1102px"
+      custom-class="dialog-style drag-space"
+      :destroy-on-close="true"
+      @close="handleClose"
+      v-el-drag-dialog
+      top="0px"
+    >
+      <div id="containt1">
+        <div v-show="title!='' && title !== null && title !== undefined" style="overflow: hidden;" class="flex">
+          <div class="tree-box tree-annex fl">
+            <div class="tit"><b>{{ title }}</b></div>
+            <div class="tree-form">
+              <el-input placeholder="请输入文件夹名称" v-model="filterText" class="txt">
+                <el-button slot="append" icon="el-icon-search"></el-button>
+              </el-input>
+            </div>
+            <el-tree
+              v-if="treeFlag"
+              :props="defaultProps"
+              :load="loadNode"
+              node-key="id"
+              ref="tree"
+              lazy
+              :filter-node-method="filterNode"
+              :expand-on-click-node="false"
+              @node-click="handleNodeClick"
+              class="tree-list"
+              icon-class="el-icon-arrow-down"
+            >
+              <span class="el-tree-node__label" slot-scope="{ node, data }" v-if="!node.data.moreBtn">
+                <i class="ico-wenjian"></i>
+                <span>{{ node.label }}</span>
+              </span>
+              <span v-else class="el-tree-node__label">
+                <el-button type="primary" plain class="button-sty">{{ node.label }}</el-button>
+              </span>
+            </el-tree>
+          </div>
+          <label id="labBtn">
+            <div class="icon">
+              <i class="el-icon-more"></i>
+              <i class="el-icon-more"></i>
+            </div>
+          </label>
+          <div class="main-right file-library fr" style="overflow: hidden;">
+            <div class="annex-filter" v-if="isBillEnabled">
+              <el-button slot="append" icon="el-icon-search" @click="openBillDialog" size="mini" class="an-btn-search"
+                         type="success"></el-button>
+              <div class="abox">
+                <div class="item" v-for="(checkBillData,index) in checkBillDatas" :key="index"><span>{{
+                    getBillLabel(checkBillData)
+                  }}</span><i
+                  class="el-icon-close" @click="deleteBillData(index)"></i></div>
+              </div>
+              <el-button slot="append" icon="el-icon-delete" size="mini" class="an-btn-del" @click="clearBill">全部删除
+              </el-button>
+            </div>
+            <div class="annex-screen"
+                 v-if="fileObjAuth.downloadAuth">
+              <el-button type="primary" class="button-sty" icon="el-icon-download" @click.native="mulDownload2"
+                         v-if="fileObjAuth.downloadAuth">下载
+              </el-button>
+            </div>
+            <div class="line"
+                 v-if="fileObjAuth.downloadAuth"></div>
+            <div class="annex-crumbs">
+              <span class="tit"><i class="iconfont icon-wenjianjia"></i>文件区</span>
+              <span class="tit" style="padding-right: 0;">指定路径：</span>
+              <el-breadcrumb separator-class="el-icon-arrow-right">
+                <el-breadcrumb-item v-for="treeNode in treeNodeArr" :key="treeNode.id" @click.native="doNav(treeNode)">
+                  {{
+                    treeNode.label
+                  }}
+                </el-breadcrumb-item>
+              </el-breadcrumb>
+            </div>
+            <div class="grid-height viewBox">
+              <div class="annex-searchBox">
+                <div class="fl">
+                  <div class="oper">
+                    <el-checkbox v-model="checkAll" @change="changeCheckAll" :disabled="checkAllDisabled"
+                                 :indeterminate="checkAllIndeterminate">已选中 {{
+                        checkList.length
+                      }} 项
+                    </el-checkbox>
+                  </div>
+                  <div class="search-box">
+                    <template v-if="currentFileCategory && currentFileCategory.id">
+                      <el-input placeholder="请输入文件名" v-model="formData.fileName" clearable>
+                        <el-button slot="append" icon="el-icon-search" @click="searchEvent"></el-button>
+                      </el-input>
+                      <el-button icon="iconfont icon-shaixuan" class="button-sty" @click="showAdvancedSearch = true">筛选
+                      </el-button>
+                    </template>
+                  </div>
+
+                </div>
+                <div class="fr">
+                  <el-button type="primary" icon="iconfont icon-icmenu2" @click="changeShowType()"
+                             class="button-sty icon-btn"
+                             v-show="showType==1">列表
+                  </el-button>
+                  <el-button type="primary" style="margin-left:0;" icon="el-icon-menu" @click="changeShowType()"
+                             class="button-sty icon-btn"
+                             v-show="showType==2">图示
+                  </el-button>
+                </div>
+              </div>
+              <div class="mask" v-show="is_show_mask">
+              </div>
+              <div class="containter1" ref="containter1" v-show="showType==1" style="overflow: auto;">
+                <div class="annex-piclist">
+                  <div class="clearfix">
+                    <el-checkbox-group v-model="checkList" @change="checkChange" class="f-group">
+                      <template v-for="(attachment,index) in page.records">
+                        <li class="item" :class="checkList.includes(attachment.id) ? 'on':''" :key="index">
+                          <el-checkbox :label="attachment.id" :disabled="attachment.dirs"><span></span></el-checkbox>
+                          <div class="oper">
+                            <a
+                              href="javascript:void(0);"
+                              class="a-link ico"
+                              v-if="!attachment.dirs && fileObjAuth.downloadAuth"
+                              @click="$commonFileUtil.downloadFile(attachment.domain + attachment.url, attachment.fileName)"
+                            >
+                              <el-tooltip effect="dark" content="下载" placement="top"
+                                          popper-class="tooltip-skin">
+                                <i class="el-icon-download"/>
+                              </el-tooltip>
+                            </a>
+                          </div>
+                          <div class="img" @click="openPreview(attachment)" v-if="!attachment.dirs">
+                            <div class="show-video" v-if="hasPreview(attachment)"><i class="icon-chakan"></i></div>
+                            <div class="show-video" v-if="false"><i class="el-icon-video-play"></i></div>
+                            <p><img :src="getShowUrl(attachment)"/></p>
+                          </div>
+                          <div class="img" @click="changeCategory(attachment)" v-if="attachment.dirs">
+                            <svg-icon icon-class="ico-wenjianjia"/>
+                          </div>
+                          <el-tooltip :enterable="false" effect="dark" :content="attachment.fileName" placement="top">
+                            <div class="txt-box">
+                              <div class="tb-left"></div>
+                              <div class="tb-mid">
+                                <div class="txt">
+                                  <span class="name">{{ getFileName(attachment) }}</span><span
+                                  v-if="attachment.extension">.{{ attachment.extension }}</span>
+                                </div>
+                              </div>
+                              <div class="format">... .{{ attachment.extension }}</div>
+                            </div>
+
+                          </el-tooltip>
+                        </li>
+                      </template>
+                    </el-checkbox-group>
+                  </div>
+                  <div class="vxe-grid">
+                    <div class="vxe-grid&#45;&#45;pager-wrapper">
+                      <vxe-pager
+                        class="pages-box"
+                        :current-page.sync="page.current"
+                        :page-size.sync="page.size"
+                        :total="page.total"
+                        :layouts="['PrevPage', 'Number', 'NextPage']"
+                        @page-change="changePageNew"
+                      >
+                        <template #right>
+                    <span>
+                      <span>当前记录</span>
+                      <span class="f-red"> {{ page.records.length }} </span>
+                      <span>/</span>
+                      <span class="f-red"> {{ page.total }}</span>
+                    </span>
+                        </template>
+                      </vxe-pager>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="annex-grid-height">
+                <vxe-grid v-show="showType==2" ref="table-m1" v-bind="vxeOption" :data="page.records"
+                          @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
+                          @checkbox-change="tableCheckChange"
+                          @checkbox-all="tableCheckAll">
+                  <template #pager>
+                    <vxe-pager
+                      class="pages-box"
+                      :current-page.sync="page.current"
+                      :page-size.sync="page.size"
+                      :total="page.total"
+                      :layouts="['PrevPage', 'Number', 'NextPage']"
+                      @page-change="changePageNew"
+                    >
+                      <template #right>
+                      <span>
+                        <span>当前记录</span>
+                        <span class="f-red"> {{ page.records.length }} </span>
+                        <span>/</span>
+                        <span class="f-red"> {{ page.total }}</span>
+                      </span>
+                      </template>
+                    </vxe-pager>
+                  </template>
+                </vxe-grid>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      	<el-button type="primary" plain class="button-sty" @click="handleClose">
+      		<i class="el-icon-close el-icon"></i>
+      		{{ $t2('取 消', 'system.button.cancel2') }}
+      	</el-button>
+      	<el-button type="primary" @click="dialogPrimary" class="button-sty">
+      		<i class="el-icon-check el-icon"></i>
+      		{{ $t2('确 定', 'system.button.confirm2') }}
+      	</el-button>
+      </span>
+    </el-dialog>
+    <el-image-viewer v-if="showViewer" :on-close="() => {showViewer = false;}" :initial-index.sync="chooseIndex"
+                     :url-list="imageDTOs"/>
+    <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch"
+                          :formData.sync="advancedFormData" @confirm="searchEvent">
+      <template #form>
+        <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">
+          <vxe-form-item title="属性名称:">
+            <template v-slot>
+              <el-input v-model="advancedFormData.attributeName" clearable/>
+            </template>
+          </vxe-form-item>
+          <vxe-form-item title="属性值:">
+            <template v-slot>
+              <el-input v-model="advancedFormData.attributeValue" clearable/>
+            </template>
+          </vxe-form-item>
+          <!--          <vxe-form-item title="状态:">
+                      <template v-slot>
+                        <el-select v-model="advancedFormData.status" clearable>
+                          <el-option :value="0" label="未归档"></el-option>
+                          <el-option :value="1" label="已归档"></el-option>
+                        </el-select>
+                      </template>
+                    </vxe-form-item>-->
+          <vxe-form-item title="说明:" class-name="block">
+            <template v-slot>
+              <el-input v-model="advancedFormData.note" clearable/>
+            </template>
+          </vxe-form-item>
+          <vxe-form-item title="创建时间:">
+            <template v-slot>
+              <el-date-picker
+                v-model="advancedFormData.startTime"
+                type="date"
+                placeholder=""
+                size="small"
+                clearable
+                value-format="yyyy-MM-dd"
+                :picker-options="$baseStartPickerOptions(advancedFormData.endTime)"
+              ></el-date-picker>
+              <span>-</span>
+              <el-date-picker
+                v-model="advancedFormData.endTime"
+                type="date"
+                placeholder=""
+                size="small"
+                clearable
+                value-format="yyyy-MM-dd"
+                :picker-options="$baseEndPickerOptions(advancedFormData.startTime)"
+              ></el-date-picker>
+            </template>
+          </vxe-form-item>
+        </vxe-form>
+      </template>
+    </advancedSearchDialog>
+  </div>
+</template>
+
+<script>
+import mixins from './mixins/fileLibraryDialog'
+
+export default {
+  mixins: [mixins]
+};
+</script>
+<style lang="scss" scoped>
+
+</style>

package/src/components/VabUpload/image-viewer.vue

@@ -181,9 +181,9 @@ export default {
         return imageDto;
       } else {
         if (flag == 1) {
-          return imageDto.domain + imageDto.source;
+          return imageDto.domain + imageDto.url;
         } else if (flag == 2) {
-          return imageDto.domain + imageDto.medium;
+          return imageDto.domain + (imageDto.medium || imageDto.url);
         }
       }
     },