From 1bbee5bdfbb891bc43f107997b592814ae57672f Mon Sep 17 00:00:00 2001
From: 2betop <2betop.cn@gmail.com>
Date: Fri, 29 May 2020 18:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E8=81=94=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scss/components/_spinner.scss           | 14 ++++++++++
 scss/components/form/_checks.scss       | 28 ++++++++++++++++++--
 src/components/AssociatedCheckboxes.tsx | 34 ++++++++++++++++++++++---
 src/components/icons.tsx                |  4 +++
 src/icons/reload.svg                    |  6 +++++
 src/renderers/Form/Options.tsx          | 16 ++++++++++--
 src/store/formItem.ts                   | 32 ++++++++++++++++-------
 7 files changed, 117 insertions(+), 17 deletions(-)
 create mode 100644 src/icons/reload.svg

diff --git a/scss/components/_spinner.scss b/scss/components/_spinner.scss
index 0a01c238b..7c098c6f0 100644
--- a/scss/components/_spinner.scss
+++ b/scss/components/_spinner.scss
@@ -8,6 +8,20 @@
   }
 }
 
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(1turn);
+  }
+}
+
+.is-spin {
+  animation: spin 2s linear infinite;
+}
+
 .#{$ns}Spinner-overlay {
   position: absolute;
   z-index: 10;
diff --git a/scss/components/form/_checks.scss b/scss/components/form/_checks.scss
index 236075150..5c19b3e65 100644
--- a/scss/components/form/_checks.scss
+++ b/scss/components/form/_checks.scss
@@ -563,7 +563,31 @@
     border-right: 1px solid $borderColor;
   }
 
-  &-placeholder {
-    @include checkboxes-placeholder();
+  &-reload {
+    text-align: center;
+    color: $info;
+    margin: 20px 0 0;
+
+    &.is-clickable {
+      cursor: pointer;
+    }
+  }
+
+  &-box {
+    line-height: $Form-input-lineHeight;
+    font-size: $fontSizeSm;
+    color: $text--muted-color;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+
+    > p {
+      text-align: center;
+      margin: 10px 0 20px;
+      color: $text--muted-color;
+    }
   }
 }
diff --git a/src/components/AssociatedCheckboxes.tsx b/src/components/AssociatedCheckboxes.tsx
index 97d050ba3..cfb524efd 100644
--- a/src/components/AssociatedCheckboxes.tsx
+++ b/src/components/AssociatedCheckboxes.tsx
@@ -18,6 +18,7 @@ import TreeCheckboxes from './TreeCheckboxes';
 import ChainedCheckboxes from './ChainedCheckboxes';
 import Spinner from './Spinner';
 import TreeRadios from './TreeRadios';
+import {Icon} from './icons';
 
 export interface AssociatedCheckboxesProps extends CheckboxesProps {
   leftOptions: Options;
@@ -87,6 +88,11 @@ export class AssociatedCheckboxes extends Checkboxes<
     }
   }
 
+  handleRetry(option: Option) {
+    const {onDeferLoad} = this.props;
+    onDeferLoad?.(option);
+  }
+
   render() {
     const {
       classnames: cx,
@@ -132,8 +138,28 @@ export class AssociatedCheckboxes extends Checkboxes<
         <div className={cx('AssociatedCheckboxes-right')}>
           {this.state.leftValue ? (
             selectdOption ? (
-              selectdOption.defer && selectdOption.loading ? (
-                <Spinner size="sm" show />
+              selectdOption.defer && !selectdOption.loaded ? (
+                <div className={cx('AssociatedCheckboxes-box')}>
+                  <div
+                    className={cx(
+                      'AssociatedCheckboxes-reload',
+                      selectdOption.loading ? 'is-spin' : 'is-clickable'
+                    )}
+                    onClick={
+                      selectdOption.loading
+                        ? undefined
+                        : this.handleRetry.bind(this, selectdOption)
+                    }
+                  >
+                    <Icon icon="reload" />
+                  </div>
+
+                  {selectdOption.loading ? (
+                    <p>加载中</p>
+                  ) : (
+                    <p>点击刷新重新加载</p>
+                  )}
+                </div>
               ) : rightMode === 'table' ? (
                 <TableCheckboxes
                   columns={columns!}
@@ -166,12 +192,12 @@ export class AssociatedCheckboxes extends Checkboxes<
                 />
               )
             ) : (
-              <div className={cx('AssociatedCheckboxes-placeholder')}>
+              <div className={cx('AssociatedCheckboxes-box')}>
                 配置错误，选项无法与左侧选项对应
               </div>
             )
           ) : (
-            <div className={cx('AssociatedCheckboxes-placeholder')}>
+            <div className={cx('AssociatedCheckboxes-box')}>
               请先选择左侧数据
             </div>
           )}
diff --git a/src/components/icons.tsx b/src/components/icons.tsx
index 9b531be26..523441ba7 100644
--- a/src/components/icons.tsx
+++ b/src/components/icons.tsx
@@ -66,6 +66,9 @@ import LocationIcon from '../icons/location.svg';
 // @ts-ignore
 import ComboDraggerIcon from '../icons/combo-dragger.svg';
 
+// @ts-ignore
+import ReloadIcon from '../icons/reload.svg';
+
 // 兼容原来的用法，后续不直接试用。
 // @ts-ignore
 export const closeIcon = <CloseIcon />;
@@ -129,6 +132,7 @@ registerIcon('move', MoveIcon);
 registerIcon('info', InfoIcon);
 registerIcon('location', LocationIcon);
 registerIcon('combo-dragger', ComboDraggerIcon);
+registerIcon('reload', ReloadIcon);
 
 export function Icon({
   icon,
diff --git a/src/icons/reload.svg b/src/icons/reload.svg
new file mode 100644
index 000000000..e4f1780a7
--- /dev/null
+++ b/src/icons/reload.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" version="1.1">
+	<g fill="currentColor" fill-rule="nonzero">
+		<path d="M8.05031447,14.0555556 C5.93710692,14.0555556 4.02515723,12.9861111 2.91823899,11.2361111 L5.03144654,9.19444444 L0,9.19444444 L0,14.0555556 L1.40880503,12.6944444 C2.91823899,14.7361111 5.33333333,16 8.05031447,16 C12.0754717,16 15.4968553,13.1805556 16,9.29166667 L13.9874214,9 C13.5849057,11.9166667 11.0691824,14.0555556 8.05031447,14.0555556 Z M14.591195,3.30555556 C13.081761,1.26388889 10.6666667,0 7.94968553,0 C3.9245283,0 0.503144654,2.81944444 0,6.70833333 L2.01257862,7 C2.41509434,4.08333333 4.93081761,1.94444444 7.94968553,1.94444444 C10.0628931,1.94444444 11.9748428,3.01388889 13.081761,4.76388889 L10.9685535,6.80555556 L16,6.80555556 L16,1.94444444 L14.591195,3.30555556 Z" id="Shape">
+		</path>
+	</g>
+</svg>
diff --git a/src/renderers/Form/Options.tsx b/src/renderers/Form/Options.tsx
index 6271876b0..7625f8409 100644
--- a/src/renderers/Form/Options.tsx
+++ b/src/renderers/Form/Options.tsx
@@ -61,7 +61,7 @@ export interface OptionsControlProps extends FormControlProps, OptionProps {
   selectedOptions: Array<Option>;
   setOptions: (value: Array<any>, skipNormalize?: boolean) => void;
   setLoading: (value: boolean) => void;
-  reloadOptions: () => void;
+  reloadOptions: (setError?: boolean) => void;
   deferLoad: (option: Option) => void;
   creatable?: boolean;
   onAdd?: (
@@ -435,6 +435,11 @@ export function registerOptionsControl(config: OptionsConfig) {
     // 当有 action 触发，如果指定了 reload 目标组件，有可能会来到这里面来
     @autobind
     reload() {
+      this.reloadOptions();
+    }
+
+    @autobind
+    reloadOptions(setError?: boolean) {
       const {source, formItem, data, onChange} = this.props;
 
       if (formItem && isPureVariable(source as string)) {
@@ -448,7 +453,14 @@ export function registerOptionsControl(config: OptionsConfig) {
         return;
       }
 
-      return formItem.loadOptions(source, data, undefined, false, onChange);
+      return formItem.loadOptions(
+        source,
+        data,
+        undefined,
+        false,
+        onChange,
+        setError
+      );
     }
 
     @autobind
diff --git a/src/store/formItem.ts b/src/store/formItem.ts
index d10c88746..ef3c39805 100644
--- a/src/store/formItem.ts
+++ b/src/store/formItem.ts
@@ -354,11 +354,13 @@ export const FormItemStore = types
     const fetchOptions: (
       api: Api,
       data?: object,
-      config?: fetchOptions
+      config?: fetchOptions,
+      setErrorFlag?: boolean
     ) => Promise<Payload | null> = flow(function* getInitData(
       api: string,
       data: object,
-      config?: fetchOptions
+      config?: fetchOptions,
+      setErrorFlag?: boolean
     ) {
       try {
         if (loadCancel) {
@@ -382,9 +384,12 @@ export const FormItemStore = types
         let result: any = null;
 
         if (!json.ok) {
-          setError(
-            `加载选项失败，原因：${json.msg || (config && config.errorMessage)}`
-          );
+          setErrorFlag !== false &&
+            setError(
+              `加载选项失败，原因：${
+                json.msg || (config && config.errorMessage)
+              }`
+            );
           (getRoot(self) as IRendererStore).notify(
             'error',
             self.errors.join(''),
@@ -426,7 +431,8 @@ export const FormItemStore = types
       data?: object,
       config?: fetchOptions,
       clearValue?: boolean,
-      onChange?: (value: any) => void
+      onChange?: (value: any) => void,
+      setErrorFlag?: boolean
     ) => Promise<Payload | null> = flow(function* getInitData(
       api: string,
       data: object,
@@ -436,9 +442,10 @@ export const FormItemStore = types
         value: any,
         submitOnChange: boolean,
         changeImmediately: boolean
-      ) => void
+      ) => void,
+      setErrorFlag?: boolean
     ) {
-      let json = yield fetchOptions(api, data, config);
+      let json = yield fetchOptions(api, data, config, setErrorFlag);
       if (!json) {
         return;
       }
@@ -490,8 +497,15 @@ export const FormItemStore = types
         })
       );
 
-      let json = yield fetchOptions(api, data, config);
+      let json = yield fetchOptions(api, data, config, false);
       if (!json) {
+        setOptions(
+          spliceTree(self.options, indexes, 1, {
+            ...option,
+            loading: false,
+            error: true
+          })
+        );
         return;
       }