@nutui/nutui-react-taro 2.0.18-beta.0 → 2.0.18

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.
Files changed (113) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/esm/ActionSheet.js +2 -2
  3. package/dist/esm/Address.js +3 -3
  4. package/dist/esm/Avatar/style/index.js +2 -1
  5. package/dist/esm/Avatar/style/style.css +1 -1
  6. package/dist/esm/BackTop.js +1 -1
  7. package/dist/esm/Badge/style/style.css +1 -1
  8. package/dist/esm/Badge.js +1 -1
  9. package/dist/esm/Calendar.js +3 -3
  10. package/dist/esm/CalendarItem.js +1 -1
  11. package/dist/esm/Cascader.js +2 -2
  12. package/dist/esm/DatePicker.js +3 -3
  13. package/dist/esm/Dialog/style/style.css +1 -1
  14. package/dist/esm/Dialog.js +1 -1
  15. package/dist/esm/FixedNav/style/style.css +1 -1
  16. package/dist/esm/Form.js +21 -11
  17. package/dist/esm/FormItem.js +1 -1
  18. package/dist/esm/ImagePreview/style/index.js +2 -1
  19. package/dist/esm/ImagePreview/style/style.css +1 -1
  20. package/dist/esm/ImagePreview.js +2 -2
  21. package/dist/esm/Menu/style/style.css +1 -1
  22. package/dist/esm/Menu.js +4 -2
  23. package/dist/esm/MenuItem/style/style.css +1 -1
  24. package/dist/esm/MenuItem.js +3 -1
  25. package/dist/esm/NumberKeyboard.js +2 -2
  26. package/dist/esm/Picker.js +2 -2
  27. package/dist/esm/Popover.js +2 -2
  28. package/dist/esm/Popup.js +1 -1
  29. package/dist/esm/ShortPassword.js +2 -2
  30. package/dist/esm/SideNavBar.js +2 -2
  31. package/dist/esm/Skeleton/style/style.css +1 -1
  32. package/dist/esm/Sticky.js +1 -1
  33. package/dist/esm/Swiper/style/index.js +2 -1
  34. package/dist/esm/Swiper/style/style.css +1 -1
  35. package/dist/esm/Tabbar/style/style.css +1 -1
  36. package/dist/esm/Tabbar.js +3 -3
  37. package/dist/esm/TabbarItem/style/style.css +1 -1
  38. package/dist/esm/TabbarItem.js +2 -2
  39. package/dist/esm/TimeSelect.js +2 -2
  40. package/dist/esm/Toast/style/style.css +1 -1
  41. package/dist/esm/Tour/style/index.js +1 -1
  42. package/dist/esm/Tour/style/style.css +1 -1
  43. package/dist/esm/Tour.js +3 -3
  44. package/dist/esm/Uploader/style/style.css +1 -1
  45. package/dist/esm/Uploader.js +1 -1
  46. package/dist/esm/{actionsheet.taro-0a411006.js → actionsheet.taro-374745a3.js} +1 -1
  47. package/dist/esm/{address.taro-319deb0d.js → address.taro-7b3ad807.js} +2 -2
  48. package/dist/esm/{backtop.taro-61b1eeaf.js → backtop.taro-910bbef1.js} +1 -1
  49. package/dist/esm/{badge.taro-289489e5.js → badge.taro-ffca952e.js} +2 -2
  50. package/dist/esm/{calendar.taro-c8ddf452.js → calendar.taro-2c342d6b.js} +2 -2
  51. package/dist/esm/{calendaritem.taro-0bd17638.js → calendaritem.taro-bc06f40f.js} +4 -4
  52. package/dist/esm/{cascader.taro-8d41895a.js → cascader.taro-6ee25349.js} +1 -1
  53. package/dist/esm/{datepicker.taro-4da6a538.js → datepicker.taro-de668a19.js} +1 -1
  54. package/dist/esm/{dialog.taro-1426fb49.js → dialog.taro-ffad380a.js} +1 -1
  55. package/dist/esm/{formitem.taro-d69dce1e.js → formitem.taro-0dc81538.js} +5 -2
  56. package/dist/esm/{imagepreview.taro-bc96904b.js → imagepreview.taro-87d85d88.js} +1 -1
  57. package/dist/esm/{menu.taro-1306d899.js → menu.taro-cc93f12a.js} +8 -4
  58. package/dist/esm/{menuitem.taro-f083de92.js → menuitem.taro-69a45abd.js} +14 -6
  59. package/dist/esm/{numberkeyboard.taro-f19c44a8.js → numberkeyboard.taro-bd6a9439.js} +1 -1
  60. package/dist/esm/nutui-react.es.js +25 -25
  61. package/dist/esm/{picker.taro-47d1c716.js → picker.taro-e08d99a3.js} +1 -1
  62. package/dist/esm/{popover.taro-43e96169.js → popover.taro-6b946803.js} +1 -1
  63. package/dist/esm/{popup.taro-487eb86e.js → popup.taro-1636100a.js} +1 -1
  64. package/dist/esm/{shortpassword.taro-86563915.js → shortpassword.taro-331d270c.js} +1 -1
  65. package/dist/esm/{sidenavbar.taro-f16b1320.js → sidenavbar.taro-39fb8ac6.js} +1 -1
  66. package/dist/esm/{sticky.taro-dbacaf76.js → sticky.taro-2b9a5231.js} +1 -1
  67. package/dist/esm/{tabbar.taro-4397646a.js → tabbar.taro-2bcdca7c.js} +1 -1
  68. package/dist/esm/{tabbaritem.taro-1d27af28.js → tabbaritem.taro-c7113661.js} +1 -1
  69. package/dist/esm/{timeselect.taro-6e9fc4d4.js → timeselect.taro-e02f6bf9.js} +1 -1
  70. package/dist/esm/{tour.taro-5185292f.js → tour.taro-88cf1ba9.js} +1 -1
  71. package/dist/esm/types/src/packages/badge/badge.d.ts +2 -2
  72. package/dist/esm/types/src/packages/badge/badge.taro.d.ts +2 -2
  73. package/dist/esm/types/src/packages/configprovider/types.d.ts +1 -1
  74. package/dist/esm/types/src/packages/form/types.d.ts +4 -4
  75. package/dist/esm/types/src/packages/form/useform.d.ts +2 -1
  76. package/dist/esm/types/src/packages/form/useform.taro.d.ts +2 -1
  77. package/dist/esm/types/src/packages/menu/menu.d.ts +1 -0
  78. package/dist/esm/types/src/packages/menu/menu.taro.d.ts +1 -0
  79. package/dist/esm/types/src/packages/menuitem/menuitem.d.ts +1 -0
  80. package/dist/esm/types/src/packages/menuitem/menuitem.taro.d.ts +1 -0
  81. package/dist/esm/types/src/packages/shortpassword/shortpassword.d.ts +1 -1
  82. package/dist/esm/types/src/utils/date.d.ts +1 -1
  83. package/dist/esm/{uploader.taro-c0bcca89.js → uploader.taro-56b2ca0d.js} +15 -7
  84. package/dist/locales/base.js +1 -1
  85. package/dist/locales/en-US.js +1 -1
  86. package/dist/locales/id-ID.js +1 -1
  87. package/dist/locales/tr-TR.js +1 -1
  88. package/dist/locales/zh-CN.js +1 -1
  89. package/dist/locales/zh-TW.js +1 -1
  90. package/dist/locales/zh-UG.js +1 -1
  91. package/dist/nutui.react.es.js +63 -37
  92. package/dist/nutui.react.umd.js +63 -37
  93. package/dist/packages/badge/badge.scss +1 -0
  94. package/dist/packages/dialog/dialog.scss +7 -1
  95. package/dist/packages/fixednav/fixednav.scss +1 -8
  96. package/dist/packages/menuitem/menuitem.scss +2 -2
  97. package/dist/packages/toast/toast.scss +2 -1
  98. package/dist/packages/tour/tour.scss +1 -0
  99. package/dist/packages/uploader/uploader.scss +12 -12
  100. package/dist/style.css +1 -1
  101. package/dist/style.mjs +1 -1
  102. package/dist/styles/variables-jmapp.scss +9 -3
  103. package/dist/styles/variables.scss +10 -3
  104. package/dist/types/packages/badge/badge.taro.d.ts +6 -6
  105. package/dist/types/packages/configprovider/types.d.ts +1 -1
  106. package/dist/types/packages/form/types.d.ts +4 -4
  107. package/dist/types/packages/form/useform.d.ts +3 -0
  108. package/dist/types/packages/form/useform.taro.d.ts +2 -1
  109. package/dist/types/packages/menu/menu.taro.d.ts +1 -0
  110. package/dist/types/packages/menuitem/menuitem.taro.d.ts +6 -1
  111. package/dist/types/packages/radio/index.d.ts +3 -0
  112. package/dist/types/utils/date.d.ts +1 -1
  113. package/package.json +1 -1
@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
5
5
  return value;
6
6
  };
7
7
  /*!
8
- * @nutui/nutui-react-taro v2.0.18-beta.0 Fri Sep 15 2023 14:03:32 GMT+0800 (China Standard Time)
8
+ * @nutui/nutui-react-taro v2.0.18 Wed Sep 20 2023 14:56:58 GMT+0800 (China Standard Time)
9
9
  * (c) 2023 @jdf2e.
10
10
  * Released under the MIT License.
11
11
  */
@@ -5536,7 +5536,7 @@ function getScrollParent(el, root2 = defaultRoot) {
5536
5536
  const defaultProps$1j = {
5537
5537
  ...ComponentDefaults,
5538
5538
  position: "top",
5539
- zIndex: 2e3
5539
+ zIndex: 900
5540
5540
  };
5541
5541
  const classPrefix$k = "nut-sticky";
5542
5542
  const Sticky = (props) => {
@@ -5661,7 +5661,7 @@ Sticky.displayName = "NutSticky";
5661
5661
  const defaultProps$1i = {
5662
5662
  ...ComponentDefaults,
5663
5663
  threshold: 200,
5664
- zIndex: 10,
5664
+ zIndex: 900,
5665
5665
  duration: 1e3
5666
5666
  };
5667
5667
  const BackTop = (props) => {
@@ -6114,7 +6114,7 @@ const defaultProps$1e = {
6114
6114
  onCloseIconClick: (e) => true,
6115
6115
  ...defaultOverlayProps
6116
6116
  };
6117
- let _zIndex = 2e3;
6117
+ let _zIndex = 1100;
6118
6118
  const Popup = (props) => {
6119
6119
  const {
6120
6120
  children,
@@ -6474,8 +6474,8 @@ const Badge = (props) => {
6474
6474
  }
6475
6475
  const getStyle = () => {
6476
6476
  const style2 = {};
6477
- style2.top = `${Number(top) || parseFloat(top) || 0}px`;
6478
- style2.right = `${Number(right) || parseFloat(right) || 0}px`;
6477
+ style2.top = `${Number(top) || parseFloat(String(top)) || 0}px`;
6478
+ style2.right = `${Number(right) || parseFloat(String(right)) || 0}px`;
6479
6479
  style2.background = color;
6480
6480
  return style2;
6481
6481
  };
@@ -7633,7 +7633,7 @@ const Utils = {
7633
7633
  * @return {Boolse} true|false
7634
7634
  */
7635
7635
  isLeapYear(y2) {
7636
- return y2 % 4 == 0 && y2 % 100 != 0 || y2 % 400 == 0;
7636
+ return y2 % 4 === 0 && y2 % 100 !== 0 || y2 % 400 === 0;
7637
7637
  },
7638
7638
  /**
7639
7639
  * 返回星期数
@@ -7736,9 +7736,9 @@ const Utils = {
7736
7736
  * 时间是否相等
7737
7737
  * @return {Boolean}
7738
7738
  */
7739
- isEqual(date1 = "", date22) {
7740
- const startTime = new Date(date1.replace("-", "/")).getTime();
7741
- const endTime = new Date(date22.replace("-", "/")).getTime();
7739
+ isEqual(date1, date22) {
7740
+ const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
7741
+ const endTime = new Date(date22.replace(/-/g, "/")).getTime();
7742
7742
  if (startTime === endTime) {
7743
7743
  return true;
7744
7744
  }
@@ -10860,6 +10860,7 @@ Schema.register = function register(type4, validator) {
10860
10860
  Schema.warning = warning;
10861
10861
  Schema.messages = messages;
10862
10862
  Schema.validators = validators;
10863
+ const SECRET$1 = "NUT_FORM_INTERNAL";
10863
10864
  class FormStore {
10864
10865
  constructor() {
10865
10866
  // 初始化数据
@@ -10895,12 +10896,12 @@ class FormStore {
10895
10896
  /**
10896
10897
  * 获取全部字段
10897
10898
  */
10898
- __publicField(this, "getFieldsValue", (name) => {
10899
- if (typeof name === "boolean") {
10899
+ __publicField(this, "getFieldsValue", (nameList) => {
10900
+ if (typeof nameList === "boolean") {
10900
10901
  return JSON.parse(JSON.stringify(this.store));
10901
10902
  }
10902
10903
  const fieldsValue = {};
10903
- name.forEach((field) => {
10904
+ nameList.forEach((field) => {
10904
10905
  fieldsValue[field] = this.getFieldValue(field);
10905
10906
  });
10906
10907
  return fieldsValue;
@@ -11020,20 +11021,27 @@ class FormStore {
11020
11021
  __publicField(this, "dispatch", ({ name }) => {
11021
11022
  this.validateFields([name]);
11022
11023
  });
11024
+ __publicField(this, "getInternal", (key) => {
11025
+ if (key === SECRET$1) {
11026
+ return {
11027
+ registerField: this.registerField,
11028
+ setCallback: this.setCallback,
11029
+ setInitialValues: this.setInitialValues,
11030
+ dispatch: this.dispatch,
11031
+ store: this.store,
11032
+ fieldEntities: this.fieldEntities
11033
+ };
11034
+ }
11035
+ });
11023
11036
  __publicField(this, "getForm", () => {
11024
11037
  return {
11025
- dispatch: this.dispatch,
11026
- setInitialValues: this.setInitialValues,
11027
- setCallback: this.setCallback,
11028
- registerField: this.registerField,
11029
11038
  getFieldValue: this.getFieldValue,
11030
11039
  getFieldsValue: this.getFieldsValue,
11031
11040
  setFieldsValue: this.setFieldsValue,
11032
11041
  resetFields: this.resetFields,
11033
11042
  submit: this.submit,
11034
- store: this.store,
11035
11043
  errors: this.errors,
11036
- fieldEntities: this.fieldEntities
11044
+ getInternal: this.getInternal
11037
11045
  };
11038
11046
  });
11039
11047
  this.callbacks = {
@@ -11096,8 +11104,10 @@ const Form = React__default.forwardRef(
11096
11104
  } else {
11097
11105
  [formInstance] = useForm();
11098
11106
  }
11107
+ React__default.useImperativeHandle(ref, () => formInstance);
11099
11108
  formInstance.starPosition = starPosition;
11100
- const { setCallback, submit, resetFields, setInitialValues } = formInstance;
11109
+ const { submit, resetFields } = formInstance;
11110
+ const { setCallback, setInitialValues } = formInstance.getInternal(SECRET$1);
11101
11111
  setCallback({
11102
11112
  onFinish,
11103
11113
  onFinishFailed
@@ -11142,6 +11152,7 @@ function isForwardRefComponent(component) {
11142
11152
  }
11143
11153
  ).$$typeof === component.type.$$typeof;
11144
11154
  }
11155
+ const SECRET = "NUT_FORM_INTERNAL";
11145
11156
  const defaultProps$X = {
11146
11157
  ...ComponentDefaults,
11147
11158
  required: false,
@@ -11159,7 +11170,8 @@ class FormItem extends React__default.Component {
11159
11170
  // children添加value属性和onChange事件
11160
11171
  __publicField(this, "getControlled", (children) => {
11161
11172
  var _a;
11162
- const { setFieldsValue, getFieldValue, dispatch } = this.context;
11173
+ const { setFieldsValue, getFieldValue } = this.context;
11174
+ const { dispatch } = this.context.getInternal(SECRET);
11163
11175
  const { name = "" } = this.props;
11164
11176
  if ((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.defaultValue) {
11165
11177
  console.warn("通过 initialValue 设置初始值");
@@ -11268,7 +11280,8 @@ class FormItem extends React__default.Component {
11268
11280
  };
11269
11281
  }
11270
11282
  componentDidMount() {
11271
- this.cancelRegister = this.context.registerField(this);
11283
+ const { registerField } = this.context.getInternal(SECRET);
11284
+ this.cancelRegister = registerField(this);
11272
11285
  }
11273
11286
  componentWillUnmount() {
11274
11287
  if (this.cancelRegister) {
@@ -11734,7 +11747,7 @@ const defaultProps$U = {
11734
11747
  columns: 1,
11735
11748
  direction: "down",
11736
11749
  icon: null,
11737
- closeOnClickAway: false,
11750
+ closeOnClickAway: true,
11738
11751
  activeTitleClass: "",
11739
11752
  inactiveTitleClass: "",
11740
11753
  onChange: (value) => void 0
@@ -11745,6 +11758,7 @@ const MenuItem = forwardRef((props, ref) => {
11745
11758
  style,
11746
11759
  options,
11747
11760
  value,
11761
+ defaultValue,
11748
11762
  columns,
11749
11763
  title,
11750
11764
  icon,
@@ -11763,7 +11777,15 @@ const MenuItem = forwardRef((props, ref) => {
11763
11777
  ...props
11764
11778
  };
11765
11779
  const [showPopup, setShowPopup] = useState(show2);
11766
- const [innerValue, setValue] = useState(value);
11780
+ const [innerValue, setValue] = usePropsValue({
11781
+ defaultValue,
11782
+ value,
11783
+ finalValue: void 0,
11784
+ onChange: (v) => {
11785
+ const [option] = options.filter((o) => o.value === v);
11786
+ onChange == null ? void 0 : onChange(option);
11787
+ }
11788
+ });
11767
11789
  useEffect(() => {
11768
11790
  setShowPopup(show2);
11769
11791
  }, [show2]);
@@ -11803,7 +11825,6 @@ const MenuItem = forwardRef((props, ref) => {
11803
11825
  parent.toggleMenuItem(index);
11804
11826
  setTitle(item.text);
11805
11827
  setValue(item.value);
11806
- onChange && onChange(item);
11807
11828
  };
11808
11829
  const [position, setPosition] = useState({
11809
11830
  top: 0,
@@ -11857,7 +11878,7 @@ const MenuItem = forwardRef((props, ref) => {
11857
11878
  style: placeholderStyle(),
11858
11879
  onClick: () => parent.toggleMenuItem(index)
11859
11880
  }
11860
- ) : null, /* @__PURE__ */ React__default.createElement(
11881
+ ) : null, parent.overlay ? /* @__PURE__ */ React__default.createElement(
11861
11882
  Overlay,
11862
11883
  {
11863
11884
  className: "nut-menu__overlay",
@@ -11869,7 +11890,7 @@ const MenuItem = forwardRef((props, ref) => {
11869
11890
  parent.closeOnOverlayClick && parent.toggleMenuItem(index);
11870
11891
  }
11871
11892
  }
11872
- ), /* @__PURE__ */ React__default.createElement(
11893
+ ) : null, /* @__PURE__ */ React__default.createElement(
11873
11894
  View,
11874
11895
  {
11875
11896
  className: classNames(className, {
@@ -11934,6 +11955,7 @@ const defaultProps$T = {
11934
11955
  closeOnOverlayClick: true,
11935
11956
  scrollFixed: false,
11936
11957
  lockScroll: true,
11958
+ overlay: true,
11937
11959
  icon: null,
11938
11960
  onOpen: (index) => {
11939
11961
  },
@@ -11946,6 +11968,7 @@ const Menu = (props) => {
11946
11968
  icon,
11947
11969
  scrollFixed,
11948
11970
  lockScroll,
11971
+ overlay,
11949
11972
  closeOnOverlayClick,
11950
11973
  children,
11951
11974
  activeColor,
@@ -12005,6 +12028,7 @@ const Menu = (props) => {
12005
12028
  activeColor,
12006
12029
  parent: {
12007
12030
  closeOnOverlayClick,
12031
+ overlay,
12008
12032
  lockScroll,
12009
12033
  toggleMenuItem,
12010
12034
  updateTitle,
@@ -12017,9 +12041,9 @@ const Menu = (props) => {
12017
12041
  const menuTitle = () => {
12018
12042
  return React__default.Children.map(children, (child, index) => {
12019
12043
  if (React__default.isValidElement(child)) {
12020
- const { title, options, value, disabled, direction } = child.props;
12044
+ const { title, options, value, defaultValue, disabled, direction } = child.props;
12021
12045
  const selected = options == null ? void 0 : options.filter(
12022
- (option) => option.value === value
12046
+ (option) => option.value === (value !== void 0 ? value : defaultValue)
12023
12047
  );
12024
12048
  const finallyTitle = () => {
12025
12049
  if (title)
@@ -12040,6 +12064,8 @@ const Menu = (props) => {
12040
12064
  style: { color: showMenuItem[index] ? activeColor : "" },
12041
12065
  key: index,
12042
12066
  onClick: () => {
12067
+ if ((!options || !options.length) && !child.props.children)
12068
+ return;
12043
12069
  !disabled && toggleMenuItem(index);
12044
12070
  }
12045
12071
  },
@@ -13977,21 +14003,22 @@ const InternalUploader = (props, ref) => {
13977
14003
  const handleItemClick = (file) => {
13978
14004
  onFileItemClick && onFileItemClick(file);
13979
14005
  };
13980
- return /* @__PURE__ */ React__default.createElement("div", { className: classes, ...restProps }, children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children, maxCount > fileList.length && /* @__PURE__ */ React__default.createElement(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), fileList.length !== 0 && Array.isArray(fileList) && fileList.map((item, index) => {
14006
+ return /* @__PURE__ */ React__default.createElement("div", { className: classes, ...restProps }, (children || previewType === "list") && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children || /* @__PURE__ */ React__default.createElement(Button, { size: "small", type: "primary" }, "上传文件"), maxCount > fileList.length && /* @__PURE__ */ React__default.createElement(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), fileList.length !== 0 && Array.isArray(fileList) && fileList.map((item, index) => {
13981
14007
  return /* @__PURE__ */ React__default.createElement(
13982
14008
  "div",
13983
14009
  {
13984
14010
  className: `nut-uploader__preview ${previewType}`,
13985
14011
  key: item.uid
13986
14012
  },
13987
- previewType === "picture" && !children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-img" }, deletable && /* @__PURE__ */ React__default.createElement(
14013
+ previewType === "picture" && deletable && /* @__PURE__ */ React__default.createElement(
13988
14014
  a$n,
13989
14015
  {
13990
14016
  color: "rgba(0,0,0,0.6)",
13991
14017
  className: "close",
13992
14018
  onClick: () => onDeleteItem(item, index)
13993
14019
  }
13994
- ), item.status === "ready" ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React__default.createElement(a$n, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React__default.createElement(r$h, { color: "#fff" })), /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)), item.type.includes("image") ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, item.url && /* @__PURE__ */ React__default.createElement(
14020
+ ),
14021
+ previewType === "picture" && !children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-img" }, item.status === "ready" ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React__default.createElement(a$n, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React__default.createElement(r$h, { color: "#fff" })), /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)), item.type.includes("image") ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, item.url && /* @__PURE__ */ React__default.createElement(
13995
14022
  Image$2,
13996
14023
  {
13997
14024
  className: "nut-uploader__preview-img__c",
@@ -14015,8 +14042,7 @@ const InternalUploader = (props, ref) => {
14015
14042
  className: "nut-uploader__preview-img__file__name"
14016
14043
  },
14017
14044
  /* @__PURE__ */ React__default.createElement(a$i, { color: "#808080" }),
14018
- " ",
14019
- item.name
14045
+ /* @__PURE__ */ React__default.createElement("span", null, " ", item.name)
14020
14046
  ))), item.status === "success" ? /* @__PURE__ */ React__default.createElement("div", { className: "tips" }, item.name) : null),
14021
14047
  previewType === "list" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-list" }, /* @__PURE__ */ React__default.createElement(
14022
14048
  "div",
@@ -14025,8 +14051,7 @@ const InternalUploader = (props, ref) => {
14025
14051
  onClick: () => handleItemClick(item)
14026
14052
  },
14027
14053
  /* @__PURE__ */ React__default.createElement(a$i, null),
14028
- " ",
14029
- item.name
14054
+ /* @__PURE__ */ React__default.createElement("span", null, " ", item.name)
14030
14055
  ), deletable && /* @__PURE__ */ React__default.createElement(
14031
14056
  a$p,
14032
14057
  {
@@ -14324,7 +14349,8 @@ const BaseDialog = (props) => {
14324
14349
  visible: true,
14325
14350
  closeOnOverlayClick,
14326
14351
  lockScroll,
14327
- onClick: onHandleClickOverlay
14352
+ onClick: onHandleClickOverlay,
14353
+ className: classNames("nut-dialog-overlay")
14328
14354
  }
14329
14355
  ) : null, /* @__PURE__ */ React__default.createElement(
14330
14356
  CSSTransition$1,
@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
8
8
  return value;
9
9
  };
10
10
  /*!
11
- * @nutui/nutui-react-taro v2.0.18-beta.0 Fri Sep 15 2023 14:03:32 GMT+0800 (China Standard Time)
11
+ * @nutui/nutui-react-taro v2.0.18 Wed Sep 20 2023 14:56:58 GMT+0800 (China Standard Time)
12
12
  * (c) 2023 @jdf2e.
13
13
  * Released under the MIT License.
14
14
  */
@@ -5552,7 +5552,7 @@ var __publicField = (obj, key, value) => {
5552
5552
  const defaultProps$1j = {
5553
5553
  ...ComponentDefaults,
5554
5554
  position: "top",
5555
- zIndex: 2e3
5555
+ zIndex: 900
5556
5556
  };
5557
5557
  const classPrefix$k = "nut-sticky";
5558
5558
  const Sticky = (props) => {
@@ -5677,7 +5677,7 @@ var __publicField = (obj, key, value) => {
5677
5677
  const defaultProps$1i = {
5678
5678
  ...ComponentDefaults,
5679
5679
  threshold: 200,
5680
- zIndex: 10,
5680
+ zIndex: 900,
5681
5681
  duration: 1e3
5682
5682
  };
5683
5683
  const BackTop = (props) => {
@@ -6130,7 +6130,7 @@ var __publicField = (obj, key, value) => {
6130
6130
  onCloseIconClick: (e) => true,
6131
6131
  ...defaultOverlayProps
6132
6132
  };
6133
- let _zIndex = 2e3;
6133
+ let _zIndex = 1100;
6134
6134
  const Popup = (props) => {
6135
6135
  const {
6136
6136
  children,
@@ -6490,8 +6490,8 @@ var __publicField = (obj, key, value) => {
6490
6490
  }
6491
6491
  const getStyle = () => {
6492
6492
  const style2 = {};
6493
- style2.top = `${Number(top) || parseFloat(top) || 0}px`;
6494
- style2.right = `${Number(right) || parseFloat(right) || 0}px`;
6493
+ style2.top = `${Number(top) || parseFloat(String(top)) || 0}px`;
6494
+ style2.right = `${Number(right) || parseFloat(String(right)) || 0}px`;
6495
6495
  style2.background = color;
6496
6496
  return style2;
6497
6497
  };
@@ -7649,7 +7649,7 @@ var __publicField = (obj, key, value) => {
7649
7649
  * @return {Boolse} true|false
7650
7650
  */
7651
7651
  isLeapYear(y2) {
7652
- return y2 % 4 == 0 && y2 % 100 != 0 || y2 % 400 == 0;
7652
+ return y2 % 4 === 0 && y2 % 100 !== 0 || y2 % 400 === 0;
7653
7653
  },
7654
7654
  /**
7655
7655
  * 返回星期数
@@ -7752,9 +7752,9 @@ var __publicField = (obj, key, value) => {
7752
7752
  * 时间是否相等
7753
7753
  * @return {Boolean}
7754
7754
  */
7755
- isEqual(date1 = "", date2) {
7756
- const startTime = new Date(date1.replace("-", "/")).getTime();
7757
- const endTime = new Date(date2.replace("-", "/")).getTime();
7755
+ isEqual(date1, date2) {
7756
+ const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
7757
+ const endTime = new Date(date2.replace(/-/g, "/")).getTime();
7758
7758
  if (startTime === endTime) {
7759
7759
  return true;
7760
7760
  }
@@ -10876,6 +10876,7 @@ var __publicField = (obj, key, value) => {
10876
10876
  Schema.warning = warning;
10877
10877
  Schema.messages = messages;
10878
10878
  Schema.validators = validators;
10879
+ const SECRET$1 = "NUT_FORM_INTERNAL";
10879
10880
  class FormStore {
10880
10881
  constructor() {
10881
10882
  // 初始化数据
@@ -10911,12 +10912,12 @@ var __publicField = (obj, key, value) => {
10911
10912
  /**
10912
10913
  * 获取全部字段
10913
10914
  */
10914
- __publicField(this, "getFieldsValue", (name) => {
10915
- if (typeof name === "boolean") {
10915
+ __publicField(this, "getFieldsValue", (nameList) => {
10916
+ if (typeof nameList === "boolean") {
10916
10917
  return JSON.parse(JSON.stringify(this.store));
10917
10918
  }
10918
10919
  const fieldsValue = {};
10919
- name.forEach((field) => {
10920
+ nameList.forEach((field) => {
10920
10921
  fieldsValue[field] = this.getFieldValue(field);
10921
10922
  });
10922
10923
  return fieldsValue;
@@ -11036,20 +11037,27 @@ var __publicField = (obj, key, value) => {
11036
11037
  __publicField(this, "dispatch", ({ name }) => {
11037
11038
  this.validateFields([name]);
11038
11039
  });
11040
+ __publicField(this, "getInternal", (key) => {
11041
+ if (key === SECRET$1) {
11042
+ return {
11043
+ registerField: this.registerField,
11044
+ setCallback: this.setCallback,
11045
+ setInitialValues: this.setInitialValues,
11046
+ dispatch: this.dispatch,
11047
+ store: this.store,
11048
+ fieldEntities: this.fieldEntities
11049
+ };
11050
+ }
11051
+ });
11039
11052
  __publicField(this, "getForm", () => {
11040
11053
  return {
11041
- dispatch: this.dispatch,
11042
- setInitialValues: this.setInitialValues,
11043
- setCallback: this.setCallback,
11044
- registerField: this.registerField,
11045
11054
  getFieldValue: this.getFieldValue,
11046
11055
  getFieldsValue: this.getFieldsValue,
11047
11056
  setFieldsValue: this.setFieldsValue,
11048
11057
  resetFields: this.resetFields,
11049
11058
  submit: this.submit,
11050
- store: this.store,
11051
11059
  errors: this.errors,
11052
- fieldEntities: this.fieldEntities
11060
+ getInternal: this.getInternal
11053
11061
  };
11054
11062
  });
11055
11063
  this.callbacks = {
@@ -11112,8 +11120,10 @@ var __publicField = (obj, key, value) => {
11112
11120
  } else {
11113
11121
  [formInstance] = useForm();
11114
11122
  }
11123
+ React.useImperativeHandle(ref, () => formInstance);
11115
11124
  formInstance.starPosition = starPosition;
11116
- const { setCallback, submit, resetFields, setInitialValues } = formInstance;
11125
+ const { submit, resetFields } = formInstance;
11126
+ const { setCallback, setInitialValues } = formInstance.getInternal(SECRET$1);
11117
11127
  setCallback({
11118
11128
  onFinish,
11119
11129
  onFinishFailed
@@ -11158,6 +11168,7 @@ var __publicField = (obj, key, value) => {
11158
11168
  }
11159
11169
  ).$$typeof === component.type.$$typeof;
11160
11170
  }
11171
+ const SECRET = "NUT_FORM_INTERNAL";
11161
11172
  const defaultProps$X = {
11162
11173
  ...ComponentDefaults,
11163
11174
  required: false,
@@ -11175,7 +11186,8 @@ var __publicField = (obj, key, value) => {
11175
11186
  // children添加value属性和onChange事件
11176
11187
  __publicField(this, "getControlled", (children) => {
11177
11188
  var _a;
11178
- const { setFieldsValue, getFieldValue, dispatch } = this.context;
11189
+ const { setFieldsValue, getFieldValue } = this.context;
11190
+ const { dispatch } = this.context.getInternal(SECRET);
11179
11191
  const { name = "" } = this.props;
11180
11192
  if ((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.defaultValue) {
11181
11193
  console.warn("通过 initialValue 设置初始值");
@@ -11284,7 +11296,8 @@ var __publicField = (obj, key, value) => {
11284
11296
  };
11285
11297
  }
11286
11298
  componentDidMount() {
11287
- this.cancelRegister = this.context.registerField(this);
11299
+ const { registerField } = this.context.getInternal(SECRET);
11300
+ this.cancelRegister = registerField(this);
11288
11301
  }
11289
11302
  componentWillUnmount() {
11290
11303
  if (this.cancelRegister) {
@@ -11750,7 +11763,7 @@ var __publicField = (obj, key, value) => {
11750
11763
  columns: 1,
11751
11764
  direction: "down",
11752
11765
  icon: null,
11753
- closeOnClickAway: false,
11766
+ closeOnClickAway: true,
11754
11767
  activeTitleClass: "",
11755
11768
  inactiveTitleClass: "",
11756
11769
  onChange: (value) => void 0
@@ -11761,6 +11774,7 @@ var __publicField = (obj, key, value) => {
11761
11774
  style,
11762
11775
  options,
11763
11776
  value,
11777
+ defaultValue,
11764
11778
  columns,
11765
11779
  title,
11766
11780
  icon,
@@ -11779,7 +11793,15 @@ var __publicField = (obj, key, value) => {
11779
11793
  ...props
11780
11794
  };
11781
11795
  const [showPopup, setShowPopup] = React.useState(show2);
11782
- const [innerValue, setValue] = React.useState(value);
11796
+ const [innerValue, setValue] = usePropsValue({
11797
+ defaultValue,
11798
+ value,
11799
+ finalValue: void 0,
11800
+ onChange: (v) => {
11801
+ const [option] = options.filter((o) => o.value === v);
11802
+ onChange == null ? void 0 : onChange(option);
11803
+ }
11804
+ });
11783
11805
  React.useEffect(() => {
11784
11806
  setShowPopup(show2);
11785
11807
  }, [show2]);
@@ -11819,7 +11841,6 @@ var __publicField = (obj, key, value) => {
11819
11841
  parent.toggleMenuItem(index);
11820
11842
  setTitle(item.text);
11821
11843
  setValue(item.value);
11822
- onChange && onChange(item);
11823
11844
  };
11824
11845
  const [position, setPosition] = React.useState({
11825
11846
  top: 0,
@@ -11873,7 +11894,7 @@ var __publicField = (obj, key, value) => {
11873
11894
  style: placeholderStyle(),
11874
11895
  onClick: () => parent.toggleMenuItem(index)
11875
11896
  }
11876
- ) : null, /* @__PURE__ */ React.createElement(
11897
+ ) : null, parent.overlay ? /* @__PURE__ */ React.createElement(
11877
11898
  Overlay,
11878
11899
  {
11879
11900
  className: "nut-menu__overlay",
@@ -11885,7 +11906,7 @@ var __publicField = (obj, key, value) => {
11885
11906
  parent.closeOnOverlayClick && parent.toggleMenuItem(index);
11886
11907
  }
11887
11908
  }
11888
- ), /* @__PURE__ */ React.createElement(
11909
+ ) : null, /* @__PURE__ */ React.createElement(
11889
11910
  components.View,
11890
11911
  {
11891
11912
  className: classNames(className, {
@@ -11950,6 +11971,7 @@ var __publicField = (obj, key, value) => {
11950
11971
  closeOnOverlayClick: true,
11951
11972
  scrollFixed: false,
11952
11973
  lockScroll: true,
11974
+ overlay: true,
11953
11975
  icon: null,
11954
11976
  onOpen: (index) => {
11955
11977
  },
@@ -11962,6 +11984,7 @@ var __publicField = (obj, key, value) => {
11962
11984
  icon,
11963
11985
  scrollFixed,
11964
11986
  lockScroll,
11987
+ overlay,
11965
11988
  closeOnOverlayClick,
11966
11989
  children,
11967
11990
  activeColor,
@@ -12021,6 +12044,7 @@ var __publicField = (obj, key, value) => {
12021
12044
  activeColor,
12022
12045
  parent: {
12023
12046
  closeOnOverlayClick,
12047
+ overlay,
12024
12048
  lockScroll,
12025
12049
  toggleMenuItem,
12026
12050
  updateTitle,
@@ -12033,9 +12057,9 @@ var __publicField = (obj, key, value) => {
12033
12057
  const menuTitle = () => {
12034
12058
  return React.Children.map(children, (child, index) => {
12035
12059
  if (React.isValidElement(child)) {
12036
- const { title, options, value, disabled, direction } = child.props;
12060
+ const { title, options, value, defaultValue, disabled, direction } = child.props;
12037
12061
  const selected = options == null ? void 0 : options.filter(
12038
- (option) => option.value === value
12062
+ (option) => option.value === (value !== void 0 ? value : defaultValue)
12039
12063
  );
12040
12064
  const finallyTitle = () => {
12041
12065
  if (title)
@@ -12056,6 +12080,8 @@ var __publicField = (obj, key, value) => {
12056
12080
  style: { color: showMenuItem[index] ? activeColor : "" },
12057
12081
  key: index,
12058
12082
  onClick: () => {
12083
+ if ((!options || !options.length) && !child.props.children)
12084
+ return;
12059
12085
  !disabled && toggleMenuItem(index);
12060
12086
  }
12061
12087
  },
@@ -13993,21 +14019,22 @@ var __publicField = (obj, key, value) => {
13993
14019
  const handleItemClick = (file) => {
13994
14020
  onFileItemClick && onFileItemClick(file);
13995
14021
  };
13996
- return /* @__PURE__ */ React.createElement("div", { className: classes, ...restProps }, children && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React.createElement(React.Fragment, null, children, maxCount > fileList.length && /* @__PURE__ */ React.createElement(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), fileList.length !== 0 && Array.isArray(fileList) && fileList.map((item, index) => {
14022
+ return /* @__PURE__ */ React.createElement("div", { className: classes, ...restProps }, (children || previewType === "list") && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React.createElement(React.Fragment, null, children || /* @__PURE__ */ React.createElement(Button, { size: "small", type: "primary" }, "上传文件"), maxCount > fileList.length && /* @__PURE__ */ React.createElement(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), fileList.length !== 0 && Array.isArray(fileList) && fileList.map((item, index) => {
13997
14023
  return /* @__PURE__ */ React.createElement(
13998
14024
  "div",
13999
14025
  {
14000
14026
  className: `nut-uploader__preview ${previewType}`,
14001
14027
  key: item.uid
14002
14028
  },
14003
- previewType === "picture" && !children && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-img" }, deletable && /* @__PURE__ */ React.createElement(
14029
+ previewType === "picture" && deletable && /* @__PURE__ */ React.createElement(
14004
14030
  a$n,
14005
14031
  {
14006
14032
  color: "rgba(0,0,0,0.6)",
14007
14033
  className: "close",
14008
14034
  onClick: () => onDeleteItem(item, index)
14009
14035
  }
14010
- ), item.status === "ready" ? /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React.createElement(a$n, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React.createElement(r$h, { color: "#fff" })), /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)), item.type.includes("image") ? /* @__PURE__ */ React.createElement(React.Fragment, null, item.url && /* @__PURE__ */ React.createElement(
14036
+ ),
14037
+ previewType === "picture" && !children && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-img" }, item.status === "ready" ? /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React.createElement(a$n, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React.createElement(r$h, { color: "#fff" })), /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)), item.type.includes("image") ? /* @__PURE__ */ React.createElement(React.Fragment, null, item.url && /* @__PURE__ */ React.createElement(
14011
14038
  components.Image,
14012
14039
  {
14013
14040
  className: "nut-uploader__preview-img__c",
@@ -14031,8 +14058,7 @@ var __publicField = (obj, key, value) => {
14031
14058
  className: "nut-uploader__preview-img__file__name"
14032
14059
  },
14033
14060
  /* @__PURE__ */ React.createElement(a$i, { color: "#808080" }),
14034
- " ",
14035
- item.name
14061
+ /* @__PURE__ */ React.createElement("span", null, " ", item.name)
14036
14062
  ))), item.status === "success" ? /* @__PURE__ */ React.createElement("div", { className: "tips" }, item.name) : null),
14037
14063
  previewType === "list" && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-list" }, /* @__PURE__ */ React.createElement(
14038
14064
  "div",
@@ -14041,8 +14067,7 @@ var __publicField = (obj, key, value) => {
14041
14067
  onClick: () => handleItemClick(item)
14042
14068
  },
14043
14069
  /* @__PURE__ */ React.createElement(a$i, null),
14044
- " ",
14045
- item.name
14070
+ /* @__PURE__ */ React.createElement("span", null, " ", item.name)
14046
14071
  ), deletable && /* @__PURE__ */ React.createElement(
14047
14072
  a$p,
14048
14073
  {
@@ -14340,7 +14365,8 @@ var __publicField = (obj, key, value) => {
14340
14365
  visible: true,
14341
14366
  closeOnOverlayClick,
14342
14367
  lockScroll,
14343
- onClick: onHandleClickOverlay
14368
+ onClick: onHandleClickOverlay,
14369
+ className: classNames("nut-dialog-overlay")
14344
14370
  }
14345
14371
  ) : null, /* @__PURE__ */ React.createElement(
14346
14372
  CSSTransition$1,
@@ -26,6 +26,7 @@
26
26
  line-height: 16px;
27
27
  border: $badge-border;
28
28
  border-radius: $badge-border-radius;
29
+ min-width: $badge-min-width;
29
30
  }
30
31
 
31
32
  &__content {
@@ -9,12 +9,18 @@
9
9
  padding: $dialog-padding;
10
10
  box-sizing: border-box;
11
11
 
12
+ &-overlay {
13
+ --nutui-overlay-zIndex: 1200;
14
+ }
15
+
12
16
  &__outer {
13
17
  position: fixed;
14
18
  max-height: 100%;
15
19
  overflow-y: auto;
16
20
  background-color: $white;
17
- transition: transform 0.2s, -webkit-transform 0.2s;
21
+ transition:
22
+ transform 0.2s,
23
+ -webkit-transform 0.2s;
18
24
  -webkit-overflow-scrolling: touch;
19
25
  top: 50%;
20
26
  left: 50%;