@cmstops/pro-compo 3.9.0-beta.1 → 3.9.1-harbin.0

package/lib/editMetaInfo/style/index.less

@@ -1,60 +1,60 @@
-.edit-meta-info-dialog-body {
-  padding: 0;
-
-  .style-form-item {
-    position: relative;
-    top: -10px;
-
-    .title {
-      max-width: 100%;
-      color: var(--color-text-2);
-      font-weight: 400;
-      font-size: 14px;
-      white-space: normal;
-    }
-  }
-
-  .select-thumb-wrap {
-    margin-left: 20.8%;
-  }
-
-  .horizontal {
-    // display: flex;
-    // align-items: center;
-    // flex-direction: row !important;
-    // .arco-form-item-label-col {
-    //   margin-bottom: 0;
-    //   padding-right: 16px;
-    //   text-align: right;
-    // }
-  }
-
-  .input-w {
-    width: 450px;
-  }
-
-  .silence {
-    .arco-form-item-wrapper-col {
-      .arco-form-item-content {
-        display: block;
-
-        .arco-switch {
-          margin: 4px 0;
-        }
-
-        .silence-options {
-          margin-top: 20px;
-          margin-left: -75px;
-
-          .info {
-            margin-top: 12px;
-            padding-left: 5px;
-            color: #878e96;
-            font-size: 14px;
-            line-height: 1.5;
-          }
-        }
-      }
-    }
-  }
-}
+.edit-meta-info-dialog-body {
+  padding: 0;
+
+  .style-form-item {
+    position: relative;
+    top: -10px;
+
+    .title {
+      max-width: 100%;
+      color: var(--color-text-2);
+      font-weight: 400;
+      font-size: 14px;
+      white-space: normal;
+    }
+  }
+
+  .select-thumb-wrap {
+    margin-left: 20.8%;
+  }
+
+  .horizontal {
+    // display: flex;
+    // align-items: center;
+    // flex-direction: row !important;
+    // .arco-form-item-label-col {
+    //   margin-bottom: 0;
+    //   padding-right: 16px;
+    //   text-align: right;
+    // }
+  }
+
+  .input-w {
+    width: 450px;
+  }
+
+  .silence {
+    .arco-form-item-wrapper-col {
+      .arco-form-item-content {
+        display: block;
+
+        .arco-switch {
+          margin: 4px 0;
+        }
+
+        .silence-options {
+          margin-top: 20px;
+          margin-left: -75px;
+
+          .info {
+            margin-top: 12px;
+            padding-left: 5px;
+            color: #878e96;
+            font-size: 14px;
+            line-height: 1.5;
+          }
+        }
+      }
+    }
+  }
+}

package/lib/emptyData/style/index.less

@@ -1,34 +1,34 @@
-.empty-data-container {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  display: block;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 220px;
-  transform: translate(-50%, -50%);
-
-  &.small {
-    width: 160px;
-  }
-
-  img {
-    width: 100%;
-  }
-
-  .custom-icon {
-    width: 100%;
-  }
-
-  .tip {
-    margin-top: 16px;
-    color: #999eaa;
-    font-size: 14px;
-  }
-
-  .slot-view {
-    margin-top: 16px;
-  }
-}
+.empty-data-container {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  display: block;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 220px;
+  transform: translate(-50%, -50%);
+
+  &.small {
+    width: 160px;
+  }
+
+  img {
+    width: 100%;
+  }
+
+  .custom-icon {
+    width: 100%;
+  }
+
+  .tip {
+    margin-top: 16px;
+    color: #999eaa;
+    font-size: 14px;
+  }
+
+  .slot-view {
+    margin-top: 16px;
+  }
+}

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;

package/lib/imageCrop/component.js

@@ -424,9 +424,10 @@ const _sfc_main = vue.defineComponent({
                     onClick: cancelDialog
                   }, {
                     default: vue.withCtx(() => _cache[5] || (_cache[5] = [
-                      vue.createTextVNode("\u53D6\u6D88")
+                      vue.createTextVNode("\u53D6\u6D88", -1)
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [5]
                   }),
                   vue.withDirectives(vue.createVNode(vue.unref(webVue.Button), {
                     size: "medium",
@@ -435,9 +436,10 @@ const _sfc_main = vue.defineComponent({
                     onClick: save
                   }, {
                     default: vue.withCtx(() => _cache[6] || (_cache[6] = [
-                      vue.createTextVNode("\u88C1\u526A")
+                      vue.createTextVNode("\u88C1\u526A", -1)
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [6]
                   }, 8, ["loading"]), [
                     [vue.vShow, !croppering.value]
                   ])