@jari-ace/element-plus-component 0.6.0 → 0.6.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jari-ace/element-plus-component",
   "private": false,
-  "version": "0.6.0",
+  "version": "0.6.2",
   "main": "lib/index.umd.cjs",
   "module": "lib/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "pretty-bytes": "^7.1.0",
     "vue-pdf-embed": "^2.1.3",
     "vue-router": "^5.0.1",
-    "@jari-ace/app-bolts": "0.7.9"
+    "@jari-ace/app-bolts": "0.7.10"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",

package/packages/components/switch/JaSwitch.vue

@@ -1,12 +1,11 @@
 <script setup lang="ts">
 import type {ValidationInstance} from '../../hooks/useBackendValidations'
-import {inject, ref, watch, computed} from "vue";
+import {inject, ref, watch} from "vue";
 import {ElSwitch} from "element-plus";
-import type { SwitchProps } from 'element-plus'
 import {getValue, setValue} from "../../utils/objectUtils";
 import type {EpPropMergeType} from "element-plus/es/utils";
 
-const input = ref<InstanceType<typeof ElSwitch>>()
+const input = ref<typeof ElSwitch>()
 const model = inject('aceFormModel') as Record<string, any>
 const prop = inject('aceFormItemProp') as string
 const validator = inject('aceFormValidator') as ValidationInstance
@@ -14,11 +13,6 @@ const emit = defineEmits<{
     change: [value: boolean | string | number]
 }>()
 
-export interface JaSwitchProps extends Partial<SwitchProps> {
-}
-
-const props = defineProps<JaSwitchProps>()
-
 function onChange(value: boolean | string | number) {
     validator.removeFieldError(prop)
     setValue(model.formData, prop, mv.value);
@@ -36,14 +30,9 @@ watch(() => model.formData, () => {
     deep: true
 })
 
-const elementProps = computed(() => {
-    const { modelValue, ...rest } = props
-    return rest
-})
-
 defineExpose({
-    focus: () => (input.value as any)?.focus?.(),
-    blur: () => (input.value as any)?.blur?.(),
+    focus: () => input.value?.focus(),
+    blur: () => input.value?.blur(),
     elSwitch: input
 })
 </script>
@@ -53,7 +42,7 @@ defineExpose({
         ref="input"
         v-model="mv"
         @change="onChange"
-        v-bind="{ ...elementProps, ...$attrs }">
+        v-bind="$attrs">
         <template v-for="(_, name) in $slots" v-slot:[name]>
             <slot :name="name"></slot>
         </template>

package/packages/components/upload/uploader.vue

@@ -175,6 +175,10 @@ const emits = defineEmits<{
      * 单个文件上传失败事件
      */
     uploadError: [file: AceFile, error: Error]
+    /**
+     * 获取平台记录的文件信息，当文件列表加载、上传、删除时会触发此事件，向外传递文件信息
+     */
+    fileInfosChanged: [files: FileInfo[]]
     /**
      * 下载完成事件
      */
@@ -211,8 +215,11 @@ async function updateAllowedClassificationLevels() {
 async function loadFileInfos() {
     if (!curAttachToken.value) {
         files.value = [];
+        emits('fileInfosChanged', files.value)
+        return;
     }
     files.value = await api.getFileList(curAttachToken.value!);
+    emits('fileInfosChanged', files.value)
 }
 
 function createUppyInstance() {
@@ -224,13 +231,12 @@ function createUppyInstance() {
         autoProceed: true,
         locale: zhCN
     }).on("progress", progress => {
-        if (progress == 100) {
-            loadFileInfos();
-        }
         uploadingProgress.value = progress;
     });
-    uppy.use(Tus, {
-        endpoint: new URL("/ace-file-service/uploads", location.origin).toString(),
+
+    let urlPrefix = getUrlPrefix();
+    uppy.use(Tus, {        
+        endpoint: new URL(urlPrefix + "/uploads", location.origin).toString(),
         withCredentials: true,
         retryDelays: undefined,
         chunkSize: !uploadInitParams.value?.chunkSize || uploadInitParams.value?.chunkSize
@@ -238,7 +244,8 @@ function createUppyInstance() {
         parallelUploads: 1,
         headers: {
             aceAttachId: attachId.value!,
-            aceNewForm: isNewForm.value ? "yes" : "no"
+            aceNewForm: isNewForm.value ? "yes" : "no",
+            'X-Forwarded-Prefix': urlPrefix
         },
         metadata: {
             attachId: attachId.value!,
@@ -251,7 +258,7 @@ function createUppyInstance() {
             configKey: props.configKey,
             appServiceName: props.serviceName,
             classifiedLevel: selectedFileClassificationLevel.value.toString()
-        }
+        },
     });
     if (cfg.enableWebcam) {
         uppy.use(Webcam, {
@@ -317,6 +324,10 @@ function createUppyInstance() {
     }).on('upload-success', file => {
         emits('uploadSuccess', file)
     }).on('complete', (result) => {
+        if (result.failed || result.failed.length == 0) {
+            uppy.clear()
+        }
+        loadFileInfos()
         emits('complete', result.successful, result.failed)
     }).on('error', (error) => {
         emits('error', error)
@@ -325,6 +336,18 @@ function createUppyInstance() {
     })
 }
 
+function getUrlPrefix() {
+    let isDev = window.appDescriptor?.env.isDevMode();
+    if (window.rawWindow) {
+        isDev = window.rawWindow.appDescriptor.env.isDevMode();
+    }
+    let urlPrefix = "/ace-file-service";
+    if (isDev) {
+        urlPrefix = "/ace/ace-file-service";
+    }
+    return urlPrefix;
+}
+
 async function onUploadBtnClick() {
     console.log('upload btn clicked')
     const cfg = uploadInitParams.value?.fileConfig;
@@ -376,6 +399,7 @@ function handleClassificationLevelSelCmd(level: number) {
 async function initLoad() {
     uploadInitParams.value = await api.initLoad(props.serviceName, props.configKey, props.attachToken!);
     files.value = uploadInitParams.value.files;
+    emits('fileInfosChanged', files.value)
     attachId.value = uploadInitParams.value?.attachId;
     curAttachToken.value = uploadInitParams.value?.attachId;
     isNewForm.value = false;
@@ -386,6 +410,7 @@ async function initLoad() {
 async function initNew() {
     uploadInitParams.value = await api.initNew(props.serviceName, props.configKey);
     files.value = uploadInitParams.value.files;
+    emits('fileInfosChanged', files.value)
     attachId.value = uploadInitParams.value?.attachId;
     curAttachToken.value = uploadInitParams.value?.attachToken;
     isNewForm.value = true;
@@ -397,10 +422,11 @@ async function initNew() {
 async function delUploadedFile(file: FileInfo) {
     await api.deleteFile(file.token || file.id);
     files.value = files.value.filter(f => f.id !== file.id);
+    emits('fileInfosChanged', files.value)
 }
 
 function previewFile(fileToken: string) {
-    pdfSrc.value = new URL("uploads/preview/" + fileToken, location.origin).toString()
+    pdfSrc.value = new URL(getUrlPrefix() + "/uploads/preview/" + fileToken, location.origin).toString()
     pdfViewerVisible.value = true;
 }
 
@@ -634,7 +660,7 @@ function getFileIcon(fileName: string) {
         </div>
         <div v-if="layout === 'list'" class="file-list"
             :style="{ height: typeof props.height === 'number' ? props.height + 'px' : props.height, maxHeight: typeof props.maxHeight === 'number' ? props.maxHeight + 'px' : props.maxHeight }">
-            <div v-if="files?.length === 0" class="empty-text">暂无文件</div>
+            <div v-if="!files || files?.length == 0" class="empty-text">暂无文件</div>
             <div v-for="file in files" :key="file.id" class="file-item">
                 <div class="file-main">
                     <el-icon class="file-icon">