@sdata/web-vue 4.7.1 → 5.0.0

package/es/upload/upload.vue_vue_type_script_setup_true_lang.js

@@ -2,12 +2,13 @@ import { useFormItem } from "../_hooks/use-form-item.js";
 import _objectSpread2 from "../_virtual/_@oxc-project_runtime@0.148.0/helpers/esm/objectSpread2.js";
 import { getPrefixCls } from "../_utils/global-config.js";
 import { isBoolean, isFunction, isObject } from "../_utils/is.js";
+import _asyncToGenerator from "../_virtual/_@oxc-project_runtime@0.148.0/helpers/esm/asyncToGenerator.js";
 import preview_group_default from "../image/preview-group.js";
 import { uploadInjectionKey } from "./context.js";
 import { isImage, uploadRequest } from "./utils.js";
 import upload_button_default from "./upload-button.js";
 import upload_list_default from "./upload-list.js";
-import { computed, createBlock, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, guardReactiveProps, h, mergeProps, normalizeProps, openBlock, provide, reactive, ref, renderSlot, toRefs, unref, useAttrs, useSlots, watch, withCtx } from "vue";
+import { computed, createBlock, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, guardReactiveProps, h, mergeProps, normalizeProps, onBeforeUnmount, openBlock, provide, reactive, ref, renderSlot, toRefs, unref, useAttrs, useSlots, watch, withCtx } from "vue";
 //#region components/upload/upload.vue?vue&type=script&setup=true&lang.ts
 var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent(_objectSpread2(_objectSpread2({}, {
 	name: "Upload",
@@ -50,6 +51,11 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 			default: false
 		},
 		customRequest: Function,
+		/**
+		* @zh 跨标签页上传互斥标识；相同标识同时只允许一个文件上传
+		* @en Cross-tab upload lock key; only one file per key may upload at a time
+		*/
+		lockKey: [String, Function],
 		limit: {
 			type: Number,
 			default: 0
@@ -130,6 +136,25 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 		const innerFileList = ref([]);
 		const fileMap = /* @__PURE__ */ new Map();
 		const requestMap = /* @__PURE__ */ new Map();
+		let disposed = false;
+		let pendingFiles = 0;
+		const cancelRequest = (uid) => {
+			const task = requestMap.get(uid);
+			if (!task) return;
+			requestMap.delete(uid);
+			task.cancelled = true;
+			try {
+				var _task$request, _task$request$abort;
+				(_task$request = task.request) === null || _task$request === void 0 || (_task$request$abort = _task$request.abort) === null || _task$request$abort === void 0 || _task$request$abort.call(_task$request);
+			} finally {
+				var _task$releaseLock;
+				(_task$releaseLock = task.releaseLock) === null || _task$releaseLock === void 0 || _task$releaseLock.call(task);
+			}
+		};
+		onBeforeUnmount(() => {
+			disposed = true;
+			for (const uid of requestMap.keys()) cancelRequest(uid);
+		});
 		const isMax = computed(() => props.limit > 0 && innerFileList.value.length >= props.limit);
 		const checkFileList = (fileList) => {
 			fileMap.clear();
@@ -145,6 +170,7 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				return fileItem;
 			});
 			innerFileList.value = nextFileList !== null && nextFileList !== void 0 ? nextFileList : [];
+			for (const uid of requestMap.keys()) if (!fileMap.has(uid)) cancelRequest(uid);
 		};
 		checkFileList(props.defaultFileList);
 		watch(() => props.fileList, (fileList) => {
@@ -167,7 +193,12 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 			}
 		};
 		const uploadFile = (fileItem) => {
+			if (disposed || !fileMap.has(fileItem.uid) || requestMap.has(fileItem.uid)) return;
+			const task = { cancelled: false };
+			requestMap.set(fileItem.uid, task);
+			const isCurrent = () => !disposed && requestMap.get(fileItem.uid) === task;
 			const handleProgress = (percent, event) => {
+				if (!isCurrent()) return;
 				const file = fileMap.get(fileItem.uid);
 				if (!file) return;
 				file.status = "uploading";
@@ -176,6 +207,8 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				updateFileList(file);
 			};
 			const handleSuccess = (response) => {
+				var _task$releaseLock2;
+				if (!isCurrent()) return;
 				const file = fileMap.get(fileItem.uid);
 				if (!file) return;
 				file.status = "done";
@@ -186,16 +219,20 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 					else if (isObject(response) && response[props.responseUrlKey]) file.url = String(response[props.responseUrlKey]);
 				}
 				requestMap.delete(file.uid);
+				(_task$releaseLock2 = task.releaseLock) === null || _task$releaseLock2 === void 0 || _task$releaseLock2.call(task);
 				emit("success", file);
 				updateFileList(file);
 			};
 			const handleError = (response) => {
+				var _task$releaseLock3;
+				if (!isCurrent()) return;
 				const file = fileMap.get(fileItem.uid);
 				if (!file) return;
 				file.status = "error";
 				file.percent = 0;
 				file.response = response;
 				requestMap.delete(file.uid);
+				(_task$releaseLock3 = task.releaseLock) === null || _task$releaseLock3 === void 0 || _task$releaseLock3.call(task);
 				emit("error", file);
 				updateFileList(file);
 			};
@@ -212,16 +249,53 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 			};
 			fileItem.status = "uploading";
 			fileItem.percent = 0;
-			const request = isFunction(props.customRequest) ? props.customRequest(option) : uploadRequest(option);
-			requestMap.set(fileItem.uid, request);
-			updateFileList(fileItem);
+			const startRequest = () => {
+				if (!isCurrent()) return;
+				try {
+					var _task$request$abort2, _task$request2;
+					task.request = isFunction(props.customRequest) ? props.customRequest(option) : uploadRequest(option);
+					if (task.cancelled) (_task$request$abort2 = (_task$request2 = task.request).abort) === null || _task$request$abort2 === void 0 || _task$request$abort2.call(_task$request2);
+					if (isCurrent()) updateFileList(fileItem);
+				} catch (error) {
+					handleError(error);
+				}
+			};
+			try {
+				var _globalThis$navigator;
+				const key = isFunction(props.lockKey) ? props.lockKey(fileItem) : props.lockKey;
+				if (key === void 0) {
+					startRequest();
+					return;
+				}
+				if (!((_globalThis$navigator = globalThis.navigator) === null || _globalThis$navigator === void 0 ? void 0 : _globalThis$navigator.locks)) {
+					handleError({
+						code: "UPLOAD_LOCK_UNSUPPORTED",
+						message: "Web Locks API is unavailable"
+					});
+					return;
+				}
+				navigator.locks.request(`sd-upload:${key}`, { ifAvailable: true }, (lock) => {
+					if (!isCurrent()) return;
+					if (!lock) {
+						handleError({
+							code: "UPLOAD_LOCK_BUSY",
+							message: "An upload with this lock key is already running"
+						});
+						return;
+					}
+					return new Promise((resolve) => {
+						task.releaseLock = resolve;
+						startRequest();
+					});
+				}).catch(handleError);
+				updateFileList(fileItem);
+			} catch (error) {
+				handleError(error);
+			}
 		};
 		const abort = (fileItem) => {
-			var _request$abort;
-			const request = requestMap.get(fileItem.uid);
-			if (!request) return;
-			(_request$abort = request.abort) === null || _request$abort === void 0 || _request$abort.call(request);
-			requestMap.delete(fileItem.uid);
+			if (!requestMap.get(fileItem.uid)) return;
+			cancelRequest(fileItem.uid);
 			const file = fileMap.get(fileItem.uid);
 			if (file) {
 				file.status = "error";
@@ -239,6 +313,11 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 			for (const item of innerFileList.value) if (item.status === "init") uploadFile(item);
 		};
 		const initUpload = (file) => {
+			if (disposed) return;
+			if (props.limit > 0 && innerFileList.value.length >= props.limit) {
+				emit("exceedLimit", innerFileList.value, [file]);
+				return;
+			}
 			const uid = `${Date.now()}-${uidCounter++}`;
 			const fileItem = reactive({
 				uid,
@@ -254,20 +333,34 @@ var upload_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 			if (props.autoUpload) uploadFile(fileItem);
 		};
 		const uploadFiles = (files) => {
-			if (props.limit > 0 && innerFileList.value.length + files.length > props.limit) {
+			if (disposed) return;
+			if (props.limit > 0 && innerFileList.value.length + pendingFiles + files.length > props.limit) {
 				emit("exceedLimit", innerFileList.value, files);
 				return;
 			}
-			files.forEach((file) => {
-				if (isFunction(props.onBeforeUpload)) Promise.resolve(props.onBeforeUpload(file)).then((result) => {
+			pendingFiles += files.length;
+			files.forEach(function() {
+				var _ref = _asyncToGenerator(function* (file) {
+					let result = true;
+					try {
+						if (isFunction(props.onBeforeUpload)) result = yield props.onBeforeUpload(file);
+					} catch (error) {
+						result = false;
+						console.error(error);
+					} finally {
+						pendingFiles -= 1;
+					}
 					if (result) initUpload(isBoolean(result) ? file : result);
-				}).catch((error) => {
-					console.error(error);
 				});
-				else initUpload(file);
-			});
+				return function(_x) {
+					return _ref.apply(this, arguments);
+				};
+			}());
 		};
 		const removeFile = (fileItem) => {
+			if (disposed || !fileMap.has(fileItem.uid)) return;
+			fileMap.delete(fileItem.uid);
+			cancelRequest(fileItem.uid);
 			innerFileList.value = innerFileList.value.filter((item) => item.uid !== fileItem.uid);
 			updateFileList(fileItem);
 		};

package/json/vetur-attributes.json

@@ -2988,6 +2988,10 @@
   "sd-tag/ellipsis-tooltip": {
     "description": "Whether to show a tooltip when ellipsis is active. Tooltip props are supported."
   },
+  "sd-tag/tooltip": {
+    "description": "Custom tooltip content. When set (or when the tooltip slot is used), the tooltip shows on hover whether or not the content is truncated, unless the ellipsis tooltip is explicitly disabled (false or disabled: true)",
+    "type": "string"
+  },
   "sd-tag/ellipsis-performant": {
     "description": "Whether to use the performant ellipsis implementation",
     "type": "boolean"
@@ -3752,6 +3756,9 @@
     "description": "Heading level, equivalent to `h1` `h2` `h3` `h4` `h5` `h6`",
     "type": "string"
   },
+  "sd-upload/lock-key": {
+    "description": "Cross-tab upload lock key; only one file per key may upload at a time"
+  },
   "sd-watermark/content": {
     "description": "Watermark text content"
   },

package/json/vetur-tags.json

@@ -1375,6 +1375,7 @@
       "ellipsis-line-clamp",
       "ellipsis-expand-trigger",
       "ellipsis-tooltip",
+      "tooltip",
       "ellipsis-performant",
       "text-color",
       "background-alpha"
@@ -1650,7 +1651,9 @@
     "attributes": []
   },
   "sd-upload": {
-    "attributes": []
+    "attributes": [
+      "lock-key"
+    ]
   },
   "sd-verification-code": {
     "attributes": []

package/json/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "@sdata/web-vue",
-  "version": "4.7.0",
+  "version": "4.7.2",
   "contributions": {
     "html": {
       "types-syntax": "typescript",
@@ -7363,6 +7363,14 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "tooltip",
+              "description": "Custom tooltip content. When set (or when the tooltip slot is used), the tooltip shows on hover whether or not the content is truncated, unless the ellipsis tooltip is explicitly disabled (false or disabled: true)",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
+            },
             {
               "name": "ellipsis-performant",
               "description": "Whether to use the performant ellipsis implementation",
@@ -9127,7 +9135,15 @@
         },
         {
           "name": "sd-upload",
-          "attributes": [],
+          "attributes": [
+            {
+              "name": "lock-key",
+              "description": "Cross-tab upload lock key; only one file per key may upload at a time",
+              "value": {
+                "kind": "expression"
+              }
+            }
+          ],
           "events": [],
           "slots": []
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdata/web-vue",
-  "version": "4.7.1",
+  "version": "5.0.0",
   "description": "SD Design Vue: A Vue.js 3 UI Library",
   "keywords": [
     "sd",
@@ -19,6 +19,7 @@
     "dist",
     "json"
   ],
+  "type": "module",
   "sideEffects": [
     "dist/*",
     "es/**/style/*",
@@ -122,16 +123,20 @@
   },
   "web-types": "json/web-types.json",
   "scripts": {
+    "theme:generate": "node ./scripts/theme-catalog.mjs",
+    "test:theme": "node --test ./scripts/theme-catalog.test.mjs && cypress run --quiet --component --browser chrome --spec components/config-provider/__test__/*.cy.ts",
+    "test:theme:e2e": "cypress run --quiet --browser chrome --config-file cypress.theme.config.ts",
     "predev": "pnpm run icongen",
     "dev": "vp run task:dev-component",
     "start": "pnpm run dev",
-    "icongen": "vp run gen:icons",
+    "icongen": "pnpm run theme:generate && vp run gen:icons",
     "jsongen": "vp run gen:web-types",
     "build": "pnpm run build:component && pnpm run build:style && pnpm run build:dts && pnpm run jsongen",
     "prebuild:component": "pnpm run icongen",
     "build:component": "vp run task:build-component",
     "prebuild:module": "pnpm run icongen",
     "build:module": "vp run task:build-module",
+    "prebuild:style": "pnpm run theme:generate",
     "build:style": "vp run task:build-style",
     "fix:scss-legacy-props": "node ./scripts/fix-scss-legacy-property-refs.mjs",
     "prebuild:dts": "pnpm run icongen",

package/es/style/color/palette-dark.d.ts

@@ -1,4 +0,0 @@
-declare const _exports: {
-    install(_: any, __: any, functions: any): void;
-};
-export = _exports;

package/es/style/color/palette-dark.js

@@ -1,10 +0,0 @@
-// oxlint-disable-next-line @typescript-eslint/no-var-requires
-const { generate } = require('@arco-design/color');
-
-module.exports = {
-  install(_, __, functions) {
-    functions.add('color-palette-dark', (color, index) => {
-      return generate(color.value, { index: index.value, dark: true });
-    });
-  },
-};

package/es/style/color/palette.d.ts

@@ -1,4 +0,0 @@
-declare const _exports: {
-    install(_: any, __: any, functions: any): void;
-};
-export = _exports;

package/es/style/color/palette.js

@@ -1,10 +0,0 @@
-// oxlint-disable-next-line @typescript-eslint/no-var-requires
-const { generate } = require('@arco-design/color');
-
-module.exports = {
-  install(_, __, functions) {
-    functions.add('color-palette', (color, index) => {
-      return generate(color.value, { index: index.value });
-    });
-  },
-};