shineout 3.4.7-beta.1 → 3.4.7-beta.3

package/cjs/index.js

@@ -492,5 +492,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.4.7-beta.1'
+  version: '3.4.7-beta.3'
 };

package/dist/shineout.js

@@ -11984,7 +11984,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.4.7-beta.1');
+/* harmony default export */ var version = ('3.4.7-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -31064,9 +31064,12 @@ var spin_Spin = function Spin() {
     tipProps = props.tip,
     tipClassName = props.tipClassName,
     colorProps = props.color,
-    modeProps = props.mode;
+    modeProps = props.mode,
+    _props$ignoreConfig = props.ignoreConfig,
+    ignoreConfig = _props$ignoreConfig === void 0 ? false : _props$ignoreConfig;
   var config = useConfig();
   var getSpinName = function getSpinName() {
+    if (ignoreConfig) return props.name;
     var spin = config.spin;
     if (!spin) return;
     if (typeof spin === 'string') {
@@ -31079,18 +31082,21 @@ var spin_Spin = function Spin() {
     return;
   };
   var getSpinTip = function getSpinTip() {
+    if (ignoreConfig) return props.tip;
     var spin = config.spin;
     if (!spin || typeof_default()(spin) !== 'object') return;
     var tip = spin.tip;
     return tip;
   };
   var getSpinColor = function getSpinColor() {
+    if (ignoreConfig) return props.color;
     var spin = config.spin;
     if (!spin || typeof_default()(spin) !== 'object') return;
     var color = spin.color;
     return color;
   };
   var getSpinMode = function getSpinMode() {
+    if (ignoreConfig) return props.mode;
     var spin = config.spin;
     if (!spin || typeof_default()(spin) !== 'object') return;
     var mode = spin.mode;
@@ -31236,7 +31242,8 @@ var Button = function Button(props) {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
       size: getSpinSize(),
       jssStyle: jssStyle,
-      name: "ring"
+      name: "ring",
+      ignoreConfig: true
     })
   });
   if (renderLoading) {
@@ -36562,7 +36569,9 @@ var CascaderNode = function CascaderNode(props) {
         },
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
           jssStyle: jssStyle,
-          size: 10
+          size: 10,
+          name: "ring",
+          ignoreConfig: true
         })
       });
     }
@@ -37788,7 +37797,28 @@ var result_Result = function Result(props) {
       var _result2 = getDataByValues(value);
       if (_result2.length > 0) {
         var inputTmpText = renderResultContent(_result2[0]);
-        inputTmpText && props.setInputText(inputTmpText);
+        if (inputTmpText) {
+          // 提取result文本
+          var getTextFromReactElement = function getTextFromReactElement(element) {
+            if (!element) return '';
+            // 如果是字符串或数字，直接返回
+            if (typeof element === 'string' || typeof element === 'number') return String(element);
+            // 如果是 React Element，处理的是renderResult返回的是React Element的场景
+            if ( /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(element)) {
+              var _element$props;
+              var children = (_element$props = element.props) === null || _element$props === void 0 ? void 0 : _element$props.children;
+              if (Array.isArray(children)) {
+                return children.map(function (child) {
+                  return getTextFromReactElement(child);
+                }).join('');
+              }
+              return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(children) ? getTextFromReactElement(children) : String(children || '');
+            }
+            return '';
+          };
+          var textContent = getTextFromReactElement(inputTmpText);
+          props.setInputText(textContent);
+        }
       }
       setTimeout(function () {
         var _inputRef$current;
@@ -48386,7 +48416,9 @@ var Image = function Image(props) {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
         jssStyle: jssStyle,
         color: "#B3B7C1",
-        size: 16
+        size: 16,
+        name: "ring",
+        ignoreConfig: true
       })
     });
   };
@@ -50141,7 +50173,9 @@ var NodeContent = function NodeContent(props) {
       dir: config.direction,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
         size: 12,
-        jssStyle: jssStyle
+        jssStyle: jssStyle,
+        ignoreConfig: true,
+        name: "ring"
       })
     });
   };
@@ -60911,6 +60945,8 @@ var TransferList = function TransferList(props) {
       jssStyle: jssStyle,
       loading: loading,
       size: 24,
+      name: "ring",
+      ignoreConfig: true,
       children: [onFilter && renderFilter(), renderList(), renderFooter()]
     })]
   });
@@ -62534,7 +62570,8 @@ var upload_result_Result = function Result(props) {
             children: [status === 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
               jssStyle: props.jssStyle,
               size: 10,
-              name: 'ring'
+              name: 'ring',
+              ignoreConfig: true
             }), status === 2 && icons_config.upload.Success, status === 3 && icons_config.upload.Warning]
           }), status === 1 && props.process !== -1 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
             children: [Math.min(99, Math.floor(props.process || 0)), "%"]
@@ -62587,6 +62624,7 @@ var upload_result_Result = function Result(props) {
             size: 'null',
             jssStyle: props.jssStyle,
             name: 'ring',
+            ignoreConfig: true,
             className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
           }), (status === 2 || status === -1) && src && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: classnames_default()(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon),
@@ -63034,7 +63072,9 @@ var UploadButton = function UploadButton(props) {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
           jssStyle: props.jssStyle,
           size: 10,
-          color: color
+          color: color,
+          ignoreConfig: true,
+          name: "ring"
         })
       }), typeof loading === 'string' ? loading : placeholder]
     });
@@ -65423,7 +65463,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.7-beta.1'
+  version: '3.4.7-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;