eoss-ui 0.5.79 → 0.5.81-beta

package/packages/upload/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-upload
-    v-if="isRender"
+    v-if="isRender && url"
     ref="upload"
     v-bind="$attrs"
     class="es-upload"
@@ -16,7 +16,7 @@
     :readonly="isReadonly"
     :class="[
       {
-        'es-avatar-uploader': portrait,
+        'es-avatar-uploader': portrait && !$slots.default,
         'es-upload-readonly': isReadonly && !downloads
       },
       'es-upload-' + listType
@@ -418,6 +418,7 @@ export default {
   },
   data() {
     return {
+      url: this.action,
       lists: [],
       image: '',
       fileAccept: '',
@@ -433,9 +434,10 @@ export default {
       videoChange: false,
       source: '',
       excludeNames: '',
-      previewAdjunct: previewAdjunct,
       boxHeight: this.listHeight,
-      kkfileview: null
+      previewAdjunct: previewAdjunct,
+      kkfileview: null,
+      dochubConfig: {}
     };
   },
   computed: {
@@ -481,14 +483,6 @@ export default {
       }
       return this.showFileList;
     },
-    url() {
-      let url = this.action
-        ? this.action
-        : this.portrait
-        ? uploadOnlyOne
-        : uploads;
-      return url.indexOf(this.host) > -1 ? url : this.host + url;
-    },
     excludes() {
       return this.exclude ? this.exclude : this.excludeNames;
     },
@@ -713,6 +707,12 @@ export default {
           this.fileAccept = config.accept;
           this.fileSize = config.size;
           this.fileTotalSize = config.totalSize;
+          this.dochubConfig = config.dochubConfig || {};
+
+          let url = this.portrait
+            ? this.dochubConfig.reuploadDocument || uploadOnlyOne
+            : this.dochubConfig.uploadDocument || uploads;
+          this.url = url.indexOf(this.host) > -1 ? url : this.host + url;
         } else {
           util
             .ajax({
@@ -734,6 +734,12 @@ export default {
                       })
                       .join(',');
                   }
+                  this.dochubConfig = res.results.dochubConfig || {};
+                  let url = this.portrait
+                    ? this.dochubConfig.reuploadDocument || uploadOnlyOne
+                    : this.dochubConfig.uploadDocument || uploads;
+                  this.url =
+                    url.indexOf(this.host) > -1 ? url : this.host + url;
                   if (res.results.kkViewRootPath) {
                     this.kkfileview = res.results.kkViewRootPath;
                   }
@@ -744,7 +750,8 @@ export default {
                   store.set(this.code, {
                     accept: this.fileAccept,
                     size: this.fileSize,
-                    totalSize: this.fileTotalSize
+                    totalSize: this.fileTotalSize,
+                    dochubConfig: this.dochubConfig
                   });
                 }
               }
@@ -851,78 +858,117 @@ export default {
           if (res.status === 'success') {
             let suffix = file.suffix;
             suffix = suffix.toLowerCase();
-            if (
-              suffix.includes('doc') ||
-              suffix.includes('docx') ||
-              suffix.includes('xls') ||
-              suffix.includes('xlsx') ||
-              suffix.includes('ppt')
-            ) {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
+            if (this.dochubConfig.previewDocumentUrl) {
+              if (
+                suffix.includes('jpge') ||
+                suffix.includes('jpg') ||
+                suffix.includes('gif') ||
+                suffix.includes('png')
+              ) {
+                this.imgUrl =
+                  res.url && util.startWith(url, ['http', '/', true])
+                    ? res.url
+                    : this.host +
+                      (url
+                        ? url
+                        : `${this.previewAdjunct}?adjunctId=${file.adjunctId}`);
+                this.title = file.originalName;
+                this.showImg = true;
+                this.$nextTick(() => {
+                  this.loadImage();
+                });
+              } else if (suffix.includes('mp4')) {
+                this.source = {
+                  src:
+                    this.host +
+                    (url
+                      ? url
+                      : `${this.previewAdjunct}?adjunctId=${file.adjunctId}`)
+                };
+                this.title = file.originalName;
+                this.showVideo = true;
               } else {
                 util.win.open(
                   this.host +
-                    (url ? url : previewAdjunctOffice) +
-                    '?cmd=view&bucketName=' +
-                    file.absolutePath +
-                    '&fileId=' +
-                    file.adjunctId +
-                    '&fileName=' +
-                    file.newName
+                    (url
+                      ? url
+                      : `${this.dochubConfig.previewDocumentUrl}?documentId=${file.adjunctId}&action=附件预览`)
                 );
               }
-            } else if (suffix.includes('pdf')) {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
-              } else {
-                util.win.open(
-                  this.host +
-                    (url ? url : previewAdjunct2) +
-                    '/' +
-                    file.originalName +
-                    '?adjunctId=' +
-                    file.adjunctId
-                );
-              }
-            } else if (
-              suffix.includes('jpge') ||
-              suffix.includes('jpg') ||
-              suffix.includes('gif') ||
-              suffix.includes('png')
-            ) {
-              this.imgUrl =
-                res.url && util.startWith(url, ['http', '/', true])
-                  ? res.url
-                  : this.host +
-                    (url ? url : this.previewAdjunct) +
-                    '?adjunctId=' +
-                    file.adjunctId;
-              this.title = file.originalName;
-              this.showImg = true;
-              this.$nextTick(() => {
-                this.loadImage();
-              });
-            } else if (suffix.includes('mp4')) {
-              this.source = {
-                src:
-                  this.host +
-                  (url ? url : this.previewAdjunct) +
-                  '?adjunctId=' +
-                  file.adjunctId
-              };
-              this.title = file.originalName;
-              this.showVideo = true;
             } else {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
-              } else {
-                util.win.open(
-                  this.host +
+              if (
+                suffix.includes('doc') ||
+                suffix.includes('docx') ||
+                suffix.includes('xls') ||
+                suffix.includes('xlsx') ||
+                suffix.includes('ppt')
+              ) {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util.win.open(
+                    this.host +
+                      (url ? url : previewAdjunctOffice) +
+                      '?cmd=view&bucketName=' +
+                      file.absolutePath +
+                      '&fileId=' +
+                      file.adjunctId +
+                      '&fileName=' +
+                      file.newName
+                  );
+                }
+              } else if (suffix.includes('pdf')) {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util.win.open(
+                    this.host +
+                      (url ? url : previewAdjunct2) +
+                      '/' +
+                      file.originalName +
+                      '?adjunctId=' +
+                      file.adjunctId
+                  );
+                }
+              } else if (
+                suffix.includes('jpge') ||
+                suffix.includes('jpg') ||
+                suffix.includes('gif') ||
+                suffix.includes('png')
+              ) {
+                this.imgUrl =
+                  res.url && util.startWith(url, ['http', '/', true])
+                    ? res.url
+                    : this.host +
+                      (url ? url : this.previewAdjunct) +
+                      '?adjunctId=' +
+                      file.adjunctId;
+                this.title = file.originalName;
+                this.showImg = true;
+                this.$nextTick(() => {
+                  this.loadImage();
+                });
+              } else if (suffix.includes('mp4')) {
+                this.source = {
+                  src:
+                    this.host +
                     (url ? url : this.previewAdjunct) +
                     '?adjunctId=' +
                     file.adjunctId
-                );
+                };
+                this.title = file.originalName;
+                this.showVideo = true;
+              } else {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util.win.open(
+                    this.host +
+                      (url ? url : this.previewAdjunct) +
+                      '?adjunctId=' +
+                      file.adjunctId
+                  );
+                }
               }
             }
           } else {
@@ -1034,17 +1080,19 @@ export default {
                     ? this.deleted
                     : this.remove === 'string'
                     ? this.remove
-                    : delAdjunct;
+                    : this.dochubConfig.deleteDocumentUrl || delAdjunct;
                 util
                   .ajax({
                     method: this.method,
                     url: url,
                     data: {
                       userName: userName,
+                      documentId: file.adjunctId || file.response.adjunctId,
                       id: file.adjunctId || file.response.adjunctId
                     },
                     params: {
                       userName: userName,
+                      documentId: file.adjunctId || file.response.adjunctId,
                       id: file.adjunctId || file.response.adjunctId
                     }
                   })
@@ -1078,7 +1126,9 @@ export default {
     },
     handleDownloads() {
       let url =
-        typeof this.downloads === 'string' ? this.downloads : uploadDownloads;
+        typeof this.downloads === 'string'
+          ? this.downloads
+          : this.dochubConfig.compressDownloadDocument || uploadDownloads;
       util.win.open(
         this.host +
           url +
@@ -1094,11 +1144,13 @@ export default {
         let url =
           typeof this.download === 'string'
             ? this.download
-            : downloadByAdjunctId;
+            : this.dochubConfig.downloadDocumentUrl || downloadByAdjunctId;
         util.win.open(
           this.host +
             url +
             '?adjunctId=' +
+            (file.adjunctId || file.response.adjunctId) +
+            '&documentId=' +
             (file.adjunctId || file.response.adjunctId)
         );
       } else {
@@ -1133,7 +1185,7 @@ export default {
           util
             .ajax({
               method: this.method,
-              url: uploadSort,
+              url: this.dochubConfig.sortDocumentsUrl || uploadSort,
               data: {
                 ids: ids
               },

package/src/config/api.js

@@ -36,6 +36,7 @@ export const getApplicationIdArray = '/main2/main/getApplicationIdArray'; // 获
 export const getComplexApplications = '/main2/menu/getComplexApplications'; // 获取当前用户菜单; 含页签菜单格式的数据
 export const getComplexApplicationsNew =
   '/main2/menu/getComplexApplicationsNew'; // 获取当前用户应用菜单; 含页签菜单格式的数据
+export const getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag';// 获取应用
 export const getUserCustomInfo = '/main2/main/getUserCustomInfo'; // 获取主题样式
 export const updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更新主题样式
 // 框架 - 系统消息

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.79',
+  version: '0.5.81-beta',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -296,7 +296,7 @@ const ajax = function ({
           }, 1000);
         }
         // eslint-disable-next-line no-undef
-        return Promise.resolve(response.data);
+        return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
       }
     },
     error => {
@@ -2530,7 +2530,7 @@ const replenish = function ({ data, precision }) {
     while (res.length <= len + precision) {
       res += '0';
     }
-    return parseFloat(res);
+    return res;
   }
   return data;
 };

package/packages/main/src/async-component/index.vue

@@ -1,87 +0,0 @@
-<!--
- * @Description: 异步加载网络UMD组件
- * @Version: 1.0
- * @Autor: zhaodongming
- * @Date: 2022-12-01 16:32:36
- * @LastEditors: zhaodongming
- * @LastEditTime: 2023-01-18 11:49:54
--->
-<template>
-  <component :is="comp" v-bind="$attrs" v-on="$listeners"></component>
-</template>
-
-<script>
-import { importScript } from 'runtime-import';
-import util from 'eoss-ui/src/utils/util';
-export default {
-  name: 'AsyncComponent',
-  inheritAttrs: true,
-  props: {
-    componentRenderUrl: {
-      type: [String, Object],
-      default: ''
-    }
-  },
-  data() {
-    return {
-      comp: 'div'
-    };
-  },
-  watch: {
-    componentRenderUrl: {
-      immediate: true,
-      handler: function (newVal) {
-        this.handleImport(newVal);
-      }
-    }
-  },
-  methods: {
-    async handleImport(url = '') {
-      try {
-        // 如果不是url,当作倒入组件名处理
-        if (
-          url.indexOf &&
-          (url.indexOf('http:') != -1 ||
-            url.indexOf('https:') != -1 ||
-            url.indexOf('/dev-api') != -1)
-        ) {
-          // 获取缓存中的组件
-          const catchComponent = util.win[url];
-          if (catchComponent) {
-            // 渲染缓存中的组件
-            this.comp = catchComponent;
-            // 回传props内容
-            this.$emit('handleGetProps', this.comp.props);
-            this.$emit('handle-get-props', this.comp.props);
-          } else {
-            // 加载远端umd格式组件内容
-            const comp = await importScript(url);
-            // 渲染远端组件并缓存到磁盘
-            if (!comp) {
-              this.$message.error('不是合规组件,请检查组件上传环境和语法');
-              return;
-            }
-            this.comp = comp;
-            util.win[url] = comp;
-            // 回传props内容
-            this.$emit('handleGetProps', this.comp.props);
-            this.$emit('handle-get-props', this.comp.props);
-          }
-        } else {
-          // 如果不是url则当作文本片段处理
-          this.comp = url;
-          // 回传props内容
-          // this.$emit('handleGetProps', this.comp.props);
-        }
-
-        // }
-        // debugger;
-      } catch (err) {
-        console.error(err);
-      }
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>