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

package/es/hooks/useAttachement.d.ts

@@ -1,4 +1,3 @@
-import { Ref } from 'vue';
 export declare function getAttachmentsAll(BASE_API: string, query?: any): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function getAttachmentsMy(BASE_API: string, query?: any): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function getAttachmentsMyMessage(BASE_API: string, query: any): Promise<import("axios").AxiosResponse<any, any>>;
@@ -7,12 +6,12 @@ declare type OptionsType = {
     BASE_API: string;
 };
 export default function useAttachement(options: OptionsType): {
-    list: Ref<any[], any[]>;
-    total: Ref<number, number>;
-    limit: Ref<number, number>;
-    offset: Ref<number, number>;
+    list: import("vue").Ref<any[], any[]>;
+    total: import("vue").Ref<number, number>;
+    limit: import("vue").Ref<number, number>;
+    offset: import("vue").Ref<number, number>;
     pageIdx: import("vue").ComputedRef<number>;
-    loading: Ref<boolean, boolean>;
+    loading: import("vue").Ref<boolean, boolean>;
     changeFilter: (f: any) => void;
     changeKey: (k: string) => void;
     changePage: (o: number) => void;
@@ -20,7 +19,7 @@ export default function useAttachement(options: OptionsType): {
     loadData: () => Promise<void>;
 };
 export declare function useLocalRecource(): {
-    localList: Ref<any[], any[]>;
+    localList: import("vue").Ref<any[], any[]>;
     initLocalList: () => void;
     setLocalList: (list: any[]) => void;
 };
@@ -31,4 +30,24 @@ export declare const mediaUseEnum: {
 export declare function getSysRsByTag(BASE_API: string, params: any): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function getSysRsClassifyList(BASE_API: string, sys_tag: number): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function getSysRsPage(BASE_API: string, params: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getDirectory(BASE_API: string, params: any): Promise<import("axios").AxiosResponse<any, any>>;
+/**
+ * 数据结构：
+ * Array<{
+ *   "id": {dirid},
+ *   "alias": {dirname},
+ *   "parent_id": {parent_dirid},
+ *   "children": [],
+ *   ...
+ * }>
+ */
+declare type DirOptionsType = {
+    key?: string;
+    BASE_API: string;
+};
+export declare function useDirectory(options: DirOptionsType): {
+    tree: import("vue").Ref<any[], any[]>;
+    init: () => Promise<void>;
+    loadMore: (target: any) => Promise<void>;
+};
 export {};

package/es/hooks/useAttachement.js

@@ -1,4 +1,4 @@
-import { ref, computed } from "vue";
+import { ref, computed, onMounted } from "vue";
 import request from "../utils/request.js";
 function getAttachmentsAll(BASE_API, query) {
   return request(BASE_API, {
@@ -108,4 +108,51 @@ function getSysRsPage(BASE_API, params) {
     params
   });
 }
-export { useAttachement as default, getAttachmentsAll, getAttachmentsMy, getAttachmentsMyMessage, getSysRsByTag, getSysRsPage };
+function getDirectory(BASE_API, params) {
+  return request(BASE_API, {
+    url: "/poplar/v3/directories",
+    method: "get",
+    params
+  });
+}
+function useDirectory(options) {
+  const tree = ref([]);
+  async function loadDirTree(parent_id) {
+    const params = parent_id ? { parent_id } : {};
+    const { code, message } = await getDirectory(options.BASE_API, params);
+    if (code === 0) {
+      if (!Array.isArray(message.data))
+        return [];
+      return message.data.map(({ alias, id }) => {
+        return {
+          title: alias,
+          key: id,
+          isLeaf: false,
+          children: []
+        };
+      });
+    }
+    return [];
+  }
+  async function init() {
+    const result = await loadDirTree();
+    if (!Array.isArray(result))
+      return;
+    tree.value = result;
+  }
+  async function loadMore(target) {
+    const children = await loadDirTree(target.key);
+    target.children = children;
+    if (children.length === 0)
+      target.isLeaf = true;
+  }
+  onMounted(() => {
+    init();
+  });
+  return {
+    tree,
+    init,
+    loadMore
+  };
+}
+export { useAttachement as default, getAttachmentsAll, getAttachmentsMy, getAttachmentsMyMessage, getDirectory, getSysRsByTag, getSysRsPage, useDirectory };

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

@@ -1,7 +1,8 @@
 import { defineComponent, inject, computed, ref, watch, onMounted, openBlock, createElementBlock, createElementVNode, createCommentVNode, createVNode, unref, withCtx, createTextVNode, toDisplayString, Fragment, renderList, createBlock, normalizeClass } from "vue";
-import { Input, Dropdown, Doption, Button, Select, Option, RangePicker } from "@arco-design/web-vue";
+import { Input, Dropdown, Doption, Button, Select, Option, TreeSelect, RangePicker } from "@arco-design/web-vue";
 import { IconUpload } from "@arco-design/web-vue/es/icon";
 import useSelection from "../../../../hooks/useSelection.js";
+import { useDirectory } from "../../../../hooks/useAttachement.js";
 import { RESOURCE_SOURCE_OPTIONS, RESOURCE_CATALOG_OPTIONS } from "../../../../utils/typeMap.js";
 import { getAccountList } from "../../../scripts/selectionApis.js";
 import { keywordsSelection } from "../../../../utils/resource.js";
@@ -56,6 +57,9 @@ const _sfc_main = defineComponent({
     });
     const resourceSource = RESOURCE_SOURCE_OPTIONS;
     const resourceCatalog = RESOURCE_CATALOG_OPTIONS;
+    const { tree, loadMore: loadDirMore } = useDirectory({
+      BASE_API: baseAPI
+    });
     const originFilter = {
       catalog: [],
       source: "",
@@ -64,7 +68,8 @@ const _sfc_main = defineComponent({
       keyword: "",
       precise_keyword: "",
       upload_by: null,
-      sf: ""
+      sf: "",
+      directory_id: void 0
     };
     const filter = ref(JSON.parse(JSON.stringify(originFilter)));
     const handleReset = () => {
@@ -180,13 +185,13 @@ const _sfc_main = defineComponent({
                   }, {
                     content: withCtx(() => [
                       createVNode(unref(Doption), { value: 0 }, {
-                        default: withCtx(() => _cache[7] || (_cache[7] = [
+                        default: withCtx(() => _cache[8] || (_cache[8] = [
                           createTextVNode("\u7CBE\u51C6\u641C")
                         ])),
                         _: 1
                       }),
                       createVNode(unref(Doption), { value: 1 }, {
-                        default: withCtx(() => _cache[8] || (_cache[8] = [
+                        default: withCtx(() => _cache[9] || (_cache[9] = [
                           createTextVNode("\u6A21\u7CCA\u641C")
                         ])),
                         _: 1
@@ -228,10 +233,20 @@ const _sfc_main = defineComponent({
                 _: 1
               }, 8, ["modelValue", "disabled"])
             ]),
+            createCommentVNode(" \u76EE\u5F55 "),
+            createVNode(unref(TreeSelect), {
+              modelValue: filter.value.directory_id,
+              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => filter.value.directory_id = $event),
+              data: unref(tree),
+              "load-more": unref(loadDirMore),
+              placeholder: "\u8BF7\u9009\u62E9\u76EE\u5F55",
+              style: { "width": "180px" },
+              "allow-clear": ""
+            }, null, 8, ["modelValue", "data", "load-more"]),
             createCommentVNode(" \u65F6\u95F4\u8303\u56F4 "),
             createVNode(unref(RangePicker), {
               modelValue: rangeTime.value,
-              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => rangeTime.value = $event),
+              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => rangeTime.value = $event),
               "allow-clear": "",
               style: { "width": "240px" }
             }, null, 8, ["modelValue"]),
@@ -239,7 +254,7 @@ const _sfc_main = defineComponent({
             createElementVNode("div", _hoisted_6, [
               createVNode(unref(Select), {
                 modelValue: filter.value.source,
-                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.source = $event),
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.source = $event),
                 "allow-clear": "",
                 placeholder: "\u6765\u6E90"
               }, {
@@ -259,7 +274,7 @@ const _sfc_main = defineComponent({
             !_ctx.disableUploadBy ? (openBlock(), createElementBlock("div", _hoisted_7, [
               createVNode(unref(Select), {
                 modelValue: filter.value.upload_by,
-                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.upload_by = $event),
+                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => filter.value.upload_by = $event),
                 "allow-clear": "",
                 placeholder: "\u4E0A\u4F20\u4EBA",
                 loading: unref(loading),
@@ -284,7 +299,7 @@ const _sfc_main = defineComponent({
               type: "text",
               onClick: handleReset
             }, {
-              default: withCtx(() => _cache[9] || (_cache[9] = [
+              default: withCtx(() => _cache[10] || (_cache[10] = [
                 createTextVNode(" \u91CD\u7F6E ")
               ])),
               _: 1
@@ -293,13 +308,13 @@ const _sfc_main = defineComponent({
           createElementVNode("div", _hoisted_8, [
             createVNode(unref(Button), {
               type: "primary",
-              onClick: _cache[6] || (_cache[6] = ($event) => emits("upload"))
+              onClick: _cache[7] || (_cache[7] = ($event) => emits("upload"))
             }, {
               icon: withCtx(() => [
                 createVNode(unref(IconUpload))
               ]),
               default: withCtx(() => [
-                _cache[10] || (_cache[10] = createTextVNode(" \u4E0A\u4F20 "))
+                _cache[11] || (_cache[11] = createTextVNode(" \u4E0A\u4F20 "))
               ]),
               _: 1
             })

package/lib/hooks/useAttachement.js

@@ -110,9 +110,58 @@ function getSysRsPage(BASE_API, params) {
     params
   });
 }
+function getDirectory(BASE_API, params) {
+  return request(BASE_API, {
+    url: "/poplar/v3/directories",
+    method: "get",
+    params
+  });
+}
+function useDirectory(options) {
+  const tree = vue.ref([]);
+  async function loadDirTree(parent_id) {
+    const params = parent_id ? { parent_id } : {};
+    const { code, message } = await getDirectory(options.BASE_API, params);
+    if (code === 0) {
+      if (!Array.isArray(message.data))
+        return [];
+      return message.data.map(({ alias, id }) => {
+        return {
+          title: alias,
+          key: id,
+          isLeaf: false,
+          children: []
+        };
+      });
+    }
+    return [];
+  }
+  async function init() {
+    const result = await loadDirTree();
+    if (!Array.isArray(result))
+      return;
+    tree.value = result;
+  }
+  async function loadMore(target) {
+    const children = await loadDirTree(target.key);
+    target.children = children;
+    if (children.length === 0)
+      target.isLeaf = true;
+  }
+  vue.onMounted(() => {
+    init();
+  });
+  return {
+    tree,
+    init,
+    loadMore
+  };
+}
 exports["default"] = useAttachement;
 exports.getAttachmentsAll = getAttachmentsAll;
 exports.getAttachmentsMy = getAttachmentsMy;
 exports.getAttachmentsMyMessage = getAttachmentsMyMessage;
+exports.getDirectory = getDirectory;
 exports.getSysRsByTag = getSysRsByTag;
 exports.getSysRsPage = getSysRsPage;
+exports.useDirectory = useDirectory;

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

@@ -3,6 +3,7 @@ var vue = require("vue");
 var webVue = require("@arco-design/web-vue");
 var icon = require("@arco-design/web-vue/es/icon");
 var useSelection = require("../../../../hooks/useSelection.js");
+var useAttachement = require("../../../../hooks/useAttachement.js");
 var typeMap = require("../../../../utils/typeMap.js");
 var selectionApis = require("../../../scripts/selectionApis.js");
 var resource = require("../../../../utils/resource.js");
@@ -57,6 +58,9 @@ const _sfc_main = vue.defineComponent({
     });
     const resourceSource = typeMap.RESOURCE_SOURCE_OPTIONS;
     const resourceCatalog = typeMap.RESOURCE_CATALOG_OPTIONS;
+    const { tree, loadMore: loadDirMore } = useAttachement.useDirectory({
+      BASE_API: baseAPI
+    });
     const originFilter = {
       catalog: [],
       source: "",
@@ -65,7 +69,8 @@ const _sfc_main = vue.defineComponent({
       keyword: "",
       precise_keyword: "",
       upload_by: null,
-      sf: ""
+      sf: "",
+      directory_id: void 0
     };
     const filter = vue.ref(JSON.parse(JSON.stringify(originFilter)));
     const handleReset = () => {
@@ -181,13 +186,13 @@ const _sfc_main = vue.defineComponent({
                   }, {
                     content: vue.withCtx(() => [
                       vue.createVNode(vue.unref(webVue.Doption), { value: 0 }, {
-                        default: vue.withCtx(() => _cache[7] || (_cache[7] = [
+                        default: vue.withCtx(() => _cache[8] || (_cache[8] = [
                           vue.createTextVNode("\u7CBE\u51C6\u641C")
                         ])),
                         _: 1
                       }),
                       vue.createVNode(vue.unref(webVue.Doption), { value: 1 }, {
-                        default: vue.withCtx(() => _cache[8] || (_cache[8] = [
+                        default: vue.withCtx(() => _cache[9] || (_cache[9] = [
                           vue.createTextVNode("\u6A21\u7CCA\u641C")
                         ])),
                         _: 1
@@ -229,10 +234,20 @@ const _sfc_main = vue.defineComponent({
                 _: 1
               }, 8, ["modelValue", "disabled"])
             ]),
+            vue.createCommentVNode(" \u76EE\u5F55 "),
+            vue.createVNode(vue.unref(webVue.TreeSelect), {
+              modelValue: filter.value.directory_id,
+              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => filter.value.directory_id = $event),
+              data: vue.unref(tree),
+              "load-more": vue.unref(loadDirMore),
+              placeholder: "\u8BF7\u9009\u62E9\u76EE\u5F55",
+              style: { "width": "180px" },
+              "allow-clear": ""
+            }, null, 8, ["modelValue", "data", "load-more"]),
             vue.createCommentVNode(" \u65F6\u95F4\u8303\u56F4 "),
             vue.createVNode(vue.unref(webVue.RangePicker), {
               modelValue: rangeTime.value,
-              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => rangeTime.value = $event),
+              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => rangeTime.value = $event),
               "allow-clear": "",
               style: { "width": "240px" }
             }, null, 8, ["modelValue"]),
@@ -240,7 +255,7 @@ const _sfc_main = vue.defineComponent({
             vue.createElementVNode("div", _hoisted_6, [
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.source,
-                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.source = $event),
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.source = $event),
                 "allow-clear": "",
                 placeholder: "\u6765\u6E90"
               }, {
@@ -260,7 +275,7 @@ const _sfc_main = vue.defineComponent({
             !_ctx.disableUploadBy ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.upload_by,
-                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.upload_by = $event),
+                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => filter.value.upload_by = $event),
                 "allow-clear": "",
                 placeholder: "\u4E0A\u4F20\u4EBA",
                 loading: vue.unref(loading),
@@ -285,7 +300,7 @@ const _sfc_main = vue.defineComponent({
               type: "text",
               onClick: handleReset
             }, {
-              default: vue.withCtx(() => _cache[9] || (_cache[9] = [
+              default: vue.withCtx(() => _cache[10] || (_cache[10] = [
                 vue.createTextVNode(" \u91CD\u7F6E ")
               ])),
               _: 1
@@ -294,13 +309,13 @@ const _sfc_main = vue.defineComponent({
           vue.createElementVNode("div", _hoisted_8, [
             vue.createVNode(vue.unref(webVue.Button), {
               type: "primary",
-              onClick: _cache[6] || (_cache[6] = ($event) => emits("upload"))
+              onClick: _cache[7] || (_cache[7] = ($event) => emits("upload"))
             }, {
               icon: vue.withCtx(() => [
                 vue.createVNode(vue.unref(icon.IconUpload))
               ]),
               default: vue.withCtx(() => [
-                _cache[10] || (_cache[10] = vue.createTextVNode(" \u4E0A\u4F20 "))
+                _cache[11] || (_cache[11] = vue.createTextVNode(" \u4E0A\u4F20 "))
               ]),
               _: 1
             })

package/package.json

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