Merge remote-tracking branch 'origin/master'

# Conflicts: # packages/antd-plus/CHANGELOG.md # packages/antd-plus/package.json # packages/painter/CHANGELOG.md # packages/painter/package.json # packages/pdf-viewer/CHANGELOG.md # packages/pdf-viewer/package.json # packages/pocket/CHANGELOG.md # packages/pocket/package.json
orca-team · Nov 7, 2023 · f1e34ba · f1e34ba
2 parents 4122bcc + ac9bfcb
commit f1e34ba
Show file tree

Hide file tree

Showing 20 changed files with 174 additions and 45 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2020-present orca-team, https://orca.nicokam.work/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -1 +1,23 @@
-# Orca-Pocket
+# Orca-Team Front-End Pocket Toolkit
+
+A React-biased front-end collection, including UI components, hooks, and common-tools.
+
+[Click here to see our website and documentation.](https://orca.nicokam.work/)
+
+## Introduction
+
+[![npm version](https://badge.fury.io/js/%40orca-fe%2Fpocket.svg)](https://badge.fury.io/js/%40orca-fe%2Fpocket)
+[![Build Status](https://travis-ci.com/orca-team/orca-fe-pocket.svg?branch=master)](https://travis-ci.com/orca-team/orca-fe-pocket)
+
+![orca-pocket-readmd.png](./public/assets-readme/orca-pocket-readmd.png)
+
+Visit here for more details:
+
+- [@orca-fe/pocket](https://orca.nicokam.work/components)
+- [@orca-fe/hooks](https://orca.nicokam.work/hooks)
+- [@orca-fe/tools](https://orca.nicokam.work/tools)
+- [@orca-fe/antd-plus](https://orca.nicokam.work/antd-pluses)
+- [@orca-fe/transformer](https://orca.nicokam.work/pro-component/transformers)
+- [@orca-fe/dnd](https://orca.nicokam.work/pro-component/dnds)
+- [@orca-fe/painter](https://orca.nicokam.work/pro-component/painters)
+- [@orca-fe/pdf-viewer](https://orca.nicokam.work/pro-component/pdf-viewers)
diff --git a/emit-log.sh b/emit-log.sh
@@ -3,6 +3,9 @@
 # 取出 log.txt 的文件内容
 log=$(cat log.txt|grep 'New tag:')
 
+# 将换行符替换为两个换行符
+log=$(echo "$log"|sed 's/\n/\\n\\n/g')
+
 # 如果 log.txt 为空
 if [ -z "$log" ]; then
   curl "https://oapi.dingtalk.com/robot/send?access_token=${DING_TOKEN}" \

diff --git a/packages/antd-plus/CHANGELOG.md b/packages/antd-plus/CHANGELOG.md
@@ -1,10 +1,19 @@
 # @orca-fe/painter
 
+## 0.3.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/hooks@1.10.0
+  - @orca-fe/pocket@3.2.6
+
 ## 0.3.4
 
 ### Patch Changes
 
 - Updated dependencies
+  - @orca-fe/hooks@1.9.2
   - @orca-fe/pocket@3.2.5
 
 ## 0.3.3

diff --git a/packages/antd-plus/package.json b/packages/antd-plus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/antd-plus",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Transformer Container",
   "keywords": [
     "react",
@@ -36,9 +36,9 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.9.1",
+    "@orca-fe/hooks": "^1.10.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/pocket": "^3.2.5",
+    "@orca-fe/pocket": "^3.2.6",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @orca-fe/hooks
 
+## 1.10.0
+
+### Minor Changes
+
+- feat: 增加 throwOnError 选项
+
+## 1.9.2
+
+### Patch Changes
+
+- fix: export UseServiceContext
+
 ## 1.9.1
 
 ### Patch Changes

diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/hooks",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "React Hooks Collections",
   "keywords": [
     "react",

diff --git a/packages/hooks/src/index.ts b/packages/hooks/src/index.ts
@@ -12,7 +12,7 @@ import useEffectWithTarget, { useLayoutEffectWithTarget } from './useEffectWithT
 import useStaticClick from './useStaticClick';
 import useNextTick, { useLayoutNextTick } from './useNextTick';
 import usePan from './usePan';
-import useService from './useService';
+import useService, { UseServiceContext } from './useService';
 import useInterval from './useInterval';
 import useHotkeyListener from './useHotkeyListener';
 import HotkeyManager from './hotkey-manager';
@@ -38,6 +38,7 @@ export {
   useLayoutNextTick,
   usePan,
   useService,
+  UseServiceContext,
   useInterval,
   useGetState,
   useMergedRefs,

diff --git a/packages/hooks/src/useService.ts b/packages/hooks/src/useService.ts
@@ -58,6 +58,9 @@ export interface ContextOptions {
 
   /** 如果请求失败，是否维持之前的结果，默认为 true */
   keepSuccessData?: boolean;
+
+  /** 如果請求的結果是 Error 則視為拋出異常。 */
+  throwOnError?: boolean;
 }
 
 export const UseServiceContext = React.createContext<ContextOptions>({});
@@ -138,6 +141,7 @@ export function useService<Args extends any[], ServiceResult = any, Result = Fet
     pollingWhenHidden = false,
     stateMgr,
     onFinish,
+    throwOnError = true,
   } = { ...globalOptions, ...options };
 
   const service = useMemoizedFn(_service);
@@ -190,6 +194,9 @@ export function useService<Args extends any[], ServiceResult = any, Result = Fet
     try {
       const res = await service(...args);
       let formattedData = formatter(res) as Result | undefined;
+      if (throwOnError && formattedData instanceof Error) {
+        throw formattedData;
+      }
       if (keepSuccessData && formattedData == null) {
         formattedData = data;
       }
@@ -218,14 +225,24 @@ export function useService<Args extends any[], ServiceResult = any, Result = Fet
       return formattedData;
     } catch (error: any) {
       console.error(error);
-      _this.loading = false;
-      setState({
-        data: undefined,
-        error,
-        loading: false,
-      });
-      if (typeof onError === 'function') {
-        onError(error, args);
+      if (_this.ticket === ticket) {
+        _this.loading = false;
+        if (keepSuccessData) {
+          setState({
+            error,
+            loading: false,
+          });
+        } else {
+          setState({
+            error,
+            loading: false,
+            data: undefined,
+          });
+        }
+
+        if (typeof onError === 'function') {
+          onError(error, args);
+        }
       }
     }
     return undefined;

diff --git a/packages/painter/CHANGELOG.md b/packages/painter/CHANGELOG.md
@@ -1,11 +1,22 @@
 # @orca-fe/painter
 
+## 1.4.40
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/hooks@1.10.0
+  - @orca-fe/pocket@3.2.6
+  - @orca-fe/transformer@0.3.26
+
 ## 1.4.39
 
 ### Patch Changes
 
 - Updated dependencies
+  - @orca-fe/hooks@1.9.2
   - @orca-fe/pocket@3.2.5
+  - @orca-fe/transformer@0.3.25
 
 ## 1.4.38
 

diff --git a/packages/painter/package.json b/packages/painter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/painter",
-  "version": "1.4.39",
+  "version": "1.4.40",
   "description": "Konva Painter",
   "keywords": [
     "react",
@@ -37,17 +37,17 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.9.1",
+    "@orca-fe/hooks": "^1.10.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/pocket": "^3.2.5",
+    "@orca-fe/pocket": "^3.2.6",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",
     "classnames": "^2.3.2",
     "color": "^4.2.3",
     "react-colorful": "^5.6.1",
     "tslib": "^2.6.0",
-    "@orca-fe/transformer": "^0.3.24"
+    "@orca-fe/transformer": "^0.3.26"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",

diff --git a/packages/pdf-viewer/CHANGELOG.md b/packages/pdf-viewer/CHANGELOG.md
@@ -1,12 +1,22 @@
 # @orca-fe/pdf-viewer
 
+## 1.19.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/hooks@1.10.0
+  - @orca-fe/painter@1.4.40
+  - @orca-fe/pocket@3.2.6
+
 ## 1.19.3
 
 ### Patch Changes
 
 - Updated dependencies
-  - @orca-fe/pocket@3.2.5
+  - @orca-fe/hooks@1.9.2
   - @orca-fe/painter@1.4.39
+  - @orca-fe/pocket@3.2.5
 
 ## 1.19.2
 

diff --git a/packages/pdf-viewer/package.json b/packages/pdf-viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/pdf-viewer",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "description": "PDF Viewer",
   "keywords": [
     "react",
@@ -38,11 +38,11 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.9.1",
+    "@orca-fe/hooks": "^1.10.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/painter": "^1.4.39",
+    "@orca-fe/painter": "^1.4.40",
     "@orca-fe/pdfjs-dist-browserify": "^3.8.24",
-    "@orca-fe/pocket": "^3.2.5",
+    "@orca-fe/pocket": "^3.2.6",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/pocket/CHANGELOG.md b/packages/pocket/CHANGELOG.md
@@ -1,10 +1,18 @@
 # @orca-fe/pocket
 
+## 3.2.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/hooks@1.10.0
+
 ## 3.2.5
 
 ### Patch Changes
 
-- fix: resizable-wrapper add cover to fix iframe event
+- Updated dependencies
+  - @orca-fe/hooks@1.9.2
 
 ## 3.2.4
 

diff --git a/packages/pocket/package.json b/packages/pocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/pocket",
-  "version": "3.2.5",
+  "version": "3.2.6",
   "description": "UI components by orca-team",
   "keywords": [
     "react",
@@ -39,7 +39,7 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.9.1",
+    "@orca-fe/hooks": "^1.10.0",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
     "@orca-fe/tools": "^0.10.0",
     "@rc-component/trigger": "^1.13.3",

diff --git a/packages/transformer/CHANGELOG.md b/packages/transformer/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @orca-fe/painter
 
+## 0.3.26
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/hooks@1.10.0
+
+## 0.3.25
+
+### Patch Changes
+
+- Updated dependencies
+  - @orca-fe/hooks@1.9.2
+
 ## 0.3.24
 
 ### Patch Changes

diff --git a/packages/transformer/package.json b/packages/transformer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/transformer",
-  "version": "0.3.24",
+  "version": "0.3.26",
   "description": "Transformer Container",
   "keywords": [
     "react",
@@ -42,7 +42,7 @@
     "gl-matrix": "^3.4.3",
     "prefix-classnames": "^0.0.7",
     "tslib": "^2.6.0",
-    "@orca-fe/hooks": "^1.9.1",
+    "@orca-fe/hooks": "^1.10.0",
     "@orca-fe/tools": "^0.10.0"
   },
   "peerDependencies": {