diff --git a/src/renderers/CRUD.tsx b/src/renderers/CRUD.tsx
index 6d6416799..e02051b64 100644
--- a/src/renderers/CRUD.tsx
+++ b/src/renderers/CRUD.tsx
@@ -1057,7 +1057,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
               (!stopAutoRefreshWhen ||
                 !(
                   (stopAutoRefreshWhenModalIsOpen && store.hasModalOpened) ||
-                  evalExpression(stopAutoRefreshWhen, data)
+                  evalExpression(stopAutoRefreshWhen, createObject(store.data, store.query))
                 )) &&
               (this.timer = setTimeout(
                 silentPolling
diff --git a/src/renderers/Form/ButtonGroupSelect.tsx b/src/renderers/Form/ButtonGroupSelect.tsx
index c48d6cc20..f3fd92ebd 100644
--- a/src/renderers/Form/ButtonGroupSelect.tsx
+++ b/src/renderers/Form/ButtonGroupSelect.tsx
@@ -108,6 +108,9 @@ export default class ButtonGroupControl extends React.Component<
             className: cx(option.className, btnClassName),
             disabled: option.disabled || disabled,
             onClick: (e: React.UIEvent<any>) => {
+              if (disabled) {
+                return;
+              }
               this.handleToggle(option);
               e.preventDefault(); // 禁止 onAction 触发
             }