shineout 3.4.4-beta.8 → 3.4.4-fix.1

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.4-beta.8'
+  version: '3.4.4-fix.1'
 };

package/cjs/list/list.js

@@ -23,7 +23,8 @@ var jssStyle = {
   checkbox: _shineoutStyle.useCheckboxStyle,
   empty: _shineoutStyle.useEmptyStyle,
   spin: _shineoutStyle.useSpinStyle,
-  image: _shineoutStyle.useImageStyle
+  image: _shineoutStyle.useImageStyle,
+  select: _shineoutStyle.useSelectStyle
 };
 var _default = exports.default = function _default(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.List, _objectSpread({

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.4-beta.8');
+/* harmony default export */ var version = ('3.4.4-fix.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -19112,16 +19112,16 @@ var ImageStyle = objectSpread2_default()(objectSpread2_default()({}, animation),
   },
   circle: {
     borderRadius: src.imageCircleBorderRadius,
-    border: "1px solid ".concat(src.imageBorderColor)
+    outline: "1px solid ".concat(src.imageBorderColor)
   },
   rounded: {
     borderRadius: src.imageBorderRadius,
-    border: "1px solid ".concat(src.imageBorderColor)
+    outline: "1px solid ".concat(src.imageBorderColor)
   },
   thumbnail: {
     borderRadius: src.imageBorderRadius,
     backgroundColor: '#FFFFFF',
-    border: "1px solid ".concat(src.imageBorderColor),
+    outline: "1px solid ".concat(src.imageBorderColor),
     '& $inner': {
       top: 4,
       left: 4,
@@ -19911,6 +19911,9 @@ var listStyle = {
     border: "".concat(src.listBorderWidth, " solid ").concat(src.listBorderColor),
     borderRadius: src.listBorderRadius
   },
+  wrapperEmpty: {
+    justifyContent: 'center'
+  },
   wrapperSmall: {},
   wrapperLarge: {},
   wrapperStriped: {
@@ -29870,6 +29873,7 @@ var useContainer = function useContainer() {
 
 
 var AbsoluteContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)(false);
+AbsoluteContext.displayName = 'AbsoluteContext';
 /* harmony default export */ var absolute_context = (AbsoluteContext);
 ;// CONCATENATED MODULE: ../base/src/absolute-list/absolute-list.tsx
 
@@ -32488,19 +32492,18 @@ function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
@@ -37428,6 +37431,11 @@ var result_isObject = is_isObject,
   result_isUnMatchedData = isUnMatchedData,
   result_isFunc = isFunc,
   result_isArray = isArray;
+var getValueArr = function getValueArr(v) {
+  return (result_isArray(v) ? v : [v]).filter(function (v) {
+    return v !== undefined && v !== null;
+  });
+};
 var result_Result = function Result(props) {
   var jssStyle = props.jssStyle,
     multiple = props.multiple,
@@ -37444,6 +37452,7 @@ var result_Result = function Result(props) {
     placeholder = props.placeholder,
     filterText = props.filterText,
     inputText = props.inputText,
+    inputRef = props.inputRef,
     compressed = props.compressed,
     compressedBound = props.compressedBound,
     compressedClassName = props.compressedClassName,
@@ -37613,11 +37622,6 @@ var result_Result = function Result(props) {
       children: content
     }, 'single');
   };
-  var getValueArr = function getValueArr(v) {
-    return (result_isArray(v) ? v : [v]).filter(function (v) {
-      return v !== undefined && v !== null;
-    });
-  };
   var renderMultipleResult = function renderMultipleResult() {
     if (isEmptyResult()) return renderNbsp();
     // [TODO] separator 处理逻辑后续交给 hooks 处理，此处临时处理
@@ -37688,8 +37692,21 @@ var result_Result = function Result(props) {
         onFilter === null || onFilter === void 0 || onFilter('', 'blur');
       }, 400);
     }
+
+    // 单选场景下，焦点时自动选中input文本
+    if (!multiple && focus && showInput && mounted.current) {
+      var _result2 = getDataByValues(value);
+      if (_result2.length > 0) {
+        var inputTmpText = renderResultContent(_result2[0]);
+        inputTmpText && props.setInputText(inputTmpText);
+      }
+      setTimeout(function () {
+        var _inputRef$current;
+        inputRef === null || inputRef === void 0 || (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.select();
+      }, 10);
+    }
     mounted.current = true;
-  }, [focus]);
+  }, [focus, placeholder, multiple]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     handleResetMore();
   }, [valueProp, data]);
@@ -38880,18 +38897,37 @@ function useFormControl(props) {
     var errors = arguments.length > 1 ? arguments[1] : undefined;
     var severErrors = arguments.length > 2 ? arguments[2] : undefined;
     if (!name) return;
-    var value = getValue(name, formValue);
-    var error = getError(name, errors, severErrors);
-    if (error !== errorState) {
-      setErrorState(error);
-    }
-    if (!shallowEqual(value, latestInfo.valueState)) {
-      if (value === undefined && defaultValue !== undefined) {
-        setValueState(defaultValue);
-      } else {
-        setValueState(value);
+    if (isArray(name)) {
+      var _value = getValue(name, formValue);
+      var _error = getError(name, errors, severErrors);
+      if (_error !== errorState) {
+        setErrorState(_error);
+      }
+      // format defaultValue
+      var dv = isArray(defaultValue) ? defaultValue : [];
+      var nextValue = [];
+      name.forEach(function (n, index) {
+        if (_value[index] === undefined && dv[index] !== undefined) {
+          nextValue[index] = dv[index];
+        } else {
+          nextValue[index] = _value[index];
+        }
+      });
+      setValueState(nextValue);
+    } else {
+      var _value2 = getValue(name, formValue);
+      var _error2 = getError(name, errors, severErrors);
+      if (_error2 !== errorState) {
+        setErrorState(_error2);
+      }
+      if (!shallowEqual(_value2, latestInfo.valueState)) {
+        if (_value2 === undefined && defaultValue !== undefined) {
+          setValueState(defaultValue);
+        } else {
+          setValueState(_value2);
+        }
+        latestInfo.valueState = _value2;
       }
-      latestInfo.valueState = value;
     }
   });
   var validateFiled = use_persist_fn(function (name, v, formV) {
@@ -42886,11 +42922,13 @@ var Quick = function Quick(props) {
     format = props.format,
     options = props.options,
     children = props.children,
-    type = props.type;
+    type = props.type,
+    closePop = props.closePop;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var quickDateCache = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var quickActiveKey = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var handleClick = function handleClick(item, index) {
+    var immediate = item.immediate;
     var itemV = isFunc(item.value) ? item.value() : item.value;
     quickDateCache.current = itemV;
     quickActiveKey.current = index;
@@ -42905,6 +42943,9 @@ var Quick = function Quick(props) {
     });
     props.setDateArr(dateArr);
     props.setCurrentArr(dateArr, 'quick', item);
+    if (immediate && closePop) {
+      closePop();
+    }
   };
   if (!(quickSelect !== null && quickSelect !== void 0 && quickSelect.length)) {
     return children || null;
@@ -43282,6 +43323,7 @@ var Picker = function Picker(props) {
     className: styles === null || styles === void 0 ? void 0 : styles.pickerBox,
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)(quick, {
       quickSelect: props.quickSelect,
+      closePop: props.closePop,
       range: props.range,
       jssStyle: jssStyle,
       dateArr: dateArr,
@@ -51703,6 +51745,7 @@ function Select(props0) {
         allowOnFilter: showInput,
         focusSelected: focusSelected,
         inputText: inputText,
+        inputRef: inputRef,
         filterText: filterText,
         onFilter: handleFilter,
         onRef: inputRef,
@@ -51906,10 +51949,16 @@ var PaginationSizeList = function PaginationSizeList(props) {
     pageSizeList = _props$pageSizeList === void 0 ? [10, 20, 30, 50, 100] : _props$pageSizeList,
     text = props.text,
     size = props.size,
+    select = props.select,
     pageSize = props.pageSize,
     onChange = props.onChange;
   var paginationStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$pagination = jssStyle.pagination) === null || _jssStyle$pagination === void 0 ? void 0 : _jssStyle$pagination.call(jssStyle);
   var rootClasses = classnames_default()(paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.section, paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.sizeList);
+  var _ref = select || {},
+    absolute = _ref.absolute,
+    position = _ref.position,
+    zIndex = _ref.zIndex;
+  console.log('position', position);
   var handleChange = function handleChange(pageSize) {
     var start = (current - 1) * props.pageSize + 1;
     onChange(Math.ceil(start / pageSize), pageSize);
@@ -51919,7 +51968,9 @@ var PaginationSizeList = function PaginationSizeList(props) {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_select_select, {
       jssStyle: jssStyle,
       disabled: disabled,
-      absolute: true,
+      zIndex: zIndex || undefined,
+      absolute: absolute || true,
+      position: position || undefined,
       autoAdapt: true,
       keygen: true,
       size: size,
@@ -52490,7 +52541,8 @@ var Pagination = function Pagination(props) {
     _props$text = props.text,
     text = _props$text === void 0 ? {} : _props$text,
     pageSizeList = props.pageSizeList,
-    style = props.style;
+    style = props.style,
+    select = props.select;
   var _usePagination = use_pagination({
       total: total,
       span: span,
@@ -52555,6 +52607,7 @@ var Pagination = function Pagination(props) {
             total: props.total || 0,
             text: text,
             size: size,
+            select: select,
             current: current || 0,
             pageSize: pageSize,
             pageSizeList: pageSizeList,
@@ -52618,6 +52671,7 @@ var list_list_List = function List(props) {
     _props$pagination = props.pagination,
     pagination = _props$pagination === void 0 ? {} : _props$pagination;
   var listClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$list = _props$jssStyle.list) === null || _props$jssStyle$list === void 0 ? void 0 : _props$jssStyle$list.call(_props$jssStyle);
+  var isEmpty = !isArray(data) || data.length <= 0;
   var inputAble = useInputAble({
     value: props.value,
     onChange: props.onChange,
@@ -52741,6 +52795,7 @@ var list_list_List = function List(props) {
     }
   });
   var renderList = function renderList() {
+    if (isEmpty) return null;
     if (props.fixed) return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
         data: columnData,
@@ -52770,7 +52825,7 @@ var list_list_List = function List(props) {
       }), renderFooter()]
     });
   };
-  var wrapperClass = classnames_default()(props.className, listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapper, props.bordered && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperBordered), props.size === 'small' && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperSmall), props.size === 'large' && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperLarge), props.striped && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperStriped));
+  var wrapperClass = classnames_default()(props.className, listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapper, isEmpty && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperEmpty), props.bordered && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperBordered), props.size === 'small' && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperSmall), props.size === 'large' && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperLarge), props.striped && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperStriped));
   var wrapperStyle = objectSpread2_default()(objectSpread2_default()({}, props.style), {}, {
     height: props.height
   });
@@ -52800,7 +52855,8 @@ var list_jssStyle = {
   checkbox: useCheckboxStyle,
   empty: useEmptyStyle,
   spin: useSpinStyle,
-  image: useImageStyle
+  image: useImageStyle,
+  select: useSelectStyle
 };
 /* harmony default export */ var src_list_list_0 = (function (props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(src_list_list, objectSpread2_default()({
@@ -65235,7 +65291,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.4-beta.8'
+  version: '3.4.4-fix.1'
 });
 }();
 /******/ 	return __webpack_exports__;