el-plus-crud 0.1.26 → 0.1.27

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.27](https://github.com/KDJack/el-plus-crud/compare/v0.1.26...v0.1.27) (2024-04-16)
+
 ### [0.1.26](https://github.com/KDJack/el-plus-crud/compare/v0.1.25...v0.1.26) (2024-04-16)
 
 ### [0.1.25](https://github.com/KDJack/el-plus-crud/compare/v0.1.24...v0.1.25) (2024-04-10)

package/dist/el-plus-crud.mjs

@@ -6627,7 +6627,7 @@ const Yi = /* @__PURE__ */ lt(A2, [["__scopeId", "data-v-0181f621"]]), T2 = /* @
     async function T(A, F) {
       var $, Me, ve, He, We, y;
       if (A && Object.keys(A).length > 0) {
-        const b = Hn(((Me = ($ = l.upload) == null ? void 0 : $.actionMap) == null ? void 0 : Me.objectUrlKey) || [], A);
+        const b = Hn(((Me = ($ = l.upload) == null ? void 0 : $.actionMap) == null ? void 0 : Me.objectUrlKey) || [], A.request);
         b && (F.raw.furl = b);
       }
       if ((ve = l.upload) != null && ve.sign) {
@@ -6658,7 +6658,7 @@ const Yi = /* @__PURE__ */ lt(A2, [["__scopeId", "data-v-0181f621"]]), T2 = /* @
       if (F === 1)
         s.value.push({
           name: A.name,
-          furl: A.url,
+          furl: A.raw.furl || A.furl || A.url,
           url: g.desc.upType !== "file" ? P(A.raw) : (($ = A == null ? void 0 : A.raw) == null ? void 0 : $.shareUrl) || A.url,
           fsize: A.size,
           uid: A.uid,
@@ -7316,6 +7316,7 @@ const Tm = {
     title: { default: "" },
     tableRef: {},
     success: {},
+    isLoading: { type: Boolean },
     successTip: { type: [String, Function], default: "操作成功!" }
   },
   emits: ["update:show", "update:modelValue"],
@@ -7363,6 +7364,7 @@ const Tm = {
             ref_key: "refElPlusDialogForm",
             ref: s,
             style: { padding: "20px" },
+            isLoading: d.isLoading,
             isDialog: !0,
             modelValue: g.value,
             "onUpdate:modelValue": C[0] || (C[0] = (ae) => g.value = ae),
@@ -7378,7 +7380,7 @@ const Tm = {
               Ze(x.$slots, "default")
             ]),
             _: 3
-          }, 16, ["modelValue", "formDesc"])
+          }, 16, ["isLoading", "modelValue", "formDesc"])
         ]),
         _: 3
       }, 16, ["modelValue", "title"]);

package/lib/components/el-plus-form/ElPlusFormDialog.vue

@@ -4,7 +4,7 @@
     <template #header>
       <slot name="header" />
     </template>
-    <ElPlusForm ref="refElPlusDialogForm" style="padding: 20px" :isDialog="true" v-model="currentValue" :formDesc="formDesc" v-bind="attrs" :success="dialogSuccess" @cancel="currentShow = false">
+    <ElPlusForm ref="refElPlusDialogForm" style="padding: 20px" :isLoading="props.isLoading" :isDialog="true" v-model="currentValue" :formDesc="formDesc" v-bind="attrs" :success="dialogSuccess" @cancel="currentShow = false">
       <template #top>
         <slot name="top" />
       </template>
@@ -31,14 +31,26 @@ import { ElMessage } from 'element-plus'
 import { IFormBack, IFormDesc } from '../../../types'
 
 const emits = defineEmits(['update:show', 'update:modelValue'])
-const props = withDefaults(defineProps<{ modelValue?: { [key: string]: any } | {}; formDesc: IFormDesc; show?: boolean; title?: string; tableRef?: any; success?: Function; successTip?: string | ((data?: any) => string) }>(), {
-  title: '',
-  modelValue: () => {
-    return {}
-  },
-  show: false,
-  successTip: '操作成功!'
-})
+const props = withDefaults(
+  defineProps<{
+    modelValue?: { [key: string]: any } | {}
+    formDesc: IFormDesc
+    show?: boolean
+    title?: string
+    tableRef?: any
+    success?: Function
+    isLoading?: boolean
+    successTip?: string | ((data?: any) => string)
+  }>(),
+  {
+    title: '',
+    modelValue: () => {
+      return {}
+    },
+    show: false,
+    successTip: '操作成功!'
+  }
+)
 
 // 重新定义当前值
 const currentValue = computed({

package/lib/components/el-plus-form/components/ElPlusFormUpload.vue

@@ -214,7 +214,7 @@ async function getToken(token: string | Object | Function | undefined, param?: a
 async function handelUploadSuccess(response: any, file: any) {
   if (response && Object.keys(response).length > 0) {
     // 从结果集中获取一下furl
-    const tempUrl = getValue(defaultConf.upload?.actionMap?.objectUrlKey || [], response)
+    const tempUrl = getValue(defaultConf.upload?.actionMap?.objectUrlKey || [], response.request)
     if (tempUrl) file.raw.furl = tempUrl
   }
   // 获取文件上传的token以及上传路径
@@ -281,7 +281,7 @@ function handelListChange(item: any, type: 0 | 1) {
   if (type === 1) {
     currentValue.value.push({
       name: item.name,
-      furl: item.url,
+      furl: item.raw.furl || item.furl || item.url,
       url: props.desc.upType !== 'file' ? getFileIcon(item.raw) : item?.raw?.shareUrl || item.url,
       fsize: item.size,
       uid: item.uid,

package/package.json

@@ -2,7 +2,7 @@
   "name": "el-plus-crud",
   "description": "采用Vue3 + TS，封装的element-plus数据驱动表单、列表组件",
   "author": "K.D.Jack",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "license": "MIT",
   "private": false,
   "main": "dist/el-plus-crud.mjs",