shineout 3.0.0-alpha.23 → 3.0.0-alpha.24

package/cjs/index.js

@@ -456,6 +456,6 @@ exports.TYPE = _TYPE;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = {
-  version: '3.0.0-alpha.23'
+  version: '3.0.0-alpha.24'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -19105,7 +19105,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.0.0-alpha.23');
+/* harmony default export */ var version = ('3.0.0-alpha.24');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -39423,7 +39423,6 @@ var result_Result = function Result(props) {
   };
   var renderSingleResult = function renderSingleResult() {
     if (isEmptyResult()) return renderNbsp();
-    // const values = [value];
     var result = getDataByValues(value);
     var content = renderResultContent(result[0]);
     return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -39450,7 +39449,7 @@ var result_Result = function Result(props) {
     });
     return result;
   };
-  var renderMultipleResultMore = function renderMultipleResultMore() {
+  var renderMultipleResultMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     var result = renderMultipleResult();
     var moreNumber = getCompressedBound();
     return /*#__PURE__*/(0,jsx_runtime.jsx)(result_more, {
@@ -39463,11 +39462,11 @@ var result_Result = function Result(props) {
       compressedClassName: compressedClassName,
       showNum: moreNumber
     }, 'more');
-  };
+  }, [value, more]);
   var renderResult = function renderResult() {
     var result = [];
     if (multiple) {
-      result.push(compressed ? renderMultipleResultMore() : renderMultipleResult());
+      result.push(compressed ? renderMultipleResultMore : renderMultipleResult());
       if (showInput) {
         result.push(renderInput());
       } else if (result.length === 0) {
@@ -39485,14 +39484,13 @@ var result_Result = function Result(props) {
   var handleResetMore = function handleResetMore() {
     if (!compressed) return;
     shouldResetMore.current = true;
-    setMore(-1);
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!multiple && showInput && valueProp) {
       var result = getDataByValues(value);
       // 获取合法的 content
       var content = renderResultContent(result[0]);
-      // 仅在关闭下拉框时，将输入框的值设置为合法的s选中的值
+      // 仅在关闭下拉框时，将输入框的值设置为合法的选中的值
       if (!result_isEmpty(content)) {
         setInputText(content);
       }
@@ -40114,7 +40112,7 @@ var Cascader = function Cascader(props0) {
     children: [tipNode, renderResult(), renderIcon(), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
       adjust: true,
       focus: open,
-      fixedWidth: "min",
+      fixedWidth: false,
       absolute: absolute,
       zIndex: zIndex,
       position: position,
@@ -40171,13 +40169,25 @@ var FormItemContext = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_
   updateError: function updateError() {}
 });
 ;// CONCATENATED MODULE: ../hooks/src/components/use-form/use-form-fieldset/fieldset-context.ts
-"use client";
+'use client';
 
 
 
 var FieldsetContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)({
   path: ''
 });
+function extendName() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var name = arguments.length > 1 ? arguments[1] : undefined;
+  if (name === undefined) return undefined;
+  if (name === '') return path;
+  if (Array.isArray(name)) {
+    return name.map(function (n) {
+      return extendName(path, n);
+    });
+  }
+  return "".concat(path).concat(path.length > 0 ? '.' : '').concat(name);
+}
 var useFieldSetConsumer = function useFieldSetConsumer(props) {
   var _React$useContext = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useContext(FieldsetContext),
     path = _React$useContext.path;
@@ -40185,12 +40195,7 @@ var useFieldSetConsumer = function useFieldSetConsumer(props) {
     return path ? (props.bind || []).concat(path) : props.bind;
   }, [path, props.bind]);
   var name = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useMemo(function () {
-    if (Array.isArray(props.name)) {
-      return props.name.map(function (item) {
-        return path ? "".concat(path, ".").concat(item) : item;
-      });
-    }
-    return path ? "".concat(path, ".").concat(props.name) : props.name;
+    return extendName(path, props.name);
   }, [path, props.name]);
   return objectSpread2_default()(objectSpread2_default()({}, props), {}, {
     name: name,
@@ -40711,7 +40716,8 @@ function useFormControl(props) {
     onChange: onChange,
     error: error,
     inForm: inForm,
-    disabled: disabled
+    disabled: disabled,
+    name: name
   };
 }
 ;// CONCATENATED MODULE: ../base/src/form/form-field.tsx
@@ -47708,26 +47714,23 @@ var form_item_jssStyle = {
 
 
 var emptyFunc = function emptyFunc() {};
+var emptyArr = [];
 var useFormFieldSet = function useFormFieldSet(props) {
-  var _useFieldSetConsumer = useFieldSetConsumer({
-      name: props.name
-    }),
-    name = _useFieldSetConsumer.name,
-    bind = _useFieldSetConsumer.bind;
   var _useFormControl = useFormControl({
-      name: name,
+      name: props.name,
       defaultValue: props.defaultValue,
       reserveAble: props.reserveAble,
       rules: props.rules,
       onError: props.onError,
-      bind: bind,
+      bind: emptyArr,
       onChange: emptyFunc,
       getValidateProps: props.getValidateProps
     }),
     inForm = _useFormControl.inForm,
     error = _useFormControl.error,
     value = _useFormControl.value,
-    onChange = _useFormControl.onChange;
+    onChange = _useFormControl.onChange,
+    name = _useFormControl.name;
   if (!inForm) {
     console.error('[FieldSet] should render in Form');
   }
@@ -52149,7 +52152,7 @@ function Select(props0) {
 
   // innerTitle 模式
   var renderInnerTitle = use_inner_title({
-    open: open || !!value,
+    open: open || !isEmpty,
     size: size,
     jssStyle: jssStyle,
     innerTitle: innerTitle
@@ -52183,7 +52186,7 @@ function Select(props0) {
       children: defaultIcon
     });
   };
-  var renderResult = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+  var renderResult = function renderResult() {
     var result = /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.result),
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(select_result, {
@@ -52229,7 +52232,7 @@ function Select(props0) {
       onClick: handleResultClick,
       children: renderInnerTitle(result)
     });
-  }, [value]);
+  };
   var renderList = function renderList() {
     var listProps = {
       data: groupBy ? groupData : filterData,
@@ -52348,7 +52351,7 @@ function Select(props0) {
     onKeyUp: handleKeyUp,
     onBlur: handleBlur,
     onFocus: handleFocus,
-    children: [tipNode, renderResult, renderIcon(), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
+    children: [tipNode, renderResult(), renderIcon(), /*#__PURE__*/(0,jsx_runtime.jsx)(absolute_list, {
       adjust: true,
       focus: open,
       fixedWidth: autoAdapt ? 'min' : true,
@@ -58545,7 +58548,7 @@ var table_excluded = ["data"];
 
 
 
-var emptyArr = [];
+var table_emptyArr = [];
 var virtualScrollerStyle = {
   flex: 1,
   minWidth: 0,
@@ -58584,10 +58587,10 @@ var scrollWrapperStyle = {
     beforeChange: undefined
   });
   var getSelectData = function getSelectData() {
-    var checkboxColumn = (props.columns || emptyArr).find(function (item) {
+    var checkboxColumn = (props.columns || table_emptyArr).find(function (item) {
       return item.type === 'checkbox';
     });
-    var selectData = props.data || emptyArr;
+    var selectData = props.data || table_emptyArr;
     if (checkboxColumn) {
       if (typeof checkboxColumn.filterAll === 'function') {
         selectData = checkboxColumn.filterAll(selectData);
@@ -58679,7 +58682,7 @@ var scrollWrapperStyle = {
     isEmptyTree = _useTableTree.isEmptyTree,
     treeExpandLevel = _useTableTree.treeExpandLevel;
   var virtualInfo = use_table_virtual({
-    data: virtual ? treeData : emptyArr,
+    data: virtual ? treeData : table_emptyArr,
     rowsInView: props.rowsInView || 20,
     rowHeight: props.rowHeight || 40,
     scrollRef: scrollRef,
@@ -64941,7 +64944,7 @@ var upload_interface = __webpack_require__(7818);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.0-alpha.23'
+  version: '3.0.0-alpha.24'
 });
 }();
 /******/ 	return __webpack_exports__;