@cmstops/pro-compo 0.1.88 → 0.1.90

package/es/resourceModal/components/MediaSelection/ToolbarSearch/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, computed, onMounted, openBlock, createElementBlock, createElementVNode, renderSlot, createVNode, unref, withCtx, Fragment, renderList, createBlock, withDirectives, createTextVNode, vShow, createCommentVNode, normalizeClass, toDisplayString } from "vue";
+import { defineComponent, ref, watch, computed, onMounted, openBlock, createElementBlock, createElementVNode, renderSlot, createVNode, unref, createBlock, withCtx, Fragment, renderList, createCommentVNode, withDirectives, createTextVNode, vShow, normalizeClass, toDisplayString } from "vue";
 import { Input, RangePicker, Select, Option, Button } from "@arco-design/web-vue";
 import { IconRefresh, IconUpload } from "@arco-design/web-vue/es/icon";
 import { rateOptions, keywordsSelection } from "../../../script/filter.js";
@@ -124,7 +124,8 @@ const _sfc_main = defineComponent({
                 "default-value": ["00:00:00", "23:59:59"],
                 onClear: clearDatePicker
               }, null, 8, ["modelValue"]),
-              createVNode(unref(Select), {
+              _ctx.activeMediaType === "all" ? (openBlock(), createBlock(unref(Select), {
+                key: 0,
                 modelValue: filter.value.upload_by,
                 "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => filter.value.upload_by = $event),
                 label: filter.value.upload_by === "\u5168\u90E8\u4EBA\u5458" ? "" : filter.value.upload_by,
@@ -147,7 +148,7 @@ const _sfc_main = defineComponent({
                   }), 128))
                 ]),
                 _: 1
-              }, 8, ["modelValue", "label"]),
+              }, 8, ["modelValue", "label"])) : createCommentVNode("v-if", true),
               createVNode(unref(Select), {
                 modelValue: filter.value.wh_rate,
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.wh_rate = $event),

package/es/resourceModal/components/MediaSelection/index.js

@@ -2,6 +2,7 @@ import { defineComponent, inject, ref, onMounted, computed, openBlock, createEle
 import { Tabs, TabPane, Button, Breadcrumb, BreadcrumbItem } from "@arco-design/web-vue";
 import { IconArrowLeft } from "@arco-design/web-vue/es/icon";
 import { getAttachmentsAll, getAttachmentsMy, getDirectories } from "../../script/api.js";
+import { getUserInfo } from "../../../userAvater/script/api.js";
 import _sfc_main$1 from "./DocAiMediaSelected/index.js";
 import _sfc_main$2 from "./SystemResourceSelected/index.js";
 import _sfc_main$3 from "./ToolbarSearch/index.js";
@@ -71,6 +72,7 @@ const _sfc_main = defineComponent({
       if (props.catalogProps && props.catalogProps !== "all") {
         getFilesQueryParam.value.catalog = props.catalogProps;
       }
+      loadUserInfo();
       loadData();
     });
     const resourcesHeight = computed(() => {
@@ -126,6 +128,13 @@ const _sfc_main = defineComponent({
       resetQuery(breadCrumbs.value);
       loadData({ goBack: true });
     };
+    const defaultUploadBy = ref(1);
+    const loadUserInfo = async () => {
+      const res = await getUserInfo(props.BASE_API);
+      if (res.code !== 0)
+        return;
+      defaultUploadBy.value = res.message.id;
+    };
     const loadData = (params) => {
       isOver.value = false;
       const API = activeMediaType.value === "all" ? api.value.getAttachmentsAll : api.value.getAttachmentsMy;
@@ -134,6 +143,9 @@ const _sfc_main = defineComponent({
         query = Object.assign(query, filter.value);
         folderList.value = [];
       }
+      if (activeMediaType.value === "my") {
+        query.upload_by = defaultUploadBy.value;
+      }
       const promise = filter.value ? [API(baseApi, query)] : [
         API(baseApi, query),
         getDirectories(baseApi, { parent_id: query.directory_id })

package/es/selectAvatarList/component.js

@@ -33,7 +33,9 @@ const _sfc_main = defineComponent({
       return item.uid ? item.alias : `\u89D2\u8272\uFF1A${item.alias}`;
     };
     const getUserAlias = (user) => {
-      const alias2 = user.alias || user.title || user.name;
+      if (!user)
+        return "--";
+      const alias2 = user.alias || user.title || user.name || "\u672A\u77E5";
       return alias2.length > 1 ? `${alias2.slice(0, 1)}` : alias2;
     };
     const addUser = () => {

package/lib/resourceModal/components/MediaSelection/ToolbarSearch/index.js

@@ -125,7 +125,8 @@ const _sfc_main = vue.defineComponent({
                 "default-value": ["00:00:00", "23:59:59"],
                 onClear: clearDatePicker
               }, null, 8, ["modelValue"]),
-              vue.createVNode(vue.unref(webVue.Select), {
+              _ctx.activeMediaType === "all" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Select), {
+                key: 0,
                 modelValue: filter$1.value.upload_by,
                 "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => filter$1.value.upload_by = $event),
                 label: filter$1.value.upload_by === "\u5168\u90E8\u4EBA\u5458" ? "" : filter$1.value.upload_by,
@@ -148,7 +149,7 @@ const _sfc_main = vue.defineComponent({
                   }), 128))
                 ]),
                 _: 1
-              }, 8, ["modelValue", "label"]),
+              }, 8, ["modelValue", "label"])) : vue.createCommentVNode("v-if", true),
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter$1.value.wh_rate,
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter$1.value.wh_rate = $event),

package/lib/resourceModal/components/MediaSelection/index.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 api = require("../../script/api.js");
+var api$1 = require("../../../userAvater/script/api.js");
 var index = require("./DocAiMediaSelected/index.js");
 var index$1 = require("./SystemResourceSelected/index.js");
 var index$2 = require("./ToolbarSearch/index.js");
@@ -55,7 +56,7 @@ const _sfc_main = vue.defineComponent({
     const activeMediaType = vue.ref(
       props.ai_static_covers && props.ai_static_covers.length ? "ai" : mediaUseType ? "system" : "all"
     );
-    const api$1 = vue.ref({ getAttachmentsAll: api.getAttachmentsAll, getAttachmentsMy: api.getAttachmentsMy });
+    const api$2 = vue.ref({ getAttachmentsAll: api.getAttachmentsAll, getAttachmentsMy: api.getAttachmentsMy });
     const currentDirectory = vue.ref({
       directory_id: 0,
       alias: ""
@@ -72,6 +73,7 @@ const _sfc_main = vue.defineComponent({
       if (props.catalogProps && props.catalogProps !== "all") {
         getFilesQueryParam.value.catalog = props.catalogProps;
       }
+      loadUserInfo();
       loadData();
     });
     const resourcesHeight = vue.computed(() => {
@@ -127,14 +129,24 @@ const _sfc_main = vue.defineComponent({
       resetQuery(breadCrumbs.value);
       loadData({ goBack: true });
     };
+    const defaultUploadBy = vue.ref(1);
+    const loadUserInfo = async () => {
+      const res = await api$1.getUserInfo(props.BASE_API);
+      if (res.code !== 0)
+        return;
+      defaultUploadBy.value = res.message.id;
+    };
     const loadData = (params) => {
       isOver.value = false;
-      const API = activeMediaType.value === "all" ? api$1.value.getAttachmentsAll : api$1.value.getAttachmentsMy;
+      const API = activeMediaType.value === "all" ? api$2.value.getAttachmentsAll : api$2.value.getAttachmentsMy;
       let query = { ...getFilesQueryParam.value };
       if (filter.value) {
         query = Object.assign(query, filter.value);
         folderList.value = [];
       }
+      if (activeMediaType.value === "my") {
+        query.upload_by = defaultUploadBy.value;
+      }
       const promise = filter.value ? [API(baseApi, query)] : [
         API(baseApi, query),
         api.getDirectories(baseApi, { parent_id: query.directory_id })

package/lib/selectAvatarList/component.js

@@ -34,7 +34,9 @@ const _sfc_main = vue.defineComponent({
       return item.uid ? item.alias : `\u89D2\u8272\uFF1A${item.alias}`;
     };
     const getUserAlias = (user) => {
-      const alias2 = user.alias || user.title || user.name;
+      if (!user)
+        return "--";
+      const alias2 = user.alias || user.title || user.name || "\u672A\u77E5";
       return alias2.length > 1 ? `${alias2.slice(0, 1)}` : alias2;
     };
     const addUser = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmstops/pro-compo",
-  "version": "0.1.88",
+  "version": "0.1.90",
   "description": "",
   "keywords": [
     "vue",