naive-ui 2.20.2 → 2.21.2

package/lib/upload/src/Upload.js

@@ -73,6 +73,45 @@ function createXhrHandlers(inst, file, XHR) {
         }
     };
 }
+function customSubmitImpl(options) {
+    const { inst, file, data, headers, withCredentials, action, customRequest } = options;
+    const { doChange } = options.inst;
+    let percentage = 0;
+    customRequest({
+        file,
+        data,
+        headers,
+        withCredentials,
+        action,
+        onProgress(event) {
+            const fileAfterChange = Object.assign({}, file, {
+                status: 'uploading'
+            });
+            const progress = event.percent;
+            fileAfterChange.percentage = progress;
+            percentage = progress;
+            doChange(fileAfterChange);
+        },
+        onFinish() {
+            var _a;
+            let fileAfterChange = Object.assign({}, file, {
+                status: 'finished',
+                percentage,
+                file: null
+            });
+            fileAfterChange =
+                ((_a = inst.onFinish) === null || _a === void 0 ? void 0 : _a.call(inst, { file: fileAfterChange })) || fileAfterChange;
+            doChange(fileAfterChange);
+        },
+        onError() {
+            const fileAfterChange = Object.assign({}, file, {
+                status: 'error',
+                percentage
+            });
+            doChange(fileAfterChange);
+        }
+    });
+}
 function registerHandler(inst, file, request) {
     const handlers = createXhrHandlers(inst, file, request);
     request.onabort = handlers.handleXHRAbort;
@@ -125,7 +164,7 @@ function submitImpl(inst, file, formData, { method, action, withCredentials, hea
 const uploadProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), { name: {
         type: String,
         default: 'file'
-    }, accept: String, action: String, 
+    }, accept: String, action: String, customRequest: Function, 
     // to be impl
     // directory: {
     //   type: Boolean,
@@ -154,10 +193,7 @@ const uploadProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), {
     }, showRemoveButton: {
         type: Boolean,
         default: true
-    }, showDownloadButton: {
-        type: Boolean,
-        default: false
-    }, showRetryButton: {
+    }, showDownloadButton: Boolean, showRetryButton: {
         type: Boolean,
         default: true
     }, showPreviewButton: {
@@ -269,17 +305,34 @@ exports.default = (0, vue_1.defineComponent)({
                 if (status === 'pending' || (status === 'error' && shouldReupload)) {
                     const formData = new FormData();
                     formData.append(fieldName, file.file);
-                    submitImpl({
-                        doChange,
-                        XhrMap,
-                        onFinish: props.onFinish
-                    }, file, formData, {
-                        method,
-                        action,
-                        withCredentials,
-                        headers,
-                        data
-                    });
+                    if (props.customRequest) {
+                        customSubmitImpl({
+                            inst: {
+                                doChange,
+                                XhrMap,
+                                onFinish: props.onFinish
+                            },
+                            file,
+                            action,
+                            withCredentials,
+                            headers,
+                            data,
+                            customRequest: props.customRequest
+                        });
+                    }
+                    else {
+                        submitImpl({
+                            doChange,
+                            XhrMap,
+                            onFinish: props.onFinish
+                        }, file, formData, {
+                            method,
+                            action,
+                            withCredentials,
+                            headers,
+                            data
+                        });
+                    }
                 }
             });
         }

package/lib/upload/src/UploadFile.d.ts

@@ -84,9 +84,13 @@ declare const _default: import("vue").DefineComponent<{
             tableHeaderColor: string;
             hoverColor: string;
             tableColorHover: string;
+            tableColorStriped: string;
             pressedColor: string;
             opacityDisabled: string;
             inputColorDisabled: string;
+            buttonColor2: string;
+            buttonColor2Hover: string;
+            buttonColor2Pressed: string;
             boxShadow1: string;
             boxShadow2: string;
             boxShadow3: string;
@@ -146,20 +150,30 @@ declare const _default: import("vue").DefineComponent<{
                 fontSizeMedium: string;
                 fontSizeLarge: string;
                 opacityDisabled: string;
+                colorOpacitySecondary: number;
+                colorOpacitySecondaryHover: number;
+                colorOpacitySecondaryPressed: number;
+                colorSecondary: string;
+                colorSecondaryHover: string;
+                colorSecondaryPressed: string;
+                colorTertiary: string;
+                colorTertiaryHover: string;
+                colorTertiaryPressed: string;
+                colorQuaternary: string;
+                colorQuaternaryHover: string;
+                colorQuaternaryPressed: string;
                 color: string;
                 colorHover: string;
                 colorPressed: string;
                 colorFocus: string;
                 colorDisabled: string;
                 textColor: string;
+                textColorTertiary: string;
                 textColorHover: string;
                 textColorPressed: string;
                 textColorFocus: string;
                 textColorDisabled: string;
                 textColorText: string;
-                textColorTextDepth1: string;
-                textColorTextDepth2: string;
-                textColorTextDepth3: string;
                 textColorTextHover: string;
                 textColorTextPressed: string;
                 textColorTextFocus: string;
@@ -205,7 +219,7 @@ declare const _default: import("vue").DefineComponent<{
                 colorHoverInfo: string;
                 colorPressedInfo: string;
                 colorFocusInfo: string;
-                colorDisabledInfo: string;
+                colorDisabledInfo: string; /** I haven't figure out its usage, so just leave it here */
                 textColorInfo: string;
                 textColorHoverInfo: string;
                 textColorPressedInfo: string;
@@ -306,9 +320,8 @@ declare const _default: import("vue").DefineComponent<{
                 borderDisabledError: string;
                 rippleColorError: string;
                 waveOpacity: string;
-                fontWeightText: string;
                 fontWeight: string;
-                fontWeighGhost: string;
+                fontWeightStrong: string;
                 paddingTiny: string;
                 paddingSmall: string;
                 paddingMedium: string;

package/lib/upload/src/UploadProgress.d.ts

@@ -80,9 +80,13 @@ declare const _default: import("vue").DefineComponent<{
             tableHeaderColor: string;
             hoverColor: string;
             tableColorHover: string;
+            tableColorStriped: string;
             pressedColor: string;
             opacityDisabled: string;
             inputColorDisabled: string;
+            buttonColor2: string;
+            buttonColor2Hover: string;
+            buttonColor2Pressed: string;
             boxShadow1: string;
             boxShadow2: string;
             boxShadow3: string;
@@ -142,20 +146,30 @@ declare const _default: import("vue").DefineComponent<{
                 fontSizeMedium: string;
                 fontSizeLarge: string;
                 opacityDisabled: string;
+                colorOpacitySecondary: number;
+                colorOpacitySecondaryHover: number;
+                colorOpacitySecondaryPressed: number;
+                colorSecondary: string;
+                colorSecondaryHover: string;
+                colorSecondaryPressed: string;
+                colorTertiary: string;
+                colorTertiaryHover: string;
+                colorTertiaryPressed: string;
+                colorQuaternary: string;
+                colorQuaternaryHover: string;
+                colorQuaternaryPressed: string;
                 color: string;
                 colorHover: string;
                 colorPressed: string;
                 colorFocus: string;
                 colorDisabled: string;
                 textColor: string;
+                textColorTertiary: string;
                 textColorHover: string;
                 textColorPressed: string;
                 textColorFocus: string;
                 textColorDisabled: string;
                 textColorText: string;
-                textColorTextDepth1: string;
-                textColorTextDepth2: string;
-                textColorTextDepth3: string;
                 textColorTextHover: string;
                 textColorTextPressed: string;
                 textColorTextFocus: string;
@@ -302,9 +316,8 @@ declare const _default: import("vue").DefineComponent<{
                 borderDisabledError: string;
                 rippleColorError: string;
                 waveOpacity: string;
-                fontWeightText: string;
                 fontWeight: string;
-                fontWeighGhost: string;
+                fontWeightStrong: string;
                 paddingTiny: string;
                 paddingSmall: string;
                 paddingMedium: string;

package/lib/upload/src/interface.d.ts

@@ -21,7 +21,7 @@ export declare type OnChange = (data: {
 }) => void;
 export declare type OnFinish = ({ file, event }: {
     file: FileInfo;
-    event: Event;
+    event?: Event;
 }) => FileInfo | undefined;
 export declare type OnRemove = (data: {
     file: FileInfo;
@@ -85,3 +85,16 @@ export declare type OnBeforeUpload = (data: {
 export declare type listType = 'text' | 'image' | 'image-card';
 export declare type OnPreview = (file: FileInfo) => void;
 export declare type CreateThumbnailUrl = (file: File) => Promise<string>;
+export interface CustomRequestOptions {
+    file: FileInfo;
+    action?: string;
+    withCredentials?: boolean;
+    data?: FuncOrRecordOrUndef;
+    headers?: FuncOrRecordOrUndef;
+    onProgress: (e: {
+        percent: number;
+    }) => void;
+    onFinish: () => void;
+    onError: () => void;
+}
+export declare type CustomRequest = (options: CustomRequestOptions) => void;

package/lib/upload/styles/light.d.ts

@@ -48,20 +48,30 @@ declare const uploadLight: import("../../_mixins").Theme<"Upload", {
         fontSizeMedium: string;
         fontSizeLarge: string;
         opacityDisabled: string;
+        colorOpacitySecondary: number;
+        colorOpacitySecondaryHover: number;
+        colorOpacitySecondaryPressed: number;
+        colorSecondary: string;
+        colorSecondaryHover: string;
+        colorSecondaryPressed: string;
+        colorTertiary: string;
+        colorTertiaryHover: string;
+        colorTertiaryPressed: string;
+        colorQuaternary: string;
+        colorQuaternaryHover: string;
+        colorQuaternaryPressed: string;
         color: string;
         colorHover: string;
         colorPressed: string;
         colorFocus: string;
         colorDisabled: string;
         textColor: string;
+        textColorTertiary: string;
         textColorHover: string;
         textColorPressed: string;
         textColorFocus: string;
         textColorDisabled: string;
         textColorText: string;
-        textColorTextDepth1: string;
-        textColorTextDepth2: string;
-        textColorTextDepth3: string;
         textColorTextHover: string;
         textColorTextPressed: string;
         textColorTextFocus: string;
@@ -208,9 +218,8 @@ declare const uploadLight: import("../../_mixins").Theme<"Upload", {
         borderDisabledError: string;
         rippleColorError: string;
         waveOpacity: string;
-        fontWeightText: string;
         fontWeight: string;
-        fontWeighGhost: string;
+        fontWeightStrong: string;
         paddingTiny: string;
         paddingSmall: string;
         paddingMedium: string;

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.20.2";
+declare const _default: "2.21.2";
 export default _default;

package/lib/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '2.20.2';
+exports.default = '2.21.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "2.20.2",
+  "version": "2.21.2",
   "description": "A Vue 3 Component Library. Fairly Complete, Customizable Themes, Uses TypeScript, Not Too Slow",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -20,7 +20,7 @@
     "format:code": "prettier --write \"(src|demo)/**/*.(vue|js)\"",
     "format:md": "prettier --write --parser markdown --prose-wrap never \"(src|demo)/**/*.md\"",
     "test": "cross-env NODE_ENV=test jest --collectCoverage=false",
-    "test:cov": "cross-env NODE_ENV=test jest",
+    "test:cov": "cross-env NODE_ENV=test NODE_OPTIONS=--unhandled-rejections=warn jest",
     "test:watch": "cross-env NODE_ENV=test jest ---watch --verbose --coverage",
     "gen-version": "node scripts/gen-version",
     "release-changelog": "node scripts/release-changelog",
@@ -62,6 +62,7 @@
     ]
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.15.8",
     "@babel/generator": "^7.12.11",
     "@babel/parser": "^7.12.11",
     "@babel/preset-env": "^7.12.10",
@@ -79,8 +80,9 @@
     "@vue/eslint-config-standard": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
     "@vue/server-renderer": "^3.2.18",
-    "@vue/test-utils": "^2.0.0-rc.9",
+    "@vue/test-utils": "2.0.0-rc.16",
     "autoprefixer": "^10.2.6",
+    "axios": "^0.24.0",
     "babel-jest": "^27.0.2",
     "codesandbox": "^2.2.3",
     "cross-env": "^7.0.3",
@@ -100,8 +102,8 @@
     "inquirer": "^8.1.0",
     "jest": "^27.0.4",
     "jest-canvas-mock": "^2.3.1",
-    "lint-staged": "^11.0.0",
-    "marked": "^3.0.2",
+    "lint-staged": "^11.2.6",
+    "marked": "^4.0.4",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
     "superagent": "^6.1.0",
@@ -115,7 +117,6 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
-    "@babel/eslint-parser": "^7.15.8",
     "@css-render/plugin-bem": "^0.15.6",
     "@css-render/vue3-ssr": "^0.15.6",
     "@types/lodash": "^4.14.170",
@@ -124,16 +125,16 @@
     "css-render": "^0.15.6",
     "date-fns": "^2.19.0",
     "date-fns-tz": "^1.1.6",
-    "evtd": "^0.2.2",
+    "evtd": "^0.2.3",
     "highlight.js": "^11.0.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
-    "seemly": "^0.3.2",
+    "seemly": "^0.3.3",
     "treemate": "^0.3.8",
     "vdirs": "^0.1.4",
     "vfonts": "^0.1.0",
     "vooks": "^0.2.10",
-    "vueuc": "^0.4.15"
+    "vueuc": "^0.4.18"
   },
   "sideEffects": false,
   "homepage": "https://www.naiveui.com",