@sheinx/base 3.4.7-beta.2 → 3.4.7-fix.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -98,7 +98,8 @@ var Button = function Button(props) {
98
98
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
99
99
  size: getSpinSize(),
100
100
  jssStyle: jssStyle,
101
- name: "ring"
101
+ name: "ring",
102
+ ignoreConfig: true
102
103
  })
103
104
  });
104
105
  if (renderLoading) {
@@ -108,7 +108,9 @@ var CascaderNode = function CascaderNode(props) {
108
108
  },
109
109
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
110
110
  jssStyle: jssStyle,
111
- size: 10
111
+ size: 10,
112
+ name: "ring",
113
+ ignoreConfig: true
112
114
  })
113
115
  });
114
116
  }
@@ -41,13 +41,13 @@ export interface ImageGroupProps extends Pick<CommonType, 'style' | 'className'>
41
41
  /**
42
42
  * @en The width of the image
43
43
  * @cn 图片宽度
44
- * @default '100%'
44
+ * @default 100%
45
45
  */
46
46
  width?: number | string;
47
47
  /**
48
48
  * @en The height of the image
49
49
  * @cn 图片高度
50
- * @default '100%'
50
+ * @default 100%
51
51
  */
52
52
  height?: number | string;
53
53
  /**
@@ -151,7 +151,9 @@ var Image = function Image(props) {
151
151
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
152
152
  jssStyle: jssStyle,
153
153
  color: "#B3B7C1",
154
- size: 16
154
+ size: 16,
155
+ name: "ring",
156
+ ignoreConfig: true
155
157
  })
156
158
  });
157
159
  };
@@ -1 +1 @@
1
- {"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAgH7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAuH7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
package/cjs/spin/spin.js CHANGED
@@ -27,9 +27,12 @@ var Spin = function Spin() {
27
27
  tipProps = props.tip,
28
28
  tipClassName = props.tipClassName,
29
29
  colorProps = props.color,
30
- modeProps = props.mode;
30
+ modeProps = props.mode,
31
+ _props$ignoreConfig = props.ignoreConfig,
32
+ ignoreConfig = _props$ignoreConfig === void 0 ? false : _props$ignoreConfig;
31
33
  var config = (0, _config.useConfig)();
32
34
  var getSpinName = function getSpinName() {
35
+ if (ignoreConfig) return props.name;
33
36
  var spin = config.spin;
34
37
  if (!spin) return;
35
38
  if (typeof spin === 'string') {
@@ -42,18 +45,21 @@ var Spin = function Spin() {
42
45
  return;
43
46
  };
44
47
  var getSpinTip = function getSpinTip() {
48
+ if (ignoreConfig) return props.tip;
45
49
  var spin = config.spin;
46
50
  if (!spin || _typeof(spin) !== 'object') return;
47
51
  var tip = spin.tip;
48
52
  return tip;
49
53
  };
50
54
  var getSpinColor = function getSpinColor() {
55
+ if (ignoreConfig) return props.color;
51
56
  var spin = config.spin;
52
57
  if (!spin || _typeof(spin) !== 'object') return;
53
58
  var color = spin.color;
54
59
  return color;
55
60
  };
56
61
  var getSpinMode = function getSpinMode() {
62
+ if (ignoreConfig) return props.mode;
57
63
  var spin = config.spin;
58
64
  if (!spin || _typeof(spin) !== 'object') return;
59
65
  var mode = spin.mode;
@@ -100,5 +100,11 @@ export interface SpinProps extends Pick<CommonType, 'className' | 'style'> {
100
100
  * @default false
101
101
  */
102
102
  loading?: boolean;
103
+ /**
104
+ * @en
105
+ * @cn 内部属性,是否忽略全局配置
106
+ * @default false
107
+ */
108
+ ignoreConfig?: boolean;
103
109
  }
104
110
  //# sourceMappingURL=spin.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"spin.type.d.ts","sourceRoot":"","sources":["spin.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spin.type.d.ts","sourceRoot":"","sources":["spin.type.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"transfer-list.d.ts","sourceRoot":"","sources":["transfer-list.tsx"],"names":[],"mappings":";AACA,OAAO,EAAQ,YAAY,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,QAAA,MAAM,YAAY,oGAsMjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"transfer-list.d.ts","sourceRoot":"","sources":["transfer-list.tsx"],"names":[],"mappings":";AACA,OAAO,EAAQ,YAAY,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,QAAA,MAAM,YAAY,oGA6MjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -63,7 +63,7 @@ var TransferList = function TransferList(props) {
63
63
  var listClass = (0, _classnames.default)(styles.list, listClassName);
64
64
  var getLineHeight = function getLineHeight() {
65
65
  if (lineHeightProp) {
66
- console.log('lineHeightProp', lineHeightProp);
66
+ // console.log('lineHeightProp', lineHeightProp);
67
67
  return lineHeightProp;
68
68
  }
69
69
  if (size === 'small') {
@@ -205,6 +205,8 @@ var TransferList = function TransferList(props) {
205
205
  jssStyle: jssStyle,
206
206
  loading: loading,
207
207
  size: 24,
208
+ name: "ring",
209
+ ignoreConfig: true,
208
210
  children: [onFilter && renderFilter(), renderList(), renderFooter()]
209
211
  })]
210
212
  });
@@ -101,7 +101,9 @@ var NodeContent = function NodeContent(props) {
101
101
  dir: config.direction,
102
102
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
103
103
  size: 12,
104
- jssStyle: jssStyle
104
+ jssStyle: jssStyle,
105
+ ignoreConfig: true,
106
+ name: "ring"
105
107
  })
106
108
  });
107
109
  };
@@ -82,7 +82,9 @@ var UploadButton = function UploadButton(props) {
82
82
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
83
83
  jssStyle: props.jssStyle,
84
84
  size: 10,
85
- color: color
85
+ color: color,
86
+ ignoreConfig: true,
87
+ name: "ring"
86
88
  })
87
89
  }), typeof loading === 'string' ? loading : placeholder]
88
90
  });
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBAuKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBAwKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -67,7 +67,8 @@ var Result = function Result(props) {
67
67
  children: [status === 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
68
68
  jssStyle: props.jssStyle,
69
69
  size: 10,
70
- name: 'ring'
70
+ name: 'ring',
71
+ ignoreConfig: true
71
72
  }), status === 2 && _icons.default.upload.Success, status === 3 && _icons.default.upload.Warning]
72
73
  }), status === 1 && props.process !== -1 && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
73
74
  children: [Math.min(99, Math.floor(props.process || 0)), "%"]
@@ -120,6 +121,7 @@ var Result = function Result(props) {
120
121
  size: 'null',
121
122
  jssStyle: props.jssStyle,
122
123
  name: 'ring',
124
+ ignoreConfig: true,
123
125
  className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
124
126
  }), (status === 2 || status === -1) && src && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
125
127
  className: (0, _classnames.default)(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon),
@@ -90,7 +90,8 @@ var Button = function Button(props) {
90
90
  children: /*#__PURE__*/_jsx(Spin, {
91
91
  size: getSpinSize(),
92
92
  jssStyle: jssStyle,
93
- name: "ring"
93
+ name: "ring",
94
+ ignoreConfig: true
94
95
  })
95
96
  });
96
97
  if (renderLoading) {
@@ -102,7 +102,9 @@ var CascaderNode = function CascaderNode(props) {
102
102
  },
103
103
  children: /*#__PURE__*/_jsx(Spin, {
104
104
  jssStyle: jssStyle,
105
- size: 10
105
+ size: 10,
106
+ name: "ring",
107
+ ignoreConfig: true
106
108
  })
107
109
  });
108
110
  }
@@ -41,13 +41,13 @@ export interface ImageGroupProps extends Pick<CommonType, 'style' | 'className'>
41
41
  /**
42
42
  * @en The width of the image
43
43
  * @cn 图片宽度
44
- * @default '100%'
44
+ * @default 100%
45
45
  */
46
46
  width?: number | string;
47
47
  /**
48
48
  * @en The height of the image
49
49
  * @cn 图片高度
50
- * @default '100%'
50
+ * @default 100%
51
51
  */
52
52
  height?: number | string;
53
53
  /**
@@ -143,7 +143,9 @@ var Image = function Image(props) {
143
143
  children: /*#__PURE__*/_jsx(Spin, {
144
144
  jssStyle: jssStyle,
145
145
  color: "#B3B7C1",
146
- size: 16
146
+ size: 16,
147
+ name: "ring",
148
+ ignoreConfig: true
147
149
  })
148
150
  });
149
151
  };
@@ -1 +1 @@
1
- {"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAgH7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAuH7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
package/esm/spin/spin.js CHANGED
@@ -21,9 +21,12 @@ var Spin = function Spin() {
21
21
  tipProps = props.tip,
22
22
  tipClassName = props.tipClassName,
23
23
  colorProps = props.color,
24
- modeProps = props.mode;
24
+ modeProps = props.mode,
25
+ _props$ignoreConfig = props.ignoreConfig,
26
+ ignoreConfig = _props$ignoreConfig === void 0 ? false : _props$ignoreConfig;
25
27
  var config = useConfig();
26
28
  var getSpinName = function getSpinName() {
29
+ if (ignoreConfig) return props.name;
27
30
  var spin = config.spin;
28
31
  if (!spin) return;
29
32
  if (typeof spin === 'string') {
@@ -36,18 +39,21 @@ var Spin = function Spin() {
36
39
  return;
37
40
  };
38
41
  var getSpinTip = function getSpinTip() {
42
+ if (ignoreConfig) return props.tip;
39
43
  var spin = config.spin;
40
44
  if (!spin || _typeof(spin) !== 'object') return;
41
45
  var tip = spin.tip;
42
46
  return tip;
43
47
  };
44
48
  var getSpinColor = function getSpinColor() {
49
+ if (ignoreConfig) return props.color;
45
50
  var spin = config.spin;
46
51
  if (!spin || _typeof(spin) !== 'object') return;
47
52
  var color = spin.color;
48
53
  return color;
49
54
  };
50
55
  var getSpinMode = function getSpinMode() {
56
+ if (ignoreConfig) return props.mode;
51
57
  var spin = config.spin;
52
58
  if (!spin || _typeof(spin) !== 'object') return;
53
59
  var mode = spin.mode;
@@ -100,5 +100,11 @@ export interface SpinProps extends Pick<CommonType, 'className' | 'style'> {
100
100
  * @default false
101
101
  */
102
102
  loading?: boolean;
103
+ /**
104
+ * @en
105
+ * @cn 内部属性,是否忽略全局配置
106
+ * @default false
107
+ */
108
+ ignoreConfig?: boolean;
103
109
  }
104
110
  //# sourceMappingURL=spin.type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"spin.type.d.ts","sourceRoot":"","sources":["spin.type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spin.type.d.ts","sourceRoot":"","sources":["spin.type.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"transfer-list.d.ts","sourceRoot":"","sources":["transfer-list.tsx"],"names":[],"mappings":";AACA,OAAO,EAAQ,YAAY,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,QAAA,MAAM,YAAY,oGAsMjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"transfer-list.d.ts","sourceRoot":"","sources":["transfer-list.tsx"],"names":[],"mappings":";AACA,OAAO,EAAQ,YAAY,EAAE,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,QAAA,MAAM,YAAY,oGA6MjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -57,7 +57,7 @@ var TransferList = function TransferList(props) {
57
57
  var listClass = classNames(styles.list, listClassName);
58
58
  var getLineHeight = function getLineHeight() {
59
59
  if (lineHeightProp) {
60
- console.log('lineHeightProp', lineHeightProp);
60
+ // console.log('lineHeightProp', lineHeightProp);
61
61
  return lineHeightProp;
62
62
  }
63
63
  if (size === 'small') {
@@ -199,6 +199,8 @@ var TransferList = function TransferList(props) {
199
199
  jssStyle: jssStyle,
200
200
  loading: loading,
201
201
  size: 24,
202
+ name: "ring",
203
+ ignoreConfig: true,
202
204
  children: [onFilter && renderFilter(), renderList(), renderFooter()]
203
205
  })]
204
206
  });
@@ -95,7 +95,9 @@ var NodeContent = function NodeContent(props) {
95
95
  dir: config.direction,
96
96
  children: /*#__PURE__*/_jsx(Spin, {
97
97
  size: 12,
98
- jssStyle: jssStyle
98
+ jssStyle: jssStyle,
99
+ ignoreConfig: true,
100
+ name: "ring"
99
101
  })
100
102
  });
101
103
  };
@@ -74,7 +74,9 @@ var UploadButton = function UploadButton(props) {
74
74
  children: /*#__PURE__*/_jsx(Spin, {
75
75
  jssStyle: props.jssStyle,
76
76
  size: 10,
77
- color: color
77
+ color: color,
78
+ ignoreConfig: true,
79
+ name: "ring"
78
80
  })
79
81
  }), typeof loading === 'string' ? loading : placeholder]
80
82
  });
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBAuKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,gBAwKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -60,7 +60,8 @@ var Result = function Result(props) {
60
60
  children: [status === 1 && /*#__PURE__*/_jsx(Spin, {
61
61
  jssStyle: props.jssStyle,
62
62
  size: 10,
63
- name: 'ring'
63
+ name: 'ring',
64
+ ignoreConfig: true
64
65
  }), status === 2 && icons.upload.Success, status === 3 && icons.upload.Warning]
65
66
  }), status === 1 && props.process !== -1 && /*#__PURE__*/_jsxs("div", {
66
67
  children: [Math.min(99, Math.floor(props.process || 0)), "%"]
@@ -113,6 +114,7 @@ var Result = function Result(props) {
113
114
  size: 'null',
114
115
  jssStyle: props.jssStyle,
115
116
  name: 'ring',
117
+ ignoreConfig: true,
116
118
  className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
117
119
  }), (status === 2 || status === -1) && src && /*#__PURE__*/_jsx("div", {
118
120
  className: classNames(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.4.7-beta.2",
3
+ "version": "3.4.7-fix.1",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",
@@ -10,7 +10,7 @@
10
10
  "module": "./esm/index.js",
11
11
  "typings": "./cjs/index.d.ts",
12
12
  "dependencies": {
13
- "@sheinx/hooks": "3.4.7-beta.2",
13
+ "@sheinx/hooks": "3.4.7-fix.1",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"