@cmstops/pro-compo 3.9.1-stable.0 → 3.9.1-stable.2

package/es/contentDetailList/component.js

@@ -104,6 +104,12 @@ const _sfc_main = defineComponent({
                     onCellMouseEnter: tableCellMouseEnter,
                     onCellMouseLeave: tableCellMouseLeave
                   }, {
+                    "after-index": withCtx(() => [
+                      renderSlot(_ctx.$slots, "after-index", {
+                        row: element,
+                        index
+                      })
+                    ]),
                     batch: withCtx(() => [
                       renderSlot(_ctx.$slots, "batch", {
                         row: element,
@@ -128,6 +134,12 @@ const _sfc_main = defineComponent({
                     onCellMouseEnter: tableCellMouseEnter,
                     onCellMouseLeave: tableCellMouseLeave
                   }, {
+                    "after-index": withCtx(() => [
+                      renderSlot(_ctx.$slots, "after-index", {
+                        row: element,
+                        index
+                      })
+                    ]),
                     tip: withCtx(() => [
                       renderSlot(_ctx.$slots, "tip", {
                         row: element,
@@ -224,6 +236,12 @@ const _sfc_main = defineComponent({
                   onCellMouseEnter: tableCellMouseEnter,
                   onCellMouseLeave: tableCellMouseLeave
                 }, {
+                  "after-index": withCtx(() => [
+                    renderSlot(_ctx.$slots, "after-index", {
+                      row: item,
+                      index
+                    })
+                  ]),
                   batch: withCtx(() => [
                     renderSlot(_ctx.$slots, "batch", {
                       row: item,
@@ -248,6 +266,12 @@ const _sfc_main = defineComponent({
                   onCellMouseEnter: tableCellMouseEnter,
                   onCellMouseLeave: tableCellMouseLeave
                 }, {
+                  "after-index": withCtx(() => [
+                    renderSlot(_ctx.$slots, "after-index", {
+                      row: item,
+                      index
+                    })
+                  ]),
                   tip: withCtx(() => [
                     renderSlot(_ctx.$slots, "tip", {
                       row: item,

package/es/contentDetailList/components/Content/index.js

@@ -142,7 +142,8 @@ const _sfc_main = defineComponent({
             })
           ]),
           index: withCtx(() => [
-            createElementVNode("span", _hoisted_1, toDisplayString(_ctx.index + 1), 1)
+            createElementVNode("span", _hoisted_1, toDisplayString(_ctx.index + 1), 1),
+            renderSlot(_ctx.$slots, "after-index")
           ]),
           tip: withCtx(() => [
             createCommentVNode(" \u5148\u6DFB\u52A0\u6587\u4EF6\u8D44\u6E90\uFF0C\u672A\u53D1\u5E03 "),

package/es/contentDetailList/components/Doc/index.js

@@ -37,6 +37,12 @@ const _sfc_main = defineComponent({
             index: _ctx.index
           })
         ]),
+        "after-index": withCtx(() => [
+          renderSlot(_ctx.$slots, "after-index", {
+            row: _ctx.element,
+            index: _ctx.index
+          })
+        ]),
         batch: withCtx(() => [
           renderSlot(_ctx.$slots, "batch", {
             row: _ctx.item,

package/es/docHistory/component.js

@@ -1,5 +1,5 @@
-import { defineComponent, computed, watch, onMounted, openBlock, createBlock, unref, withCtx, createVNode, createTextVNode, createElementVNode, createElementBlock, Fragment, createCommentVNode } from "vue";
-import { Drawer, Button, Spin, Scrollbar } from "@arco-design/web-vue";
+import { defineComponent, computed, watch, onMounted, openBlock, createBlock, resolveDynamicComponent, mergeProps, withCtx, createVNode, unref, createTextVNode, createElementVNode, createElementBlock, Fragment, createCommentVNode } from "vue";
+import { Button, Spin, Scrollbar, Drawer, Modal } from "@arco-design/web-vue";
 import { DEFAULT_BASE_API } from "../config.js";
 import { useDocHistory } from "./scripts/useDocHistory.js";
 import _sfc_main$2 from "./components/DocHistoryList/index.js";
@@ -13,9 +13,11 @@ const _sfc_main = defineComponent({
   __name: "component",
   props: {
     BASE_API: {},
+    wrap: { default: "drawer" },
     visible: { type: Boolean },
     docInfo: {},
-    pub: { type: Boolean }
+    pub: { type: Boolean },
+    currentIdx: {}
   },
   emits: ["update:visible", "select"],
   setup(__props, { emit: __emit }) {
@@ -27,6 +29,20 @@ const _sfc_main = defineComponent({
         emits("update:visible", val);
       }
     });
+    const wrapProps = computed(() => {
+      if (props.wrap === "drawer") {
+        return {
+          class: "doc-history-drawer-wrap",
+          title: "\u7248\u672C\u8BB0\u5F55",
+          width: 1e3
+        };
+      }
+      return {
+        bodyClass: "doc-history-modal-wrap",
+        title: "\u7248\u672C\u8BB0\u5F55",
+        width: 1e3
+      };
+    });
     const BASE_API = props.BASE_API || DEFAULT_BASE_API;
     const {
       initParams,
@@ -37,6 +53,10 @@ const _sfc_main = defineComponent({
       list,
       current
     } = useDocHistory(BASE_API);
+    const wrapComponent = {
+      drawer: Drawer,
+      modal: Modal
+    };
     function handeRevert() {
       emits("select", list.value[current.value]);
     }
@@ -49,20 +69,29 @@ const _sfc_main = defineComponent({
       },
       { immediate: true }
     );
-    onMounted(() => {
+    watch(
+      () => props.currentIdx,
+      (val) => {
+        if (val) {
+          handleSelect(val);
+        }
+      },
+      { immediate: true }
+    );
+    onMounted(async () => {
       if (!props.docInfo)
         return;
       initParams(props.docInfo.id, props.pub);
-      loadData();
+      await loadData();
+      if (props.currentIdx) {
+        handleSelect(props.currentIdx);
+      }
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(Drawer), {
+      return openBlock(), createBlock(resolveDynamicComponent(wrapComponent[_ctx.wrap]), mergeProps({
         visible: vis.value,
-        "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => vis.value = $event),
-        class: "doc-history-drawer",
-        title: "\u7248\u672C\u8BB0\u5F55",
-        width: 1e3
-      }, {
+        "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => vis.value = $event)
+      }, wrapProps.value), {
         footer: withCtx(() => [
           createVNode(unref(Button), {
             type: "primary",
@@ -123,7 +152,7 @@ const _sfc_main = defineComponent({
           ])
         ]),
         _: 1
-      }, 8, ["visible"]);
+      }, 16, ["visible"]);
     };
   }
 });

package/es/docHistory/style/index.css

@@ -105,3 +105,7 @@
 .doc-history-drawer .arco-drawer-footer {
   text-align: left;
 }
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}

package/es/docHistory/style/index.less

@@ -30,3 +30,8 @@
     text-align: left;
   }
 }
+
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}

package/es/hooks/usePopper.d.ts

@@ -1,7 +1,7 @@
 import { Placement } from '@popperjs/core';
 import { Ref } from 'vue';
 export default function usePopper(pannel: Ref<HTMLElement | undefined>, triggerEl: Ref<HTMLElement | undefined>): {
-    initPopper: (placement?: Placement) => void;
+    initPopper: (placement?: Placement, of?: number[] | undefined) => void;
     show: () => void;
     hide: () => void;
     visible: Ref<boolean, boolean>;

package/es/hooks/usePopper.js

@@ -8,16 +8,16 @@ function usePopper(pannel, triggerEl) {
   };
   const show = () => {
     visible.value = true;
-    window.onclick = (e) => {
+    window.onclick = () => {
       hide();
       visible.value = false;
       window.onclick = null;
     };
   };
-  const initPopper = (placement = "bottom-start") => {
+  const initPopper = (placement = "bottom-start", of) => {
     if (!pannel.value || !triggerEl.value)
       return;
-    const offset = [0, 10];
+    const offset = of != null ? of : [0, 10];
     if (window.__POWERED_BY_WUJIE__) {
       offset[1] = -54;
     }

package/es/hooks/useUpload.d.ts

@@ -7,24 +7,72 @@ export declare type TypeAddMediaParam = {
     directory_id: number;
     size: number;
 };
+declare type WaterMark = {
+    id: string;
+    position: string;
+    url: string;
+    title: string;
+};
+declare type UploadTemplate = {
+    watermark?: {
+        default?: WaterMark;
+        images: WaterMark[];
+    };
+};
 export declare function getSize(value: number): string;
 export declare function addMedia(BASE_API: string, params: TypeAddMediaParam): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function getMediaDetails(BASE_API: string, repoId: number, id: number): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function reTranscodeMedia(BASE_API: string, media_id: number): Promise<import("axios").AxiosResponse<any, any>>;
 declare type UploadOptions = {
-    noAddMedia: boolean;
+    noAddMedia?: boolean;
+};
+declare type UploadFileOptions = {
+    template?: UploadTemplate;
 };
 export default function useUpload(options?: UploadOptions): {
     list: import("vue").Ref<any[], any[]>;
-    uploadFile: (BASE_API: string, file: any, dir: number | undefined, repoId: number, callback?: CallbackFunc | undefined) => void;
+    uploadFile: (BASE_API: string, file: any, dir: number | undefined, repoId: number, callback?: CallbackFunc | undefined, upOptions?: UploadFileOptions | undefined) => void;
     reTranscode: (BASE_API: string, file: any) => Promise<boolean>;
     transcodingFile: (BASE_API: string, file: any, repoId: number) => void;
     recordTaskStatusChange: (file: any, progress: number, isTrans?: boolean | undefined) => void;
     removeRecord: (file: any) => void;
 };
+export declare function getWatermarkTemplate(BASE_API: string): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function useUploadConfig(): {
     config: import("vue").Ref<any, any>;
+    template: import("vue").Ref<{
+        watermark?: {
+            default?: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            } | undefined;
+            images: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            }[];
+        } | undefined;
+    }, UploadTemplate | {
+        watermark?: {
+            default?: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            } | undefined;
+            images: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            }[];
+        } | undefined;
+    }>;
     checkFileSizeOutLimit: (file: File, callback: (msg: string) => void) => boolean;
     initUploadConfig: (BASE_API: string, domainId: number) => Promise<void>;
+    initTemplate: (BASE_API: string) => Promise<void>;
 };
 export {};

package/es/hooks/useUpload.js

@@ -73,7 +73,7 @@ function useUpload(options) {
       list.value = originList;
     }
   };
-  const uploadFile = (BASE_API, file, dir = 0, repoId, callback) => {
+  const uploadFile = (BASE_API, file, dir = 0, repoId, callback, upOptions) => {
     const newFile = {
       id: file.id || generateUUID(),
       sig_id: file.sig_id || generateUUID(),
@@ -93,18 +93,24 @@ function useUpload(options) {
     };
     const uploading = upload.start(progress);
     uploading.then(async (url) => {
+      var _a;
       if (options == null ? void 0 : options.noAddMedia) {
         recordTaskStatusChange({ ...newFile, status: 0, url }, 1);
         callback && callback({ ...newFile, url }, "success");
         return;
       }
+      const params = {};
+      if ((_a = upOptions == null ? void 0 : upOptions.template) == null ? void 0 : _a.watermark) {
+        params.watermark = upOptions.template.watermark.default;
+      }
       const { code, message } = await addMedia(BASE_API, {
         url,
         size: newFile.size,
         directory_id: dir,
         repository_id: repoId,
         catalog: newFile.type,
-        alias: newFile.name
+        alias: newFile.name,
+        ...params
       });
       if (code !== 0) {
         console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u4E0A\u4F20\u5931\u8D25\uFF1A", newFile.name, code, message);
@@ -194,9 +200,16 @@ function getConfiguration(BASE_API, params) {
     params
   });
 }
+function getWatermarkTemplate(BASE_API) {
+  return request(BASE_API, {
+    url: `/poplar/v2/material/image/watermark`,
+    method: "get"
+  });
+}
 function useUploadConfig() {
   const { get, set, remove } = useLocalstorage("LOCAL_UPLOAD_CONFIG");
   const config = ref(get() || {});
+  const template = ref({});
   async function initUploadConfig(BASE_API, domainId) {
     if (config.value.size_config_enabled != null)
       return;
@@ -245,11 +258,37 @@ function useUploadConfig() {
     );
     return false;
   }
+  async function initTemplate(BASE_API) {
+    try {
+      const { code, message } = await getWatermarkTemplate(BASE_API);
+      if (code !== 0)
+        return;
+      if (message) {
+        let defaultWaterMark;
+        if (Array.isArray(message.images)) {
+          message.images.forEach((item) => {
+            if (message.default === item.id)
+              defaultWaterMark = item;
+          });
+        }
+        template.value = {
+          watermark: {
+            default: defaultWaterMark,
+            images: message.images
+          }
+        };
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
   window.addEventListener("beforeunload", remove, false);
   return {
     config,
+    template,
     checkFileSizeOutLimit,
-    initUploadConfig
+    initUploadConfig,
+    initTemplate
   };
 }
-export { addMedia, useUpload as default, getMediaDetails, getSize, reTranscodeMedia, useUploadConfig };
+export { addMedia, useUpload as default, getMediaDetails, getSize, getWatermarkTemplate, reTranscodeMedia, useUploadConfig };

package/es/index.css

@@ -4529,11 +4529,13 @@
 }
 .resource-list-footer,
 .resource-list-header,
+.resource-list-content .resource-list-content-empty,
 .resource-list-content .arco-scrollbar-container {
   padding: 0 40px;
 }
 .resource-list-footer {
   display: flex;
+  flex-wrap: wrap;
   justify-content: space-between;
   padding-bottom: 20px;
 }
@@ -4543,6 +4545,10 @@
   gap: 10px;
   align-items: center;
   justify-content: flex-end;
+  margin-top: 10px;
+}
+.resource-list-footer .footer-right .list-selected-wrapper {
+  font-size: 12px;
 }
 .resource-list-content-loading {
   display: flex;
@@ -4554,7 +4560,7 @@
 .resource-list .list-item-grid {
   display: grid;
   grid-gap: 20px;
-  grid-template-columns: repeat(5, 1fr);
+  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
 }
 .resource-list .list-content {
   margin-top: 30px;
@@ -4597,7 +4603,8 @@
 }
 .resource-list .list-filter-wrapper .list-filter-tags {
   display: flex;
-  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 10px;
   margin-top: 10px;
 }
 .resource-list .list-filter-wrapper .list-filter-tags .list-filter-tag {
@@ -4618,16 +4625,41 @@
   justify-content: space-between;
 }
 .resource-list .list-filter-wrapper .list-filter .filter-list {
+  position: relative;
+  /** 给 popup 一个参考 */
   display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
 }
 .resource-list .list-filter-wrapper .list-filter .filter-list .filter-item {
   width: 100px;
+  margin-right: 10px;
+}
+.resource-list .list-filter-wrapper .list-filter .filter-list .arco-trigger-popup {
+  z-index: 100000 !important;
 }
 .resource-list .list-filter-wrapper .list-filter .arco-input-prepend {
   padding: 0;
 }
+.resource-list .list-filter-wrapper .list-filter .more-btn {
+  position: relative;
+  /** 给 poperjs 一个参考 */
+}
+.resource-list .list-filter-wrapper .list-filter .more-btn .filter-pannel {
+  inset: 40px auto auto auto !important;
+}
+.resource-list .list-filter-wrapper .filter-extra {
+  display: flex;
+  gap: 10px;
+}
+.resource-list .list-filter-wrapper .filter-pannel {
+  z-index: 100000;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 10px;
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
 .resource-list .title {
   display: flex;
   gap: 8px;
@@ -4641,6 +4673,10 @@
   height: 16px;
   background-color: #4886ff;
 }
+.resource-select-wrap {
+  width: 100%;
+  height: 100%;
+}
 .resource-select-modal-body {
   height: 80vh;
   padding: 0;
@@ -4669,6 +4705,11 @@
 .resource-select-container .resource-select-header .arco-tabs-content {
   display: none !important;
 }
+.resource-select-container .resource-list-content .resource-list-content-empty {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+}
 .iframe-container {
   position: relative;
   height: 95vh;
@@ -4925,6 +4966,10 @@
 .doc-history-drawer .arco-drawer-footer {
   text-align: left;
 }
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}
 .video-thumb {
   display: flex;
   flex-direction: column;