@truenewx/tnxvue3 3.4.3 → 3.4.5

package/src/element-plus/fss-upload/FssUpload.vue

@@ -1,32 +1,32 @@
 <template>
-    <tnxel-alert type="error" v-if="errors">
-        <div v-for="(error, index) of errors" :key="index">{{ error.message }}</div>
-    </tnxel-alert>
-    <tnxel-upload ref="upload"
-        :app="app"
-        :action="action"
-        :upload-options="uploadOptions"
-        :file-list="fileList"
-        :width="width" :height="height"
-        :center="center"
-        :trigger-icon="triggerIcon" :trigger-icon-size="triggerIconSize" :trigger-text="triggerText"
-        :tip="tip"
-        :show-file-list="showFileList"
-        :data="params"
-        :before-upload="beforeUpload"
-        :on-upload="onUpload"
-        :on-progress="onProgress"
-        :on-success="_onSuccess"
-        :on-error="onError"
-        :on-removed="_onRemove"
-        :handle-errors="handleErrors"
-        :file-icon="fileIcon"
-        :disabled="disabled"
-        v-else>
-        <template #trigger v-if="$slots.trigger">
-            <slot name="trigger"></slot>
-        </template>
-    </tnxel-upload>
+<tnxel-alert type="error" v-if="errors">
+    <div v-for="(error, index) of errors" :key="index">{{ error.message }}</div>
+</tnxel-alert>
+<tnxel-upload ref="upload"
+              :app="app"
+              :action="action"
+              :upload-options="uploadLimit"
+              :file-list="fileList"
+              :width="width" :height="height"
+              :center="center"
+              :trigger-icon="triggerIcon" :trigger-icon-size="triggerIconSize" :trigger-text="triggerText"
+              :tip="tip"
+              :show-file-list="showFileList"
+              :data="params"
+              :before-upload="beforeUpload"
+              :on-upload="onUpload"
+              :on-progress="onProgress"
+              :on-success="_onSuccess"
+              :on-error="onError"
+              :on-removed="_onRemove"
+              :handle-errors="handleErrors"
+              :file-icon="fileIcon"
+              :disabled="disabled"
+              v-else>
+    <template #trigger v-if="$slots.trigger">
+        <slot name="trigger"></slot>
+    </template>
+</tnxel-upload>
 </template>
 
 <script>
@@ -88,9 +88,9 @@ export default {
         const tnx = window.tnx;
         return {
             tnx: tnx,
-            action: tnx.fss.getUploadUrl(this.type, this.scope),
+            action: tnx.fss.getUploadUrl(this.type, this.scope, this.app),
             params: {},
-            uploadOptions: {},
+            uploadLimit: {},
             fileList: [],
             errors: null,
         };
@@ -141,75 +141,53 @@ export default {
             }
             return false;
         },
-        _initialize() {
-            const vm = this;
-            let fssConfig = vm.tnx.fss.getClientConfig(this.app);
-            vm.tnx.app.rpc.ensureLogined({
-                app: window.tnx.componentDefaultApp || fssConfig.appName,
-                toLogin(loginFormUrl, originalUrl, originalMethod) {
-                    return true;
-                }
-            }).then(() => {
-                let locationUrls;
-                if (vm.modelValue) {
-                    locationUrls = Array.isArray(vm.modelValue) ? vm.modelValue : [vm.modelValue];
-                } else {
-                    locationUrls = [];
-                }
-                if (locationUrls.length) {
-                    vm.tnx.app.rpc.get(fssConfig.contextUrl + '/metas', {
-                        locationUrls: locationUrls
-                    }, {
-                        app: fssConfig.appName
-                    }).then(metas => {
-                        let fileList = [];
-                        metas.forEach(meta => {
-                            if (meta) {
-                                fileList.push({
-                                    name: meta.name,
-                                    url: vm._getFullReadUrl(meta.thumbnailReadUrl || meta.readUrl),
-                                    previewUrl: vm.tnx.fss.getClientConfig().baseUrl + meta.downloadUrl,
-                                    locationUrl: meta.locationUrl,
-                                });
-                            }
-                        });
-                        vm.fileList = fileList;
-                        vm.$nextTick(() => {
-                            vm._loadUploadOptions();
+        async _initialize() {
+            await this.tnx.auth.ensureLogined();
+            let locationUrls;
+            if (this.modelValue) {
+                locationUrls = Array.isArray(this.modelValue) ? this.modelValue : [this.modelValue];
+            } else {
+                locationUrls = [];
+            }
+            if (locationUrls.length) {
+                this.fileList = [];
+                for (let locationUrl of locationUrls) {
+                    let readUrl = await this.tnx.fss.getReadUrl(locationUrl, true);
+                    if (readUrl) {
+                        this.fileList.push({
+                            url: readUrl.thumbnailUrl,
+                            previewUrl: readUrl.readUrl,
+                            locationUrl: locationUrl,
                         });
-                    });
-                } else {
-                    vm.fileList = [];
-                    vm.$nextTick(() => {
-                        vm._loadUploadOptions();
-                    });
+                    }
                 }
-            });
+                await this.$nextTick();
+                this._loadUploadOptions();
+            } else {
+                this.fileList = [];
+                await this.$nextTick();
+                this._loadUploadOptions();
+            }
         },
         _loadUploadOptions() {
             // 上传限制为空才执行加载，避免多次重复加载
-            if (Object.keys(this.uploadOptions).length === 0) {
+            if (Object.keys(this.uploadLimit).length === 0) {
                 this.errors = null;
                 let vm = this;
-                vm.tnx.fss.loadUploadOptions(this.type, {
-                    app: vm.app,
-                    error: function (errors) {
-                        vm.errors = errors;
-                    }
-                }).then(uploadOptions => {
+                this.tnx.fss.getUploadLimit(this.type).then(uploadLimit => {
                     if (vm.extension) {
                         let extensions = Array.isArray(vm.extension) ? vm.extension : [vm.extension];
                         let acceptedExtensions = [];
-                        if (uploadOptions.extensionsRejected) { // 服务端上传限制扩展名为排除模式
+                        if (uploadLimit.extensionsRejected) { // 服务端上传限制扩展名为排除模式
                             for (let extension of extensions) {
-                                if (!uploadOptions.extensions.contains(extension)) { // 取未被排除的
+                                if (!uploadLimit.extensions.contains(extension)) { // 取未被排除的
                                     acceptedExtensions.push(extension);
                                 }
                             }
                         } else { // 服务端上传限制扩展名为包含模式
-                            if (uploadOptions.extensions.length) {
+                            if (uploadLimit.extensions.length) {
                                 for (let extension of extensions) {
-                                    if (uploadOptions.extensions.contains(extension)) { // 取被包含的
+                                    if (uploadLimit.extensions.contains(extension)) { // 取被包含的
                                         acceptedExtensions.push(extension);
                                     }
                                 }
@@ -220,11 +198,11 @@ export default {
                             }
                         }
                         if (acceptedExtensions.length) { // 接受的扩展名清单不为空，则替代服务端配置中的扩展名限制
-                            uploadOptions.extensionsRejected = false;
-                            uploadOptions.extensions = acceptedExtensions;
+                            uploadLimit.extensionsRejected = false;
+                            uploadLimit.extensions = acceptedExtensions;
                         }
                     }
-                    vm.uploadOptions = uploadOptions;
+                    vm.uploadLimit = uploadLimit;
                 });
             }
         },
@@ -236,12 +214,12 @@ export default {
         },
         _onSuccess(result, file, fileList) {
             if (result) {
-                file.locationUrl = result.locationUrl;
+                file.locationUrl = result.storageUrl;
                 file.readUrl = result.readUrl;
-                file.downloadUrl = result.downloadUrl;
+                file.downloadUrl = result.readUrl;
                 // 构建Upload组件用到的文件字段
                 file.url = result.readUrl;
-                file.previewUrl = this.tnx.fss.getClientConfig().baseUrl + result.downloadUrl;
+                file.previewUrl = result.readUrl;
 
                 this.fileList = fileList;
                 this.emitInput();
@@ -272,9 +250,6 @@ export default {
                     return;
                 }
             }
-            if (this.uploadOptions.number === 1) {
-                locationUrls = locationUrls[0];
-            }
             this.$emit('update:modelValue', locationUrls);
         },
         size() {
@@ -283,38 +258,24 @@ export default {
         /**
          * 校验上传是否已经全部完成
          * @param reject 没有完成上传时的处理函数，传入文件对象参数
-         * @returns 文件存储路径或其数组，有上传未完成时返回false
          */
         validateUploaded(reject) {
-            if (this.uploadOptions.number > 1) {
-                const locationUrls = [];
-                for (let file of this.uploadingFiles) {
-                    if (file.locationUrl) {
-                        locationUrls.push(file.locationUrl);
-                    } else {
-                        this._doValidateUploadedReject(reject, file);
-                        return false;
-                    }
-                }
-                return locationUrls;
-            } else if (this.uploadingFiles.length) {
-                let file = this.uploadingFiles[0];
-                if (file) {
-                    if (file.locationUrl) {
-                        return file.locationUrl;
-                    } else {
-                        this._doValidateUploadedReject(reject, file);
-                        return false;
-                    }
+            const locationUrls = [];
+            for (let file of this.uploadingFiles) {
+                if (file.locationUrl) {
+                    locationUrls.push(file.locationUrl);
+                } else {
+                    this._doValidateUploadedReject(reject, file);
+                    return false;
                 }
             }
-            return null;
+            return locationUrls;
         },
         _doValidateUploadedReject(reject, file) {
             if (typeof reject === 'function') {
                 reject(file);
             } else {
-                this.tnx.alert('文件"' + file.name + '"还未上传完毕，请稍候').then(() => {
+                this.tnx.alert('文件"' + file.name + '"还未上传完毕，请稍候', {title: '提示'}).then(() => {
                     if (reject && typeof reject.disable === 'function') {
                         reject.disable(false);
                     }

package/src/element-plus/fss-view/FssView.vue

@@ -1,31 +1,32 @@
 <template>
-    <div class="tnxel-fss-view">
-        <template v-if="readUrl">
-            <span class="text-muted" v-if="denied">没有权限查看该文件</span>
-            <template v-else-if="thumbnailIconValue">
-                <tnxel-button type="primary" link :icon="thumbnailIconValue" :title="$attrs.title || meta.name"
-                    @click="toPreview"/>
-                <el-image-viewer :url-list="[previewUrl]" teleported @close="imagePreviewing = false"
-                    v-if="imagePreviewing"/>
-            </template>
-            <el-image :src="thumbnailReadUrl" :preview-src-list="previewUrl ? [previewUrl] : undefined" fit="contain"
-                preview-teleported :style="{width: imageWidth, height: imageHeight}" v-else-if="imageable && thumbnail">
-                <template #error>
-                    <div class="text-muted h-100 flex-center">
-                        <i class="el-icon-picture-outline"/>
-                    </div>
-                </template>
-            </el-image>
-            <template v-else>
-                <a class="overflow-ellipsis" :href="downloadUrl" target="_blank" :title="'下载 ' + meta.name">
-                    {{ meta.name }}
-                </a>
-                <a class="preview" :href="previewUrl" target="_blank" :title="'预览 ' + meta.name"
-                    v-if="previewUrl">预览</a>
+<div class="tnxel-fss-view">
+    <template v-if="readUrl">
+        <span class="text-muted" v-if="denied">没有权限查看该文件</span>
+        <template v-else-if="thumbnailIconValue">
+            <tnxel-button type="primary" link :icon="thumbnailIconValue" :title="$attrs.title || meta.name"
+                          @click="toPreview"/>
+            <el-image-viewer :url-list="[previewUrl]" teleported @close="imagePreviewing = false"
+                             v-if="imagePreviewing"/>
+        </template>
+        <el-image :src="thumbnailReadUrl" :preview-src-list="previewUrl ? [previewUrl] : undefined" fit="contain"
+                  preview-teleported :style="{width: imageWidth, height: imageHeight}"
+                  v-else-if="imageable && thumbnail">
+            <template #error>
+                <div class="text-muted h-100 flex-center">
+                    <i class="el-icon-picture-outline"/>
+                </div>
             </template>
+        </el-image>
+        <template v-else>
+            <a class="overflow-ellipsis" :href="downloadUrl" target="_blank" :title="'下载 ' + meta.name">
+                {{ meta.name }}
+            </a>
+            <a class="preview" :href="previewUrl" target="_blank" :title="'预览 ' + meta.name"
+               v-if="previewUrl">预览</a>
         </template>
-        <tnxel-icon class="text-muted" value="Loading" v-else/>
-    </div>
+    </template>
+    <tnxel-icon class="text-muted" value="Loading" v-else/>
+</div>
 </template>
 
 <script>
@@ -103,10 +104,7 @@ export default {
             return height;
         },
         downloadUrl() {
-            let baseUrl = window.tnx.app.rpc.getDefaultBaseUrl();
-            if (this.app) {
-                baseUrl = window.tnx.app.rpc.getBaseUrl(this.app);
-            }
+            let baseUrl = window.tnx.api.getBaseUrl(this.app);
             return baseUrl + this.meta.downloadUrl;
         },
         previewUrl() {
@@ -154,7 +152,7 @@ export default {
     methods: {
         load() {
             if (this.loadable) {
-                let rpc = window.tnx.app.rpc;
+                let rpc = window.tnx.api;
                 let fssConfig = window.tnx.fss.getClientConfig(this.app);
                 let vm = this;
                 rpc.get(fssConfig.contextUrl + '/meta', {

package/src/element-plus/icon/Icon.vue

@@ -69,6 +69,7 @@
         <Switch v-else-if="value === 'Switch'"/>
         <Tools v-else-if="value === 'Tools'"/>
         <Top v-else-if="value === 'Top'"/>
+        <Upload v-else-if="value === 'Upload'"/>
         <User v-else-if="value === 'User'"/>
         <UserFilled v-else-if="value === 'UserFilled'"/>
         <View v-else-if="value === 'View'"/>
@@ -148,6 +149,7 @@ import {
     Switch,
     Tools,
     Top,
+    Upload,
     User,
     UserFilled,
     View,
@@ -225,6 +227,7 @@ const components = {
     Switch,
     Tools,
     Top,
+    Upload,
     User,
     UserFilled,
     View,

package/src/element-plus/query-form/QueryForm.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import {ObjectUtil} from '@truenewx/tnxcore/src/tnxcore-util';
+import {util} from '../tnxel.ts';
 import Button from '../button/Button.vue';
 
 export default {
@@ -119,8 +119,8 @@ export default {
                         return;
                     }
                 } else {
-                    ObjectUtil.clear(this.params, ['pageSize', 'pageNo', 'ignoring', 'orderBy']);
-                    if (ObjectUtil.isNotNull(this.params.pageNo)) {
+                    util.object.clear(this.params, ['pageSize', 'pageNo', 'ignoring', 'orderBy']);
+                    if (util.object.isNotNull(this.params.pageNo)) {
                         this.params.pageNo = 1;
                     }
                 }

package/src/element-plus/query-table/QueryTable.vue

@@ -1,20 +1,20 @@
 <template>
     <div class="tnxel-query-table" :id="id" :class="{selectable: selectable}">
         <el-table ref="table" :data="records" scrollbar-always-on
-            :size="size" :border="border" :stripe="stripe" :max-height="tableMaxHeight"
-            @sort-change="sort" :default-sort="defaultSort" :key="tableKey"
-            :default-expand-all="defaultExpandAll" :span-method="spanMethod"
-            :row-class-name="rowClassName" @cell-click="selectRow" v-loading="records === null">
+                  :size="size" :border="border" :stripe="stripe" :max-height="tableMaxHeight"
+                  @sort-change="sort" :default-sort="defaultSort" :key="tableKey"
+                  :default-expand-all="defaultExpandAll" :span-method="spanMethod"
+                  :row-class-name="rowClassName" @cell-click="selectRow" v-loading="records === null">
             <el-table-column header-align="center" align="center" :width="selectable === 'all' ? 40 : 54"
-                v-if="selectable">
+                             v-if="selectable">
                 <template #header>
                     <el-checkbox :model-value="pageAllSelected" :indeterminate="allSelectedIndeterminate"
-                        @change="selectAll" v-if="selectable === 'all'"/>
+                                 @change="selectAll" v-if="selectable === 'all'"/>
                     <span v-else>选择</span>
                 </template>
                 <template #default="scope">
                     <el-checkbox v-model="pageSelectedIndexes[scope.$index]" @change="selectPageToAll"
-                        v-if="selectable === 'multi' || selectable === 'all'"/>
+                                 v-if="selectable === 'multi' || selectable === 'all'"/>
                 </template>
             </el-table-column>
             <slot></slot>
@@ -30,10 +30,10 @@
             </template>
             <template #append v-if="records && records.length && paged && typeof paged.total !== 'number'">
                 <tnxel-button class="py-0 px-1 mx-2 border-0" icon="Top" tooltip="回到顶部" plain
-                    @click="scrollToTop"/>
+                              @click="scrollToTop"/>
                 <tnxel-icon class="text-secondary" value="Loading" :size="18" v-if="querying"/>
                 <el-button type="primary" link class="m-0" @click="onPagedChange(paged.pageNo + 1)"
-                    v-else-if="paged.morePage">
+                           v-else-if="paged.morePage">
                     加载更多
                 </el-button>
                 <el-button type="info" link v-else>已没有更多</el-button>
@@ -41,9 +41,9 @@
             </template>
         </el-table>
         <slot name="paged" :paged="paged" :show="showPaged" :query="query"
-            v-if="params.pageSize > 0 && paged && typeof paged.total === 'number'">
+              v-if="params.pageSize > 0 && paged && typeof paged.total === 'number'">
             <tnxel-paged :value="paged" :change="onPagedChange" :align="pagedAlign"
-                :page-sizes="pagedSizes" :layout="pagedLayout" v-if="showPaged"/>
+                         :page-sizes="pagedSizes" :layout="pagedLayout" v-if="showPaged"/>
         </slot>
     </div>
 </template>
@@ -274,7 +274,7 @@ export default {
                     this.records = null;
                     this.paged = null;
                 }
-                window.tnx.app.rpc.get(this.url, this.params).then(result => {
+                window.tnx.api.get(this.url, this.params).then(result => {
                     this.querying = false;
                     if (Array.isArray(result)) {
                         this.records = this.format(result);

package/src/element-plus/region-cascader/RegionCascader.vue

@@ -1,6 +1,6 @@
 <template>
-    <el-cascader v-model="model" class="ignore-feedback" :options="region.subs" :props="options"
-        :placeholder="placeholder" :disabled="disabled" :clearable="empty"/>
+<el-cascader v-model="model" class="ignore-feedback" :options="region.subs" :props="options"
+             :placeholder="placeholder" :disabled="disabled" :clearable="empty"/>
 </template>
 
 <script>
@@ -60,7 +60,7 @@ export default {
         }
     },
     created() {
-        window.tnx.app.rpc.loadRegion(this.scope, parseInt(this.maxLevel), {
+        window.tnx.meta.loadRegion(this.scope, parseInt(this.maxLevel), {
             app: this.app,
         }).then((region) => {
             this.region = region;