Merge pull request #670 from illacloud/develop

Develop
illacloud · Feb 17, 2023 · 5ed4384 · 5ed4384
2 parents 9b62297 + 11cbcb2
commit 5ed4384
Show file tree

Hide file tree

Showing 28 changed files with 10,490 additions and 11,598 deletions.
diff --git a/packages/calendar/vite.config.ts b/packages/calendar/vite.config.ts
@@ -36,8 +36,14 @@ export default defineConfig({
         "react",
         "react-dom",
         "@emotion/react",
+        "dayjs",
         "@illa-design/system",
         "@illa-design/theme",
+        "@illa-design/config-provider",
+        "@illa-design/icon",
+        "@illa-design/button",
+        "@illa-design/radio",
+        "@illa-design/select",
       ],
       output: {
         globals: {
@@ -46,6 +52,12 @@ export default defineConfig({
           "@emotion/react": "@emotion/react",
           "@illa-design/system": "@illa-design/system",
           "@illa-design/theme": "@illa-design/theme",
+          dayjs: "dayjs",
+          "@illa-design/config-provider": "@illa-design/config-provider",
+          "@illa-design/icon": "@illa-design/icon",
+          "@illa-design/button": "@illa-design/button",
+          "@illa-design/radio": "@illa-design/radio",
+          "@illa-design/select": "@illa-design/select",
         },
       },
     },

diff --git a/packages/cascader/vite.config.ts b/packages/cascader/vite.config.ts
@@ -38,6 +38,12 @@ export default defineConfig({
         "@emotion/react",
         "@illa-design/theme",
         "@illa-design/system",
+        "@illa-design/icon",
+        "@illa-design/input",
+        "@illa-design/trigger",
+        "@illa-design/input-tag",
+        "@illa-design/checkbox",
+        "@illa-design/empty",
       ],
       output: {
         globals: {
@@ -46,6 +52,12 @@ export default defineConfig({
           "@emotion/react": "@emotion/react",
           "@illa-design/theme": "@illa-design/theme",
           "@illa-design/system": "@illa-design/system",
+          "@illa-design/icon": "@illa-design/icon",
+          "@illa-design/input": "@illa-design/input",
+          "@illa-design/trigger": "@illa-design/trigger",
+          "@illa-design/input-tag": "@illa-design/input-tag",
+          "@illa-design/checkbox": "@illa-design/checkbox",
+          "@illa-design/empty": "@illa-design/empty",
         },
       },
     },

diff --git a/packages/config-provider/src/locale/en-US.tsx b/packages/config-provider/src/locale/en-US.tsx
@@ -24,10 +24,16 @@ export const enUS = {
     go: "Go to ",
   },
   upload: {
+    start: "Start",
+    cancel: "Cancel",
     upload: "Upload",
+    delete: "Delete",
+    preview: "Preview",
+    retry: "Click to retry",
     dragTip: "Drag and drop the file",
     selectFile: "Select File",
     beginUpload: "Upload File",
+    error: "Failed",
   },
   popConfirm: {
     confirm: "Confirm",

diff --git a/packages/config-provider/src/locale/ja-JP.tsx b/packages/config-provider/src/locale/ja-JP.tsx
@@ -24,8 +24,14 @@ export const jaJP = {
     go: "に行く",
   },
   upload: {
+    start: "始める",
+    cancel: "キャンセル",
+    delete: "消去",
+    preview: "プレビュー",
+    retry: "クリックして再試行",
     upload: "アップロード",
     dragTip: "ここにファイルをドラッグ アンド ドロップします",
+    dragHover: "ファイルを解放してアップロードを開始します",
     selectFile: "ファイルを選択",
     beginUpload: "アップロードを開始",
   },

diff --git a/packages/config-provider/src/locale/ko-KR.tsx b/packages/config-provider/src/locale/ko-KR.tsx
@@ -24,8 +24,14 @@ export const koKR = {
     go: "가다",
   },
   upload: {
+    start: "시작",
+    cancel: "취소",
+    delete: "삭제",
+    preview: "시사",
+    retry: "다시 시도하려면 클릭하세요",
     upload: "업로드",
     dragTip: "파일을 여기로 드래그 앤 드래그",
+    dragHover: "파일을 해제하고 업로드 시작",
     selectFile: "파일 선택",
     beginUpload: "업로드 시작",
   },

diff --git a/packages/config-provider/src/locale/zh-CN.tsx b/packages/config-provider/src/locale/zh-CN.tsx
@@ -24,8 +24,14 @@ export const zhCN = {
     go: "前往",
   },
   upload: {
+    start: "开始",
+    cancel: "取消",
+    delete: "删除",
+    preview: "预览",
     upload: "上传",
+    retry: "点击重试",
     dragTip: "拖拽文件至此处",
+    dragHover: "释放文件并开始上传",
     selectFile: "选择文件",
     beginUpload: "开始上传",
   },

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -98,7 +98,8 @@
     "@illa-design/table": "workspace:*",
     "@illa-design/calendar": "workspace:*",
     "@illa-design/date-picker": "workspace:*",
-    "@illa-design/time-picker": "workspace:*"
+    "@illa-design/time-picker": "workspace:*",
+    "@illa-design/upload": "workspace:*"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
@@ -54,3 +54,4 @@ export * from "@illa-design/dropdown"
 export * from "@illa-design/calendar"
 export * from "@illa-design/date-picker"
 export * from "@illa-design/time-picker"
+export * from "@illa-design/upload"
diff --git a/packages/react/vite.config.ts b/packages/react/vite.config.ts
@@ -94,6 +94,7 @@ export default defineConfig({
         "@illa-design/dropdown",
         "@illa-design/affix",
         "@illa-design/cascader",
+        "@illa-design/upload",
       ],
       output: {
         globals: {

diff --git a/packages/system/src/is.ts b/packages/system/src/is.ts
@@ -42,6 +42,10 @@ export function isNumber(obj: any): obj is number {
   )
 }
 
+export function isFile(obj: any): obj is File {
+  return Object.prototype.toString.call(obj) === "[object File]"
+}
+
 export function isFunction<T extends Function = Function>(
   value: any,
 ): value is T {

diff --git a/packages/upload/.gitignore b/packages/upload/.gitignore
@@ -0,0 +1,5 @@
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local
diff --git a/packages/upload/package.json b/packages/upload/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "@illa-design/upload",
+  "version": "1.0.15",
+  "description": "Illa Design Upload.",
+  "keywords": [
+    "upload",
+    "react",
+    "component"
+  ],
+  "sideEffects": false,
+  "author": "illa Cloud <[email protected]>",
+  "homepage": "https://github.com/illacloud/illa-design",
+  "license": "Apache-2.0",
+  "main": "dist/umd/index.js",
+  "module": "dist/es/index.js",
+  "types": "dist/types/index.d.ts",
+  "typings": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/es/index.js",
+      "require": "./dist/umd/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/illacloud/illa-design.git",
+    "directory": "packages/upload"
+  },
+  "bugs": {
+    "url": "https://github.com/illacloud/illa-design/issues"
+  },
+  "scripts": {
+    "build": "vite build",
+    "plop": "pnpm dlx plop new",
+    "plop-icon": "pnpm dlx plop new-icon"
+  },
+  "dependencies": {
+    "@illa-design/button": "workspace:*",
+    "@illa-design/config-provider": "workspace:*",
+    "@illa-design/icon": "workspace:*",
+    "@illa-design/progress": "workspace:*",
+    "@illa-design/system": "workspace:*",
+    "@illa-design/theme": "workspace:*",
+    "framer-motion": "^7.6.12",
+    "uuid": "^8.3.2"
+  },
+  "peerDependencies": {
+    "@emotion/react": "^11.10.5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/uuid": "^8.3.4",
+    "@vitejs/plugin-react-swc": "^3.0.1",
+    "@rollup/plugin-typescript": "^10.0.1"
+  }
+}
diff --git a/packages/upload/src/index.ts b/packages/upload/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./upload"
+export * from "./interface"