diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md
index 14bfa00da..023820c33 100644
--- a/docs/markdown/v2-progress-tracking.md
+++ b/docs/markdown/v2-progress-tracking.md
@@ -23,8 +23,11 @@
### GoodsAction
-- [ ] GoodsActionBigBtn 重命名为 GoodsActionButton
-- [ ] GoodsActionMiniBtn 重命名为 GoodsActionIcon
+- [x] GoodsActionBigBtn 重命名为 GoodsActionButton
+- [x] GoodsActionMiniBtn 重命名为 GoodsActionIcon
+- [x] GoodsActionBigBtn 移除 primary 属性,新增 type 属性
+
+改动原因:规范命名,统一用法
### Step
diff --git a/packages/goods-action-button/index.tsx b/packages/goods-action-button/index.tsx
index 4b198acf9..606f6154e 100644
--- a/packages/goods-action-button/index.tsx
+++ b/packages/goods-action-button/index.tsx
@@ -1,5 +1,5 @@
import { use } from '../utils';
-import Button, { ButtonEvents } from '../button';
+import Button, { ButtonType, ButtonEvents } from '../button';
import { emit, inherit } from '../utils/functional';
import { functionalRoute, routeProps, RouteProps } from '../utils/router';
@@ -9,6 +9,7 @@ import { DefaultSlots } from '../utils/use/sfc';
export type GoodsActionButtonProps = RouteProps & {
text?: string;
+ type?: ButtonType;
primary?: boolean;
loading?: boolean;
disabled?: boolean;
@@ -32,9 +33,9 @@ function GoodsActionButton(
square
class={bem()}
size="large"
+ type={props.type}
loading={props.loading}
disabled={props.disabled}
- type={props.primary ? 'danger' : 'warning'}
onClick={onClick}
{...inherit(ctx)}
>
@@ -45,8 +46,8 @@ function GoodsActionButton(
GoodsActionButton.props = {
...routeProps,
+ type: String,
text: String,
- primary: Boolean,
loading: Boolean,
disabled: Boolean
};
diff --git a/packages/goods-action/demo/index.vue b/packages/goods-action/demo/index.vue
index 3fe2c6d32..595d3dcdb 100644
--- a/packages/goods-action/demo/index.vue
+++ b/packages/goods-action/demo/index.vue
@@ -13,11 +13,12 @@
@click="onClickIcon"
/>