@cmstops/pro-compo 3.9.1-rc.1 → 3.9.1-rc.10

package/lib/contentDetailList/component.js

@@ -109,6 +109,12 @@ const _sfc_main = vue.defineComponent({
                     onCellMouseEnter: tableCellMouseEnter,
                     onCellMouseLeave: tableCellMouseLeave
                   }, {
+                    "after-index": vue.withCtx(() => [
+                      vue.renderSlot(_ctx.$slots, "after-index", {
+                        row: element,
+                        index: index$4
+                      })
+                    ]),
                     batch: vue.withCtx(() => [
                       vue.renderSlot(_ctx.$slots, "batch", {
                         row: element,
@@ -133,6 +139,12 @@ const _sfc_main = vue.defineComponent({
                     onCellMouseEnter: tableCellMouseEnter,
                     onCellMouseLeave: tableCellMouseLeave
                   }, {
+                    "after-index": vue.withCtx(() => [
+                      vue.renderSlot(_ctx.$slots, "after-index", {
+                        row: element,
+                        index: index$4
+                      })
+                    ]),
                     tip: vue.withCtx(() => [
                       vue.renderSlot(_ctx.$slots, "tip", {
                         row: element,
@@ -229,6 +241,12 @@ const _sfc_main = vue.defineComponent({
                   onCellMouseEnter: tableCellMouseEnter,
                   onCellMouseLeave: tableCellMouseLeave
                 }, {
+                  "after-index": vue.withCtx(() => [
+                    vue.renderSlot(_ctx.$slots, "after-index", {
+                      row: item,
+                      index: index$4
+                    })
+                  ]),
                   batch: vue.withCtx(() => [
                     vue.renderSlot(_ctx.$slots, "batch", {
                       row: item,
@@ -253,6 +271,12 @@ const _sfc_main = vue.defineComponent({
                   onCellMouseEnter: tableCellMouseEnter,
                   onCellMouseLeave: tableCellMouseLeave
                 }, {
+                  "after-index": vue.withCtx(() => [
+                    vue.renderSlot(_ctx.$slots, "after-index", {
+                      row: item,
+                      index: index$4
+                    })
+                  ]),
                   tip: vue.withCtx(() => [
                     vue.renderSlot(_ctx.$slots, "tip", {
                       row: item,

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

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

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

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

package/lib/contentDetailList/components/ShowQRCode/QrcodeView/index.js

@@ -253,7 +253,8 @@ const _sfc_main = vue.defineComponent({
               default: vue.withCtx(() => _cache[5] || (_cache[5] = [
                 vue.createTextVNode(" \u751F\u6210\u9884\u89C8\u94FE\u63A5 ")
               ])),
-              _: 1
+              _: 1,
+              __: [5]
             })) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
               vue.createVNode(vue.unref(webVue.Button), {
                 class: "auto",
@@ -263,7 +264,8 @@ const _sfc_main = vue.defineComponent({
                 default: vue.withCtx(() => _cache[6] || (_cache[6] = [
                   vue.createTextVNode(" \u590D\u5236\u4E8C\u7EF4\u7801 ")
                 ])),
-                _: 1
+                _: 1,
+                __: [6]
               }),
               vue.createVNode(vue.unref(webVue.Button), {
                 class: "auto",

package/lib/contentModal/component.js

@@ -161,7 +161,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[8] || (_cache[8] = [
                           vue.createTextVNode("\u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [8]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -200,7 +201,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[9] || (_cache[9] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [9]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -240,7 +242,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[10] || (_cache[10] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [10]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -279,7 +282,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[11] || (_cache[11] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [11]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -318,7 +322,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[12] || (_cache[12] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [12]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -357,7 +362,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[13] || (_cache[13] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [13]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -396,7 +402,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[14] || (_cache[14] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [14]
                       }, 8, ["disabled"])
                     ]),
                     _: 1
@@ -434,7 +441,8 @@ const _sfc_main = vue.defineComponent({
                         default: vue.withCtx(() => _cache[15] || (_cache[15] = [
                           vue.createTextVNode(" \u6DFB\u52A0 ")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [15]
                       }, 8, ["disabled"])
                     ]),
                     _: 1

package/lib/contentModal/components/ViewAllColumn/MediaFilter/index.js

@@ -287,7 +287,8 @@ const _sfc_main = vue.defineComponent({
                 vue.createVNode(vue.unref(icon.IconRefresh), { class: "reset-icon" }),
                 _cache[7] || (_cache[7] = vue.createTextVNode(" \u91CD\u7F6E "))
               ]),
-              _: 1
+              _: 1,
+              __: [7]
             }, 512), [
               [vue.vShow, showReset.value]
             ])

package/lib/contentModal/components/storeBox/index.js

@@ -84,7 +84,8 @@ const _sfc_main = vue.defineComponent({
                 default: vue.withCtx(() => _cache[1] || (_cache[1] = [
                   vue.createTextVNode("\u6E05\u7A7A")
                 ])),
-                _: 1
+                _: 1,
+                __: [1]
               })
             ])
           ]),
@@ -100,7 +101,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[0] || (_cache[0] = [
                     vue.createTextVNode("\u5DF2\u9009\u6570\u636E")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [0]
                 })) : vue.createCommentVNode("v-if", true)
               ]),
               _: 1

package/lib/dataTags/component.js

@@ -134,7 +134,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[1] || (_cache[1] = [
                     vue.createTextVNode("\u539F\u521B")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [1]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -152,7 +153,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[2] || (_cache[2] = [
                     vue.createTextVNode("\u63A8\u8350")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [2]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -170,7 +172,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[3] || (_cache[3] = [
                     vue.createTextVNode("\u654F\u611F")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [3]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -188,7 +191,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[4] || (_cache[4] = [
                     vue.createTextVNode("\u5DF2\u63A8\u9001")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [4]
                 }, 8, ["class"])
               ]),
               _: 1
@@ -224,7 +228,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[5] || (_cache[5] = [
                     vue.createTextVNode(" \u77E9\u9635\u5206\u53D1 ")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [5]
                 }, 8, ["class"])
               ]),
               _: 1

package/lib/docHistory/component.js

@@ -14,9 +14,11 @@ const _sfc_main = vue.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 }) {
@@ -28,6 +30,20 @@ const _sfc_main = vue.defineComponent({
         emits("update:visible", val);
       }
     });
+    const wrapProps = vue.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 || config.DEFAULT_BASE_API;
     const {
       initParams,
@@ -38,6 +54,10 @@ const _sfc_main = vue.defineComponent({
       list,
       current
     } = useDocHistory.useDocHistory(BASE_API);
+    const wrapComponent = {
+      drawer: webVue.Drawer,
+      modal: webVue.Modal
+    };
     function handeRevert() {
       emits("select", list.value[current.value]);
     }
@@ -50,20 +70,29 @@ const _sfc_main = vue.defineComponent({
       },
       { immediate: true }
     );
-    vue.onMounted(() => {
+    vue.watch(
+      () => props.currentIdx,
+      (val) => {
+        if (val) {
+          handleSelect(val);
+        }
+      },
+      { immediate: true }
+    );
+    vue.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 vue.openBlock(), vue.createBlock(vue.unref(webVue.Drawer), {
+      return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(wrapComponent[_ctx.wrap]), vue.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: vue.withCtx(() => [
           vue.createVNode(vue.unref(webVue.Button), {
             type: "primary",
@@ -73,7 +102,8 @@ const _sfc_main = vue.defineComponent({
             default: vue.withCtx(() => _cache[1] || (_cache[1] = [
               vue.createTextVNode(" \u8FD8\u539F\u6B64\u7248\u672C ")
             ])),
-            _: 1
+            _: 1,
+            __: [1]
           }, 8, ["disabled"])
         ]),
         default: vue.withCtx(() => [
@@ -124,7 +154,7 @@ const _sfc_main = vue.defineComponent({
           ])
         ]),
         _: 1
-      }, 8, ["visible"]);
+      }, 16, ["visible"]);
     };
   }
 });

package/lib/docHistory/scripts/diff.js

@@ -40,15 +40,16 @@ function CompareText(v_LeftList, v_RightList, lftPNode = null) {
     for (let i = 0; i < rightLen; i++) {
       if (!rightFather)
         rightFather = v_RightList[i].parentNode;
-      const node = v_RightList[i].clone(true);
+      const node = v_RightList[i].cloneNode(true);
       try {
         rightFather.removeChild(v_RightList[i]);
       } catch (e) {
         console.log(e);
       }
-      if (lftPNode)
+      if (lftPNode && lftPNode.nodeType !== 3) {
         lftPNode.appendChild(node);
-      PaintRemove(node);
+        PaintRemove(node);
+      }
     }
   } else if (rightLen === 0) {
     for (let i = 0; i < leftLen; i++)

package/lib/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/lib/docHistory/style/index.less

@@ -1,32 +1,37 @@
-@import './docDiffPanel.less';
-@import './docHistoryList.less';
-
-.doc-history-wrap {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-
-  .doc-diff-panel {
-    flex: 1;
-    height: 100%;
-
-    .doc-diff-panel-wrap {
-      padding: 24px;
-    }
-  }
-
-  .doc-history-list {
-    height: 100%;
-  }
-}
-
-.doc-history-drawer {
-  .arco-drawer-body {
-    padding: 0;
-  }
-
-  .arco-drawer-footer {
-    text-align: left;
-  }
-}
+@import './docDiffPanel.less';
+@import './docHistoryList.less';
+
+.doc-history-wrap {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+
+  .doc-diff-panel {
+    flex: 1;
+    height: 100%;
+
+    .doc-diff-panel-wrap {
+      padding: 24px;
+    }
+  }
+
+  .doc-history-list {
+    height: 100%;
+  }
+}
+
+.doc-history-drawer {
+  .arco-drawer-body {
+    padding: 0;
+  }
+
+  .arco-drawer-footer {
+    text-align: left;
+  }
+}
+
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}

package/lib/docPreview/component.js

@@ -95,7 +95,8 @@ const _sfc_main = vue.defineComponent({
                     default: vue.withCtx(() => _cache[8] || (_cache[8] = [
                       vue.createTextVNode(" \u590D\u5236\u94FE\u63A5 ")
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [8]
                   }, 8, ["onClick"])
                 ]),
                 vue.createCommentVNode(" \u94FE\u63A5 "),
@@ -111,7 +112,8 @@ const _sfc_main = vue.defineComponent({
                     default: vue.withCtx(() => _cache[10] || (_cache[10] = [
                       vue.createTextVNode("\u53D6\u6D88\u9884\u89C8\u94FE\u63A5")
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [10]
                   }),
                   vue.createVNode(vue.unref(webVue.Button), {
                     type: "primary",
@@ -120,7 +122,8 @@ const _sfc_main = vue.defineComponent({
                     default: vue.withCtx(() => _cache[11] || (_cache[11] = [
                       vue.createTextVNode(" \u66F4\u65B0\u9884\u89C8\u6709\u6548\u671F ")
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [11]
                   })
                 ])
               ], 64)) : vue.unref(isPublish) ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
@@ -140,7 +143,8 @@ const _sfc_main = vue.defineComponent({
                     default: vue.withCtx(() => _cache[13] || (_cache[13] = [
                       vue.createTextVNode(" \u590D\u5236\u94FE\u63A5 ")
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [13]
                   }, 8, ["onClick"])
                 ]),
                 vue.createCommentVNode(" \u94FE\u63A5 "),
@@ -180,7 +184,8 @@ const _sfc_main = vue.defineComponent({
                     default: vue.withCtx(() => _cache[18] || (_cache[18] = [
                       vue.createTextVNode(" \u751F\u6210\u9884\u89C8\u94FE\u63A5 ")
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [18]
                   })
                 ])
               ], 64))

package/lib/editMetaInfo/components/metaInfoForm.js

@@ -763,13 +763,15 @@ const _sfc_main = vue.defineComponent({
                       default: vue.withCtx(() => _cache[29] || (_cache[29] = [
                         vue.createTextVNode(" \u9ED8\u54C0\u6A21\u5F0F")
                       ])),
-                      _: 1
+                      _: 1,
+                      __: [29]
                     }),
                     vue.createVNode(vue.unref(webVue.Radio), { value: 2 }, {
                       default: vue.withCtx(() => _cache[30] || (_cache[30] = [
                         vue.createTextVNode("\u975E\u9ED8\u54C0\u6A21\u5F0F")
                       ])),
-                      _: 1
+                      _: 1,
+                      __: [30]
                     })
                   ]),
                   _: 1

package/lib/hooks/useAttachement.js

@@ -112,7 +112,7 @@ function getSysRsPage(BASE_API, params) {
 }
 function getDirectory(BASE_API, params) {
   return request(BASE_API, {
-    url: "/poplar/v3/directories",
+    url: "/poplar/v3/directory/tree",
     method: "get",
     params
   });
@@ -125,14 +125,7 @@ function useDirectory(options) {
     if (code === 0) {
       if (!Array.isArray(message.data))
         return [];
-      return message.data.map(({ alias, id }) => {
-        return {
-          title: alias,
-          key: id,
-          isLeaf: false,
-          children: []
-        };
-      });
+      return message.data;
     }
     return [];
   }

package/lib/hooks/usePopper.js

@@ -9,16 +9,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/lib/hooks/useUpload.js

@@ -75,7 +75,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 || index.generateUUID(),
       sig_id: file.sig_id || index.generateUUID(),
@@ -95,18 +95,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);
@@ -196,9 +202,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["default"]("LOCAL_UPLOAD_CONFIG");
   const config = vue.ref(get() || {});
+  const template = vue.ref({});
   async function initUploadConfig(BASE_API, domainId) {
     if (config.value.size_config_enabled != null)
       return;
@@ -247,16 +260,43 @@ 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
   };
 }
 exports.addMedia = addMedia;
 exports["default"] = useUpload;
 exports.getMediaDetails = getMediaDetails;
 exports.getSize = getSize;
+exports.getWatermarkTemplate = getWatermarkTemplate;
 exports.reTranscodeMedia = reTranscodeMedia;
 exports.useUploadConfig = useUploadConfig;