npm - @cmstops/pro-compo - Versions diffs - 3.9.1-rc.5 → 3.9.1-rc.7 - Mend

@cmstops/pro-compo 3.9.1-rc.5 → 3.9.1-rc.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/README.md +103 -76
package/es/baseFilter/component.js +71 -14
package/es/hooks/useUpload.d.ts +50 -2
package/es/hooks/useUpload.js +43 -4
package/es/selectResourceModal/components/List/ListLocal/index.js +8 -3
package/es/selectResourceModal/components/List/ListNormal/Filter.js +8 -2
package/lib/baseFilter/component.js +69 -12
package/lib/hooks/useUpload.js +43 -3
package/lib/selectResourceModal/components/List/ListLocal/index.js +6 -1
package/lib/selectResourceModal/components/List/ListNormal/Filter.js +8 -2
package/package.json +1 -1

package/README.md CHANGED Viewed

@@ -1,107 +1,134 @@
-# Arco 物料项目
+# 智媒管家业务组件库
-[物料平台文档中心](https://arco.design/docs/material/guide)
+> 快速上手：[传送门](/docs/get-start.md)
-## 快速开始
+## 模块介绍
-**在 `npm run dev` 前，请运行 `npm run add:component -- ComponentName` 创建第一个组件，否则 dev 将会因缺少 Story 入口而报错。**
+业务组件库基于 Vue3 + Storybook 搭建，结合 ArcoDesgin，包含智媒管家平台核心业务相关组件
-```
-# 添加组件
-npm run add:component -- YourComponentName
+## 版本规范
-# 开发
-npm run dev
+关于版本，这里需要提一下
-# 构建
-npm run build
+按理论来讲业务组件的版本和产品的版本不应该有强关联（即产品的版本是 3.0，业务组件可以是 1.0）
+但是因为产品的买家（即甲方爸爸）使用的产品可能是 3.1、3.2、3.3...，并且会有强定制的情况
-# 发布前预览
-npm run prepublishOnly && arco preview
+所以这里我们需要有一个约定，以便研发人员更好的溯源 & 协作 & 维护～
-# 发布至物料平台（需先发布 NPM 包）
-arco sync
-```
+当前约定如下：
+| 分支类型     | 分支名称                     | 描述                             | 使用位置      | 版本号规则                   |
+| ------------ | ---------------------------- | -------------------------------- | ------------- | ---------------------------- |
+| **主分支**   | main                         | 研发自测完毕并 _可以上线_ 的需求 | 预发布环境    | x.x.x-**rc**.y               |
+| **版本分支** | release/xxx                  | 经过完整测试的需求               | 线上/项目环境 | x.x.x-**stable**.y           |
+| **定制分支** | release/xxx-{{project.name}} | 经过测试的 _定制_ 需求           | 项目环境      | x.x.x-**{{project.name}}**.y |
+| **开发分支** | develop                      | 研发自测完毕的需求               | 测试环境      | x.x.x-**alpha**.y            |
+> 所谓 "可以上线"，有两种情况：
+>
+> 1. 是指当前产品发布计划中是否有该功能，如果有，则可以合并至 main，否则不可以
+> 2. 该功能是所有版本通用的功能，无论产品版本是多少，都可以合并至 main
+### 版本发布示例
+假设当前产品版本是 3.2.0
+此时：
-## 提供 Demo
+- 主分支 main 版本号为 3.2.0-rc.0
+- 版本分支 release/v3.2.0 版本号为 3.2.0-stable.0
+- 开发分支 develop 版本号为 3.2.0-alpha.0
-Demo 目录位于 `src/demo`。你可以在此目录中加入多个 Demo，它们将被展示在物料平台的预览页。在 `src/demo/index.js` 中，通过 JSDoc 的语法提供物料及各个 Demo 的相关信息。
+#### 示例 1：当前版本 bug 修复 A 功能和 B 功能
-```javascript
-// src/demo/index.js
+1. 第一步：基于 release/v3.2.0 版本切出：hotfix/v3.2.0-A，hotfix/v3.2.0-B
+2. 第二步：bug-A 修复后，将 hotfix/v3.2.0-A 合并至 develop 自测并发布 3.2.0-alpha.**1**
+3. 第三步：bug-B 修复后，将 hotfix/v3.2.0-B 合并至 develop 自测并发布 3.2.0-alpha.**2**
+4. 第四步：自测完毕后，将 hotfix/v3.2.0-A & hotfix/v3.2.0-B 合并至 main 并发布 3.2.0-rc.**1** 交付测试
+5. 第五步：测试完毕后，将 hotfix/v3.2.0-A & hotfix/v3.2.0-B 合并至 release/v3.2.0 并发布 3.2.0-stable.**1** 交付线上
-/**
- * @file
- * @title 组件名
- * @memberOf 组件类型，例如：数据输入
- * @description 描述你的组件。
- */
+> 注意：第二步第三步可以分开 publish，也可以都合并到 develop 之后再 publish，因为两个 bug 不一定是同一个人修复，所以会有个先后顺序
+> 但是尽量 rc 和 stable 尽量统一发布，减少版本号的迭代，方便维护和问题追溯
-/**
- * @title 基本用法
- * @description 描述你的例子
- */
-import Basic from './basic.vue';
+功能分支走向图：
-export const BasicDemo = () => Basic;
+```mermaid
+graph TD
+    A[release/v3.2.0] --> B[hotfix/v3.2.0-A]
+    A --> C[hotfix/v3.2.0-B]
+    B --> D[develop 3.2.0-alpha.1]
+    C --> E[develop 3.2.0-alpha.2]
+    D --> F[main 3.2.0-rc.1]
+    E --> F
+    F --> G[release/v3.2.0 3.2.0-stable.1]
 ```
-## API 文档
-**为了帮助他人更好地使用你的组件，请提供详细的 API 文档。**
-### 书写注释
-我们使用了 [Vue Styleguidist](https://vue-styleguidist.github.io/) 来提取组件 Props 的注释，然后自动生成组件的 API 文档。为此，如果你想对外暴露一个 Property，请参照Vue Styleguidist 的规则书写注释：
-```vue
-// ✅ 可以被正确提取的注释
-props: {
-  /**
-   * 提示文字
-   */
-  tip: String,
-  /**
-   * 按钮组件Props
-   */
-  buttonProps: {
-    // 如果使用PropType，请使用对象的形式定义
-    type: Object as PropType<Record<string, any>>,
-  },
-},
-// ❌ 没有书写注释的属性会被忽略
-props: {
-  disabled: Boolean,
-},
+#### 示例 2：历史版本 release/v3.0.0 bug 修复 C 功能
+1. 第一步：基于 release/v3.0.0 版本分支切出：hotfix/v3.0.0-C
+2. 第二步：bug-C 修复后，将 hotfix/v3.0.0-C 合并至 develop 自测，并发布 3.2.0-alpha.**3**
+3. 第三步：自测完毕后，将 hotfix/v3.0.0-C 合并至 main 并发布 3.2.0-rc.**2** 交付测试
+4. 第四步：测试完毕后，将 hotfix/v3.0.0-C 合并至 release/v3.0.0、release/v3.0.0、release/v3.1.0、release/v3.2.0；并发布：3.0.0-stable.x、3.1.0-stable.y、3.2.0-stable.**2**
+功能分支走向图：
+```mermaid
+graph TD
+    A[release/v3.0.0] --> B[hotfix/v3.0.0-C]
+    B --> C[develop 3.2.0-alpha.3]
+    C --> D[main 3.2.0-rc.2]
+    D --> E[release/v3.0.0 3.0.0-stable.x]
+    D --> F[release/v3.1.0 3.1.0-stable.y]
+    D --> G[release/v3.2.0 3.2.0-stable.2]
 ```
-### 扩展 TEMPLATE.md
+> 注意：如果是低版本的问题，尽可能的在出问题的版本处理，然后逐层向上合并（如果新版本已经修复并且代码改动较多，有冲突时，解决冲突并保留新版本原逻辑即可）
+> **如果按照社区常见的版本迭代规则，bug 的解决应该是在最新版本，旧版本的代码是不会改动的。**
+> **但是实际我们自己的业务场景必须低版本也要能解决，为了尽量不去重复写代码，只能去手动的维护一下该操作。**
-`TEMPLATE.md` 是用于自动文档生成的模板，你可以修改此文件添加更多组件的使用帮助信息，但请不要删除其原有的内容，否则可能导致内容替换失败。
+#### 示例 3：新版本 release/v3.3.0 功能 D 开发
-```markdown
-// TEMPLATE.md
----
-file: index
----
+1. 第一步：基于 release/v3.2.0 版本切出：feature/v3.3.0-D
+2. 第二步：Feat-D 开发完毕后，将 feature/v3.3.0-D 合并至 develop 自测，并发布 3.3.0-alpha.**0**
+3. 第三步：自测完毕后，将 feature/v3.3.0-D 合并至 main，并发布 3.3.0-rc.**0**
+4. 第四步：测试完毕后，基于 release/v3.2.0 切出 release/v3.3.0，将 feature/v3.3.0-D 合并至 release/v3.3.0
-# TooltipButton
+功能分支走向图：
-## 属性/Props
+```mermaid
+graph TD
+    A[release/v3.2.0] --> B[feature/v3.3.0-D]
+    B --> C[develop 3.3.0-alpha.0]
+    C --> D[main 3.3.0-rc.0]
+    A --> E[release/v3.3.0]
+    D --> E
+```
-%%Props%%
+#### 示例 4：通用功能 E 开发
-### OtherProps
+1. 第一步：基于最早版本 release/v3.0.0 切出：feature/v3.0.0-E
+2. 第二步：Feat-E 开发完毕后，将 feature/v3.0.0-E 合并至 develop 自测，并发布 3.3.0-alpha.**1**
+3. 第三步：自测完毕后，将 feature/v3.0.0-E 合并至 main，并发布 3.3.0-rc.**1**
+4. 第四步：测试完毕后，将 feature/v3.0.0-E 合并至 release/v3.0.0、releaes/v3.1.0、release/v3.2.0、release/v3.3.0
-在这里你可以书写更多组件帮助文档。
+> 业务组件库这个项目和其他模块的不同之处在于，如果这里说是新功能
+> 一般是指又抽离出了一个产品的核心业务，而这个核心业务与产品的 **版本** 关联性不强，所有版本均可使用的这种功能
-## Demos
+功能分支走向图：
-%%Demos%%
+```mermaid
+graph TD
+    A[release/v3.0.0] --> B[feature/v3.0.0-E]
+    B --> C[develop 3.3.0-alpha.1]
+    C --> D[main 3.3.0-rc.1]
+    D --> E[release/v3.0.0]
+    D --> F[release/v3.1.0]
+    D --> G[release/v3.2.0]
+    D --> H[release/v3.3.0]
 ```
-## 测试
+#### 示例 5：3.1.0 版本 _G_ 项目定制 功能 F 开发
+1. 第一步：基于 release/v3.1.0 切出：feature/v3.1.0-G-F
+2. 第二步：Feat-F 开发完毕后，基于 release/v3.1.0 切出 release/v3.1.0-G，将 feature/v3.1.0-G-F 合并至 release/v3.1.0-G，并发布 3.1.0-G.**0**
-测试目录位于 `src/__test__`。你可以在 `index.test.tsx` 中编写你的测试用例，在 `demo.test.tsx` 中可以进行基于 Demo 的快照测试。
+> 注意：如果有项目有定制，后续的任何通用更新不会覆盖该版本，所以在定制之前需和产品 **再三确认**

package/es/baseFilter/component.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { defineComponent, ref, computed, watch, nextTick, toRaw, openBlock, createElementBlock, Fragment, createElementVNode, withModifiers, createVNode, withCtx, renderList, createBlock, unref, normalizeStyle, createCommentVNode, renderSlot } from "vue";
-import { InputSearch, Select, Option, RangePicker } from "@arco-design/web-vue";
+import { defineComponent, ref, computed, watch, nextTick, toRaw, openBlock, createElementBlock, Fragment, createElementVNode, withModifiers, createVNode, withCtx, renderList, createBlock, renderSlot, unref, createTextVNode, toDisplayString, normalizeStyle, createCommentVNode } from "vue";
+import { InputGroup, Select, Option, Input, InputSearch, RangePicker, RadioGroup, Radio } from "@arco-design/web-vue";
 import _sfc_main$2 from "./components/filterItem.js";
 import _sfc_main$1 from "./components/FilterGroup.js";
 const _sfc_main = defineComponent({
@@ -37,9 +37,11 @@ const _sfc_main = defineComponent({
       });
       return _columns;
     });
-    const getOptions = (item) => {
-      return item.options ? item.options : [];
-    };
+    const getOptions = computed(() => {
+      return (item) => {
+        return item.options ? item.options : [];
+      };
+    });
     const hasValue = computed(() => {
       return (key) => {
         var _a, _b;
@@ -76,7 +78,10 @@ const _sfc_main = defineComponent({
           _form[column.range] = rangeTemp[column.range];
         } else if (column.component === "select") {
           _form[column.key] = column.defaultValue || null;
-        } else {
+        } else if (column.component === "input-group") {
+          _form[column.selectKey] = column.selectDefaultValue || "";
+          _form[column.inputKey] = column.inputDefaultValue || "";
+        } else if (column.component) {
           _form[column.key] = column.defaultValue || "";
         }
       });
@@ -178,17 +183,48 @@ const _sfc_main = defineComponent({
                 active: hasValue.value(item.key)
               }, {
                 default: withCtx(() => [
-                  item.component === "input" ? (openBlock(), createBlock(unref(InputSearch), {
-                    key: 0,
+                  item.slot ? renderSlot(_ctx.$slots, item.slot, { key: 0 }) : item.component === "input-group" ? (openBlock(), createBlock(unref(InputGroup), { key: 1 }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Select), {
+                        modelValue: form.value[item.selectKey],
+                        "onUpdate:modelValue": ($event) => form.value[item.selectKey] = $event,
+                        "default-active-first-option": "",
+                        style: { "width": "100px" }
+                      }, {
+                        default: withCtx(() => [
+                          (openBlock(true), createElementBlock(Fragment, null, renderList(item.selectOptions, (option, idx) => {
+                            return openBlock(), createBlock(unref(Option), {
+                              key: idx,
+                              value: option.value
+                            }, {
+                              default: withCtx(() => [
+                                createTextVNode(toDisplayString(option.label), 1)
+                              ]),
+                              _: 2
+                            }, 1032, ["value"]);
+                          }), 128))
+                        ]),
+                        _: 2
+                      }, 1032, ["modelValue", "onUpdate:modelValue"]),
+                      createVNode(unref(Input), {
+                        modelValue: form.value[item.inputKey],
+                        "onUpdate:modelValue": ($event) => form.value[item.inputKey] = $event,
+                        placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.inputLabel}`,
+                        style: { "width": "180px" }
+                      }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"])
+                    ]),
+                    _: 2
+                  }, 1024)) : item.component === "input" ? (openBlock(), createBlock(unref(InputSearch), {
+                    key: 2,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     style: normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
                     "allow-clear": "",
                     size: "medium",
-                    placeholder: `\u8BF7\u8F93\u5165${item.label}`
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.label}`
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "style", "placeholder"])) : createCommentVNode("v-if", true),
                   item.component === "select" ? (openBlock(), createBlock(unref(Select), {
-                    key: 1,
+                    key: 3,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     "popup-container": "#base-filter-popup-container",
@@ -196,13 +232,13 @@ const _sfc_main = defineComponent({
                     "allow-search": item.allowSearch,
                     "default-active-first-option": false,
                     style: normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
-                    placeholder: `\u8BF7\u9009\u62E9${item.label}`,
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u9009\u62E9${item.label}`,
                     onSearch: ($event) => handleSelectSearch($event, item),
                     onPopupVisibleChange: ($event) => handleSelectPopupChange($event, item),
                     onChange: ($event) => handleSelectChange($event, item)
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(getOptions(item), (opt) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(getOptions.value(item), (opt) => {
                         return openBlock(), createBlock(unref(Option), {
                           key: opt.value,
                           label: opt.label,
@@ -213,7 +249,7 @@ const _sfc_main = defineComponent({
                     _: 2
                   }, 1032, ["modelValue", "onUpdate:modelValue", "allow-search", "style", "placeholder", "onSearch", "onPopupVisibleChange", "onChange"])) : createCommentVNode("v-if", true),
                   item.component === "range-picker" ? (openBlock(), createBlock(unref(RangePicker), {
-                    key: 2,
+                    key: 4,
                     modelValue: form.value[item.key].range,
                     "onUpdate:modelValue": ($event) => form.value[item.key].range = $event,
                     style: normalizeStyle({ width: styleWidth(form.value[item.key]) }),
@@ -224,7 +260,28 @@ const _sfc_main = defineComponent({
                     "popup-container": "#base-filter-popup-container",
                     onClick: _cache[1] || (_cache[1] = withModifiers(() => {
                     }, ["stop"]))
-                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : createCommentVNode("v-if", true)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : createCommentVNode("v-if", true),
+                  item.component === "radio" ? (openBlock(), createBlock(unref(RadioGroup), {
+                    key: 5,
+                    modelValue: form.value[item.key],
+                    "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
+                    type: "button"
+                  }, {
+                    default: withCtx(() => [
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(item.options || [], (option, idx) => {
+                        return openBlock(), createBlock(unref(Radio), {
+                          key: idx,
+                          value: option.value
+                        }, {
+                          default: withCtx(() => [
+                            createTextVNode(toDisplayString(option.label), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
                 ]),
                 _: 2
               }, 1032, ["active"]);

package/es/hooks/useUpload.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/selectResourceModal/components/List/ListLocal/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { defineComponent, inject, computed, openBlock, createBlock, withCtx, renderSlot, createElementVNode, createVNode, unref, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
+import { defineComponent, inject, computed, onMounted, openBlock, createBlock, withCtx, renderSlot, createElementVNode, createVNode, unref, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
 import _sfc_main$2 from "./Upload.js";
-import useUpload from "../../../../hooks/useUpload.js";
+import useUpload, { useUploadConfig } from "../../../../hooks/useUpload.js";
 import _sfc_main$1 from "../ListWraper.js";
 const _hoisted_1 = { class: "list-upload" };
 const _hoisted_2 = { class: "list-content" };
@@ -22,6 +22,7 @@ const _sfc_main = defineComponent({
       var _a;
       return (_a = userInfo == null ? void 0 : userInfo.value) == null ? void 0 : _a.repository_id;
     });
+    const { template, initTemplate } = useUploadConfig();
     const { list, uploadFile, reTranscode, transcodingFile, removeRecord } = useUpload();
     function handleChange(file) {
       if (!baseAPI || !repoId.value)
@@ -31,7 +32,8 @@ const _sfc_main = defineComponent({
         file.file,
         0,
         repoId.value,
-        (media) => transcodingFile(baseAPI, media, repoId.value)
+        (media) => transcodingFile(baseAPI, media, repoId.value),
+        { template: template.value }
       );
     }
     async function handleOptions(e) {
@@ -54,6 +56,9 @@ const _sfc_main = defineComponent({
         removeRecord(e.item);
       }
     }
+    onMounted(() => {
+      initTemplate(baseAPI);
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$1, null, {
         "footer-extra": withCtx(() => [

package/es/selectResourceModal/components/List/ListNormal/Filter.js CHANGED Viewed

@@ -294,8 +294,14 @@ const _sfc_main = defineComponent({
                   key: "id"
                 },
                 "allow-clear": "",
-                "allow-search": ""
-              }, null, 8, ["modelValue", "data"])
+                "allow-search": "",
+                "filter-tree-node": (searchValue, nodeData) => {
+                  console.log(nodeData);
+                  if (!nodeData.alias)
+                    return false;
+                  return nodeData.alias.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
+                }
+              }, null, 8, ["modelValue", "data", "filter-tree-node"])
             ]),
             createCommentVNode(" \u7D20\u6750\u7C7B\u578B "),
             createElementVNode("div", _hoisted_7, [

package/lib/baseFilter/component.js CHANGED Viewed

@@ -38,9 +38,11 @@ const _sfc_main = vue.defineComponent({
       });
       return _columns;
     });
-    const getOptions = (item) => {
-      return item.options ? item.options : [];
-    };
+    const getOptions = vue.computed(() => {
+      return (item) => {
+        return item.options ? item.options : [];
+      };
+    });
     const hasValue = vue.computed(() => {
       return (key) => {
         var _a, _b;
@@ -77,7 +79,10 @@ const _sfc_main = vue.defineComponent({
           _form[column.range] = rangeTemp[column.range];
         } else if (column.component === "select") {
           _form[column.key] = column.defaultValue || null;
-        } else {
+        } else if (column.component === "input-group") {
+          _form[column.selectKey] = column.selectDefaultValue || "";
+          _form[column.inputKey] = column.inputDefaultValue || "";
+        } else if (column.component) {
           _form[column.key] = column.defaultValue || "";
         }
       });
@@ -179,17 +184,48 @@ const _sfc_main = vue.defineComponent({
                 active: hasValue.value(item.key)
               }, {
                 default: vue.withCtx(() => [
-                  item.component === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputSearch), {
-                    key: 0,
+                  item.slot ? vue.renderSlot(_ctx.$slots, item.slot, { key: 0 }) : item.component === "input-group" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputGroup), { key: 1 }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(vue.unref(webVue.Select), {
+                        modelValue: form.value[item.selectKey],
+                        "onUpdate:modelValue": ($event) => form.value[item.selectKey] = $event,
+                        "default-active-first-option": "",
+                        style: { "width": "100px" }
+                      }, {
+                        default: vue.withCtx(() => [
+                          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item.selectOptions, (option, idx) => {
+                            return vue.openBlock(), vue.createBlock(vue.unref(webVue.Option), {
+                              key: idx,
+                              value: option.value
+                            }, {
+                              default: vue.withCtx(() => [
+                                vue.createTextVNode(vue.toDisplayString(option.label), 1)
+                              ]),
+                              _: 2
+                            }, 1032, ["value"]);
+                          }), 128))
+                        ]),
+                        _: 2
+                      }, 1032, ["modelValue", "onUpdate:modelValue"]),
+                      vue.createVNode(vue.unref(webVue.Input), {
+                        modelValue: form.value[item.inputKey],
+                        "onUpdate:modelValue": ($event) => form.value[item.inputKey] = $event,
+                        placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.inputLabel}`,
+                        style: { "width": "180px" }
+                      }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"])
+                    ]),
+                    _: 2
+                  }, 1024)) : item.component === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputSearch), {
+                    key: 2,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     style: vue.normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
                     "allow-clear": "",
                     size: "medium",
-                    placeholder: `\u8BF7\u8F93\u5165${item.label}`
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.label}`
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "style", "placeholder"])) : vue.createCommentVNode("v-if", true),
                   item.component === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Select), {
-                    key: 1,
+                    key: 3,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     "popup-container": "#base-filter-popup-container",
@@ -197,13 +233,13 @@ const _sfc_main = vue.defineComponent({
                     "allow-search": item.allowSearch,
                     "default-active-first-option": false,
                     style: vue.normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
-                    placeholder: `\u8BF7\u9009\u62E9${item.label}`,
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u9009\u62E9${item.label}`,
                     onSearch: ($event) => handleSelectSearch($event, item),
                     onPopupVisibleChange: ($event) => handleSelectPopupChange($event, item),
                     onChange: ($event) => handleSelectChange($event, item)
                   }, {
                     default: vue.withCtx(() => [
-                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getOptions(item), (opt) => {
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getOptions.value(item), (opt) => {
                         return vue.openBlock(), vue.createBlock(vue.unref(webVue.Option), {
                           key: opt.value,
                           label: opt.label,
@@ -214,7 +250,7 @@ const _sfc_main = vue.defineComponent({
                     _: 2
                   }, 1032, ["modelValue", "onUpdate:modelValue", "allow-search", "style", "placeholder", "onSearch", "onPopupVisibleChange", "onChange"])) : vue.createCommentVNode("v-if", true),
                   item.component === "range-picker" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.RangePicker), {
-                    key: 2,
+                    key: 4,
                     modelValue: form.value[item.key].range,
                     "onUpdate:modelValue": ($event) => form.value[item.key].range = $event,
                     style: vue.normalizeStyle({ width: styleWidth(form.value[item.key]) }),
@@ -225,7 +261,28 @@ const _sfc_main = vue.defineComponent({
                     "popup-container": "#base-filter-popup-container",
                     onClick: _cache[1] || (_cache[1] = vue.withModifiers(() => {
                     }, ["stop"]))
-                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : vue.createCommentVNode("v-if", true)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : vue.createCommentVNode("v-if", true),
+                  item.component === "radio" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.RadioGroup), {
+                    key: 5,
+                    modelValue: form.value[item.key],
+                    "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
+                    type: "button"
+                  }, {
+                    default: vue.withCtx(() => [
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item.options || [], (option, idx) => {
+                        return vue.openBlock(), vue.createBlock(vue.unref(webVue.Radio), {
+                          key: idx,
+                          value: option.value
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(vue.toDisplayString(option.label), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])) : vue.createCommentVNode("v-if", true)
                 ]),
                 _: 2
               }, 1032, ["active"]);

package/lib/hooks/useUpload.js CHANGED Viewed

@@ -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/selectResourceModal/components/List/ListLocal/index.js CHANGED Viewed

@@ -23,6 +23,7 @@ const _sfc_main = vue.defineComponent({
       var _a;
       return (_a = userInfo == null ? void 0 : userInfo.value) == null ? void 0 : _a.repository_id;
     });
+    const { template, initTemplate } = useUpload.useUploadConfig();
     const { list, uploadFile, reTranscode, transcodingFile, removeRecord } = useUpload["default"]();
     function handleChange(file) {
       if (!baseAPI || !repoId.value)
@@ -32,7 +33,8 @@ const _sfc_main = vue.defineComponent({
         file.file,
         0,
         repoId.value,
-        (media) => transcodingFile(baseAPI, media, repoId.value)
+        (media) => transcodingFile(baseAPI, media, repoId.value),
+        { template: template.value }
       );
     }
     async function handleOptions(e) {
@@ -55,6 +57,9 @@ const _sfc_main = vue.defineComponent({
         removeRecord(e.item);
       }
     }
+    vue.onMounted(() => {
+      initTemplate(baseAPI);
+    });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(ListWraper, null, {
         "footer-extra": vue.withCtx(() => [

package/lib/selectResourceModal/components/List/ListNormal/Filter.js CHANGED Viewed

@@ -295,8 +295,14 @@ const _sfc_main = vue.defineComponent({
                   key: "id"
                 },
                 "allow-clear": "",
-                "allow-search": ""
-              }, null, 8, ["modelValue", "data"])
+                "allow-search": "",
+                "filter-tree-node": (searchValue, nodeData) => {
+                  console.log(nodeData);
+                  if (!nodeData.alias)
+                    return false;
+                  return nodeData.alias.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
+                }
+              }, null, 8, ["modelValue", "data", "filter-tree-node"])
             ]),
             vue.createCommentVNode(" \u7D20\u6750\u7C7B\u578B "),
             vue.createElementVNode("div", _hoisted_7, [

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cmstops/pro-compo",
-  "version": "3.9.1-rc.5",
+  "version": "3.9.1-rc.7",
   "description": "",
   "keywords": [
     "vue",