npm - @cmstops/pro-compo - Versions diffs - 3.0.0 → 3.9.1-rc.0 - Mend

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

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 (8) hide show

package/es/editMetaInfo/components/metaInfoForm.js +4 -2
package/es/hooks/useAttachement.d.ts +7 -26
package/es/hooks/useAttachement.js +2 -49
package/es/selectResourceModal/components/List/ListNormal/Filter.js +10 -25
package/lib/editMetaInfo/components/metaInfoForm.js +4 -2
package/lib/hooks/useAttachement.js +0 -49
package/lib/selectResourceModal/components/List/ListNormal/Filter.js +9 -24
package/package.json +1 -1

package/es/editMetaInfo/components/metaInfoForm.js CHANGED Viewed

@@ -48,7 +48,7 @@ const _sfc_main = defineComponent({
       brief: "",
       guide: "",
       keywords: [],
-      author: "",
+      author: [],
       duty_editor: [],
       extra_attrs: [],
       self_publish_time: "",
@@ -186,6 +186,7 @@ const _sfc_main = defineComponent({
       data.offline_time = data.offline_time && Math.floor(data.offline_time / 1e3);
       data.keywords = data.keywords && data.keywords.join(",");
       data.duty_editor = data.duty_editor && data.duty_editor.join(",");
+      data.author = data.author && data.author.join(",");
       data.extra_attrs = data.extra_attrs && data.extra_attrs.join(",");
       data.relation_news = data.relation_news && JSON.stringify(data.relation_news);
       data.comment_available = !!data.comment_available;
@@ -215,6 +216,7 @@ const _sfc_main = defineComponent({
       data.offline_time = data.offline_time && parseInt(data.offline_time, 10) * 1e3 || "";
       data.keywords = data.keywords && data.keywords.split(",") || [];
       data.duty_editor = data.duty_editor && data.duty_editor.split(",") || [];
+      data.author = data.author && data.author.split(",") || [];
       data.extra_attrs = data.extra_attrs && data.extra_attrs.split(",") || [];
       data.relation_news = data.relation_news && JSON.parse(data.relation_news) || [];
       data.line_time = !!(data.online_time || data.offline_time);
@@ -521,7 +523,7 @@ const _sfc_main = defineComponent({
             label: "\u4F5C\u8005"
           }, {
             default: withCtx(() => [
-              createVNode(unref(Input), {
+              createVNode(unref(InputTag), {
                 modelValue: form.value.author,
                 "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => form.value.author = $event),
                 "allow-clear": "",

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

@@ -1,3 +1,4 @@
+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>>;
@@ -6,12 +7,12 @@ declare type OptionsType = {
     BASE_API: string;
 };
 export default function useAttachement(options: OptionsType): {
-    list: import("vue").Ref<any[], any[]>;
-    total: import("vue").Ref<number, number>;
-    limit: import("vue").Ref<number, number>;
-    offset: import("vue").Ref<number, number>;
+    list: Ref<any[], any[]>;
+    total: Ref<number, number>;
+    limit: Ref<number, number>;
+    offset: Ref<number, number>;
     pageIdx: import("vue").ComputedRef<number>;
-    loading: import("vue").Ref<boolean, boolean>;
+    loading: Ref<boolean, boolean>;
     changeFilter: (f: any) => void;
     changeKey: (k: string) => void;
     changePage: (o: number) => void;
@@ -19,7 +20,7 @@ export default function useAttachement(options: OptionsType): {
     loadData: () => Promise<void>;
 };
 export declare function useLocalRecource(): {
-    localList: import("vue").Ref<any[], any[]>;
+    localList: Ref<any[], any[]>;
     initLocalList: () => void;
     setLocalList: (list: any[]) => void;
 };
@@ -30,24 +31,4 @@ 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 CHANGED Viewed

@@ -1,4 +1,4 @@
-import { ref, computed, onMounted } from "vue";
+import { ref, computed } from "vue";
 import request from "../utils/request.js";
 function getAttachmentsAll(BASE_API, query) {
   return request(BASE_API, {
@@ -108,51 +108,4 @@ 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 = 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 };
+export { useAttachement as default, getAttachmentsAll, getAttachmentsMy, getAttachmentsMyMessage, getSysRsByTag, getSysRsPage };

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

@@ -1,8 +1,7 @@
 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, TreeSelect, RangePicker } from "@arco-design/web-vue";
+import { Input, Dropdown, Doption, Button, Select, Option, 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";
@@ -57,9 +56,6 @@ 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: "",
@@ -68,8 +64,7 @@ const _sfc_main = defineComponent({
       keyword: "",
       precise_keyword: "",
       upload_by: null,
-      sf: "",
-      directory_id: void 0
+      sf: ""
     };
     const filter = ref(JSON.parse(JSON.stringify(originFilter)));
     const handleReset = () => {
@@ -185,13 +180,13 @@ const _sfc_main = defineComponent({
                   }, {
                     content: withCtx(() => [
                       createVNode(unref(Doption), { value: 0 }, {
-                        default: withCtx(() => _cache[8] || (_cache[8] = [
+                        default: withCtx(() => _cache[7] || (_cache[7] = [
                           createTextVNode("\u7CBE\u51C6\u641C")
                         ])),
                         _: 1
                       }),
                       createVNode(unref(Doption), { value: 1 }, {
-                        default: withCtx(() => _cache[9] || (_cache[9] = [
+                        default: withCtx(() => _cache[8] || (_cache[8] = [
                           createTextVNode("\u6A21\u7CCA\u641C")
                         ])),
                         _: 1
@@ -233,20 +228,10 @@ 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[4] || (_cache[4] = ($event) => rangeTime.value = $event),
+              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => rangeTime.value = $event),
               "allow-clear": "",
               style: { "width": "240px" }
             }, null, 8, ["modelValue"]),
@@ -254,7 +239,7 @@ const _sfc_main = defineComponent({
             createElementVNode("div", _hoisted_6, [
               createVNode(unref(Select), {
                 modelValue: filter.value.source,
-                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.source = $event),
+                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.source = $event),
                 "allow-clear": "",
                 placeholder: "\u6765\u6E90"
               }, {
@@ -274,7 +259,7 @@ const _sfc_main = defineComponent({
             !_ctx.disableUploadBy ? (openBlock(), createElementBlock("div", _hoisted_7, [
               createVNode(unref(Select), {
                 modelValue: filter.value.upload_by,
-                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => filter.value.upload_by = $event),
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.upload_by = $event),
                 "allow-clear": "",
                 placeholder: "\u4E0A\u4F20\u4EBA",
                 loading: unref(loading),
@@ -299,7 +284,7 @@ const _sfc_main = defineComponent({
               type: "text",
               onClick: handleReset
             }, {
-              default: withCtx(() => _cache[10] || (_cache[10] = [
+              default: withCtx(() => _cache[9] || (_cache[9] = [
                 createTextVNode(" \u91CD\u7F6E ")
               ])),
               _: 1
@@ -308,13 +293,13 @@ const _sfc_main = defineComponent({
           createElementVNode("div", _hoisted_8, [
             createVNode(unref(Button), {
               type: "primary",
-              onClick: _cache[7] || (_cache[7] = ($event) => emits("upload"))
+              onClick: _cache[6] || (_cache[6] = ($event) => emits("upload"))
             }, {
               icon: withCtx(() => [
                 createVNode(unref(IconUpload))
               ]),
               default: withCtx(() => [
-                _cache[11] || (_cache[11] = createTextVNode(" \u4E0A\u4F20 "))
+                _cache[10] || (_cache[10] = createTextVNode(" \u4E0A\u4F20 "))
               ]),
               _: 1
             })

package/lib/editMetaInfo/components/metaInfoForm.js CHANGED Viewed

@@ -49,7 +49,7 @@ const _sfc_main = vue.defineComponent({
       brief: "",
       guide: "",
       keywords: [],
-      author: "",
+      author: [],
       duty_editor: [],
       extra_attrs: [],
       self_publish_time: "",
@@ -187,6 +187,7 @@ const _sfc_main = vue.defineComponent({
       data.offline_time = data.offline_time && Math.floor(data.offline_time / 1e3);
       data.keywords = data.keywords && data.keywords.join(",");
       data.duty_editor = data.duty_editor && data.duty_editor.join(",");
+      data.author = data.author && data.author.join(",");
       data.extra_attrs = data.extra_attrs && data.extra_attrs.join(",");
       data.relation_news = data.relation_news && JSON.stringify(data.relation_news);
       data.comment_available = !!data.comment_available;
@@ -216,6 +217,7 @@ const _sfc_main = vue.defineComponent({
       data.offline_time = data.offline_time && parseInt(data.offline_time, 10) * 1e3 || "";
       data.keywords = data.keywords && data.keywords.split(",") || [];
       data.duty_editor = data.duty_editor && data.duty_editor.split(",") || [];
+      data.author = data.author && data.author.split(",") || [];
       data.extra_attrs = data.extra_attrs && data.extra_attrs.split(",") || [];
       data.relation_news = data.relation_news && JSON.parse(data.relation_news) || [];
       data.line_time = !!(data.online_time || data.offline_time);
@@ -522,7 +524,7 @@ const _sfc_main = vue.defineComponent({
             label: "\u4F5C\u8005"
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(vue.unref(webVue.Input), {
+              vue.createVNode(vue.unref(webVue.InputTag), {
                 modelValue: form.value.author,
                 "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => form.value.author = $event),
                 "allow-clear": "",

package/lib/hooks/useAttachement.js CHANGED Viewed

@@ -110,58 +110,9 @@ 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 CHANGED Viewed

@@ -3,7 +3,6 @@ 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");
@@ -58,9 +57,6 @@ 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: "",
@@ -69,8 +65,7 @@ const _sfc_main = vue.defineComponent({
       keyword: "",
       precise_keyword: "",
       upload_by: null,
-      sf: "",
-      directory_id: void 0
+      sf: ""
     };
     const filter = vue.ref(JSON.parse(JSON.stringify(originFilter)));
     const handleReset = () => {
@@ -186,13 +181,13 @@ const _sfc_main = vue.defineComponent({
                   }, {
                     content: vue.withCtx(() => [
                       vue.createVNode(vue.unref(webVue.Doption), { value: 0 }, {
-                        default: vue.withCtx(() => _cache[8] || (_cache[8] = [
+                        default: vue.withCtx(() => _cache[7] || (_cache[7] = [
                           vue.createTextVNode("\u7CBE\u51C6\u641C")
                         ])),
                         _: 1
                       }),
                       vue.createVNode(vue.unref(webVue.Doption), { value: 1 }, {
-                        default: vue.withCtx(() => _cache[9] || (_cache[9] = [
+                        default: vue.withCtx(() => _cache[8] || (_cache[8] = [
                           vue.createTextVNode("\u6A21\u7CCA\u641C")
                         ])),
                         _: 1
@@ -234,20 +229,10 @@ 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[4] || (_cache[4] = ($event) => rangeTime.value = $event),
+              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => rangeTime.value = $event),
               "allow-clear": "",
               style: { "width": "240px" }
             }, null, 8, ["modelValue"]),
@@ -255,7 +240,7 @@ const _sfc_main = vue.defineComponent({
             vue.createElementVNode("div", _hoisted_6, [
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.source,
-                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.source = $event),
+                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.source = $event),
                 "allow-clear": "",
                 placeholder: "\u6765\u6E90"
               }, {
@@ -275,7 +260,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[6] || (_cache[6] = ($event) => filter.value.upload_by = $event),
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.upload_by = $event),
                 "allow-clear": "",
                 placeholder: "\u4E0A\u4F20\u4EBA",
                 loading: vue.unref(loading),
@@ -300,7 +285,7 @@ const _sfc_main = vue.defineComponent({
               type: "text",
               onClick: handleReset
             }, {
-              default: vue.withCtx(() => _cache[10] || (_cache[10] = [
+              default: vue.withCtx(() => _cache[9] || (_cache[9] = [
                 vue.createTextVNode(" \u91CD\u7F6E ")
               ])),
               _: 1
@@ -309,13 +294,13 @@ const _sfc_main = vue.defineComponent({
           vue.createElementVNode("div", _hoisted_8, [
             vue.createVNode(vue.unref(webVue.Button), {
               type: "primary",
-              onClick: _cache[7] || (_cache[7] = ($event) => emits("upload"))
+              onClick: _cache[6] || (_cache[6] = ($event) => emits("upload"))
             }, {
               icon: vue.withCtx(() => [
                 vue.createVNode(vue.unref(icon.IconUpload))
               ]),
               default: vue.withCtx(() => [
-                _cache[11] || (_cache[11] = vue.createTextVNode(" \u4E0A\u4F20 "))
+                _cache[10] || (_cache[10] = vue.createTextVNode(" \u4E0A\u4F20 "))
               ]),
               _: 1
             })

package/package.json CHANGED Viewed

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