@trionesdev/antd-taro-react 0.0.2-beta.19 → 0.0.2-beta.20

package/dist/FetchPicker/FetchPicker.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["open", "fullScreen", "height", "showSearch", "searchPlaceholder", "value", "multiple", "labelInValue", "title", "cancelText", "okText", "onCancel", "onOk", "fetch", "fieldNames", "empty", "pageable", "pageSize", "optionRender", "round"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -14,11 +16,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Popup from "../Popup";
 import { Button, DotLoading, SafeArea, SpinLoading } from "../index";
-import { CheckOutline, CloseOutline, LeftOutline, SearchOutline } from "@trionesdev/antd-mobile-icons-react";
-import Space from "../Space";
+import { CheckOutline, SearchOutline } from "@trionesdev/antd-mobile-icons-react";
 import { ScrollView } from "@tarojs/components";
 import Input from "../Input";
 import { debounce, get, isEmpty, isEqual, some } from "lodash-es";
@@ -35,12 +38,6 @@ export var FetchPicker = function FetchPicker(_ref) {
     _ref$searchPlaceholde = _ref.searchPlaceholder,
     searchPlaceholder = _ref$searchPlaceholde === void 0 ? '搜索' : _ref$searchPlaceholde,
     value = _ref.value,
-    _ref$backable = _ref.backable,
-    backable = _ref$backable === void 0 ? true : _ref$backable,
-    backIcon = _ref.backIcon,
-    _ref$closable = _ref.closable,
-    closable = _ref$closable === void 0 ? true : _ref$closable,
-    closeIcon = _ref.closeIcon,
     _ref$multiple = _ref.multiple,
     multiple = _ref$multiple === void 0 ? false : _ref$multiple,
     _ref$labelInValue = _ref.labelInValue,
@@ -50,10 +47,7 @@ export var FetchPicker = function FetchPicker(_ref) {
     cancelText = _ref$cancelText === void 0 ? '取消' : _ref$cancelText,
     _ref$okText = _ref.okText,
     okText = _ref$okText === void 0 ? '确定' : _ref$okText,
-    _ref$round = _ref.round,
-    round = _ref$round === void 0 ? true : _ref$round,
-    onClose = _ref.onClose,
-    onBack = _ref.onBack,
+    onCancel = _ref.onCancel,
     onOk = _ref.onOk,
     fetch = _ref.fetch,
     fieldNames = _ref.fieldNames,
@@ -61,7 +55,10 @@ export var FetchPicker = function FetchPicker(_ref) {
     pageable = _ref.pageable,
     _ref$pageSize = _ref.pageSize,
     pageSize = _ref$pageSize === void 0 ? 20 : _ref$pageSize,
-    optionRender = _ref.optionRender;
+    optionRender = _ref.optionRender,
+    _ref$round = _ref.round,
+    round = _ref$round === void 0 ? true : _ref$round,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = fieldNames || {},
     _ref2$label = _ref2.label,
     labelFieldName = _ref2$label === void 0 ? 'label' : _ref2$label,
@@ -153,9 +150,9 @@ export var FetchPicker = function FetchPicker(_ref) {
     if (!multiple) {
       var _option = handleGetOptions(newValue);
       onOk === null || onOk === void 0 || onOk(newValue, _option);
-      onClose === null || onClose === void 0 || onClose();
+      onCancel === null || onCancel === void 0 || onCancel();
     }
-  }, [internalValue, labelFieldName, labelInValue, multiple, onClose, onOk, valueFieldName, options]);
+  }, [internalValue, labelFieldName, labelInValue, multiple, onCancel, onOk, valueFieldName, options]);
   var handleSelected = useCallback(function (item) {
     if (!internalValue || isEmpty(internalValue)) {
       return false;
@@ -201,7 +198,7 @@ export var FetchPicker = function FetchPicker(_ref) {
   }, [fetch, pageable]);
   var handleOnOk = function handleOnOk() {
     onOk === null || onOk === void 0 || onOk(internalValue, handleGetOptions(internalValue));
-    onClose === null || onClose === void 0 || onClose();
+    onCancel === null || onCancel === void 0 || onCancel();
   };
   useEffect(function () {
     if (!open) {
@@ -236,30 +233,21 @@ export var FetchPicker = function FetchPicker(_ref) {
       return handleSearchChange.cancel();
     };
   }, [handleSearchChange]);
-  var header = fullScreen ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, backable && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-head-icon"),
-    onClick: onBack
-  }, backIcon || /*#__PURE__*/React.createElement(LeftOutline, null)), closable && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-head-icon"),
-    onClick: onClose
-  }, closeIcon || /*#__PURE__*/React.createElement(CloseOutline, null))), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-head-title")
-  }, title)) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-head-button"),
-    onClick: onClose
+  var header = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(cls, "-head-button"), "".concat(cls, "-head-button-cancel")),
+    onClick: onCancel
   }, cancelText), /*#__PURE__*/React.createElement("div", {
     className: "".concat(cls, "-head-title")
-  }, title), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-head-button"),
+  }, title), multiple && /*#__PURE__*/React.createElement("div", {
+    className: classNames("".concat(cls, "-head-button"), "".concat(cls, "-head-button-ok")),
     onClick: handleOnOk
   }, okText));
-  return /*#__PURE__*/React.createElement(Popup, {
+  return /*#__PURE__*/React.createElement(Popup, _extends({}, rest, {
     open: open,
-    onClose: onClose,
-    onBack: onBack,
-    height: fullScreen ? '100%' : height !== null && height !== void 0 ? height : 'auto',
-    round: fullScreen ? false : round
-  }, /*#__PURE__*/React.createElement(SafeArea, null, /*#__PURE__*/React.createElement("div", {
+    height: fullScreen ? "calc(-24px + 100vh)" : height !== null && height !== void 0 ? height : 'auto',
+    onClose: onCancel,
+    round: round
+  }), /*#__PURE__*/React.createElement(SafeArea, null, /*#__PURE__*/React.createElement("div", {
     className: cls
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(cls, "-head")

package/dist/FetchPicker/styles.scss

@@ -1,118 +1,130 @@
-@use "../style/variable" as variable;
-
-$cls: 'triones-antm-fetch-picker';
-
-.#{$cls} {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  background-color: #f5f5f5;
-
-  &-head {
-    padding: variable.$trionesPaddingXxs;
-    background-color: white;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    border-bottom: 1Px solid variable.$trionesBorderColor;
-
-    &-icon {
-      padding: 8Px;
-    }
-
-    &-title {
-      flex: 1 auto;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-
-    &-button {
-      color: variable.$trionesColorPrimaryText;
-      display: inline-block;
-      padding: 8Px;
-    }
-
-  }
-
-  &-search-bar {
-    padding: variable.$trionesPaddingXxs;
-    background-color: white;
-
-    &-input {
-      background-color: #f5f5f5;
-    }
-  }
-
-  &-empty {
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    min-height: 100Px;
-  }
-
-  &-loading {
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    &-content {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      gap: 8Px;
-      font-size: 12Px;
-      color: #8c8c8c;
-    }
-  }
-
-  &-loading-more {
-    padding: variable.$trionesPaddingXxs;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: #8c8c8c;
-    font-size: 12Px;
-  }
-
-  &-body {
-    flex: 1 auto;
-
-    .#{$cls} {
-      &-item {
-        padding-block: variable.$trionesPaddingSm;
-        padding-inline: variable.$trionesPadding;
-        background-color: white;
-        border-bottom: 1Px solid #f0f0f0;
-        &-option{
-          display: flex;
-          &-selected{
-            background-color: #e6f4ff;
-          }
-          &-content{
-            flex: auto;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-          &-state{
-            .triones-antm-icon{
-              color: variable.$trionesColorPrimaryText;
-              font-size: variable.$trionesFontSize;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  &-footer {
-    flex-shrink: 0;
-    border-top: 1Px solid variable.$trionesBorderColor;
-    padding: variable.$trionesPaddingXxs;
-    background-color: white;
-  }
-}
+@use "../style/variable" as variable;
+
+$cls: 'triones-antm-fetch-picker';
+
+.#{$cls} {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: #f5f5f5;
+
+  &-head {
+    padding: variable.$trionesPaddingXxs;
+    background-color: white;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    border-bottom: 1Px solid variable.$trionesBorderColor;
+
+    &-icon {
+      padding: 8Px;
+    }
+
+    &-title {
+      flex: 1 auto;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+
+
+    &-button {
+      display: inline-block;
+      padding: 8Px;
+      &-cancel {
+        color: variable.$trionesColorTextSecondary;
+        display: inline-block;
+        padding: 8Px;
+      }
+
+      &-ok {
+        color: variable.$trionesColorPrimaryText;
+        display: inline-block;
+        padding: 8Px;
+      }
+    }
+
+  }
+
+  &-search-bar {
+    padding: variable.$trionesPaddingXxs;
+    background-color: white;
+
+    &-input {
+      background-color: #f5f5f5;
+    }
+  }
+
+  &-empty {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-height: 100Px;
+  }
+
+  &-loading {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &-content {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      gap: 8Px;
+      font-size: 12Px;
+      color: #8c8c8c;
+    }
+  }
+
+  &-loading-more {
+    padding: variable.$trionesPaddingXxs;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #8c8c8c;
+    font-size: 12Px;
+  }
+
+  &-body {
+    flex: 1 auto;
+
+    .#{$cls} {
+      &-item {
+        padding-block: variable.$trionesPaddingSm;
+        padding-inline: variable.$trionesPadding;
+        background-color: white;
+        border-bottom: 1Px solid #f0f0f0;
+        &-option{
+          display: flex;
+          &-selected{
+            background-color: #e6f4ff;
+          }
+          &-content{
+            flex: auto;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+          &-state{
+            .triones-antm-icon{
+              color: variable.$trionesColorPrimaryText;
+              font-size: variable.$trionesFontSize;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &-footer {
+    flex-shrink: 0;
+    border-top: 1Px solid variable.$trionesBorderColor;
+    padding: variable.$trionesPaddingXxs;
+    background-color: white;
+  }
+}

package/dist/FloatButton/style.scss

@@ -1,126 +1,126 @@
-@use "../style/variable" as variable;
-
-$floatButtonCls: "triones-antm-float-button";
-$floatButtonGroupCls: "triones-antm-float-button-group";
-
-$floatButtonSize: 48Px;
-$floatButtonShadow: 0 6Px 16Px 0 rgba(0, 0, 0, 0.08),
-  0 3Px 6Px -4Px rgba(0, 0, 0, 0.12), 0 9Px 28Px 8Px rgba(0, 0, 0, 0.05);
-
-.#{$floatButtonCls} {
-  position: fixed;
-  display: inline-flex;
-  flex-shrink: 0;
-  box-sizing: border-box;
-
-  &--embedded {
-    position: relative;
-    right: auto;
-    bottom: auto;
-    z-index: auto;
-  }
-
-  &-body {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8Px;
-    min-width: $floatButtonSize;
-    min-height: $floatButtonSize;
-    border: none;
-    border-radius: 50%;
-    cursor: pointer;
-    font-size: 20Px;
-    line-height: 1;
-    color: rgba(0, 0, 0, 0.88);
-    background: #fff;
-    box-shadow: $floatButtonShadow;
-    transition: color 0.2s, background 0.2s, box-shadow 0.2s;
-    -webkit-tap-highlight-color: transparent;
-    text-decoration: none;
-
-    &:active {
-      filter: brightness(0.95);
-    }
-  }
-
-  &--shape-square &-body {
-    border-radius: variable.$trionesBorderRadius;
-  }
-
-  &--has-content &-body {
-    min-height: $floatButtonSize;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
-
-  &--type-primary &-body {
-    color: #fff;
-    background: variable.$trionesColorPrimary;
-  }
-
-  &-icon {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  &-content {
-    font-size: variable.$trionesFontSizeSm;
-    font-weight: 500;
-    white-space: nowrap;
-  }
-}
-
-.#{$floatButtonGroupCls} {
-  position: fixed;
-  display: flex;
-  gap: 12Px;
-  align-items: flex-end;
-  box-sizing: border-box;
-
-  &--placement {
-    &-top {
-      flex-direction: column;
-    }
-    &-bottom {
-      flex-direction: column;
-    }
-    &-left {
-      flex-direction: row;
-    }
-    &-right {
-      flex-direction: row;
-    }
-  }
-
-  &--menu {
-    align-items: center;
-  }
-
-  &-list {
-    display: flex;
-    flex-direction: column;
-    gap: 12Px;
-    align-items: flex-end;
-
-    &--hidden {
-      display: none;
-    }
-  }
-
-  &--placement-left &-list,
-  &--placement-right &-list {
-    flex-direction: column;
-  }
-
-  /** 小程序点击外部关闭：全屏遮罩；极淡背景避免部分机型不响应 tap */
-  &-weapp-outside-mask {
-    background: rgba(0, 0, 0, 0.001);
-  }
-}
+@use "../style/variable" as variable;
+
+$floatButtonCls: "triones-antm-float-button";
+$floatButtonGroupCls: "triones-antm-float-button-group";
+
+$floatButtonSize: 48Px;
+$floatButtonShadow: 0 6Px 16Px 0 rgba(0, 0, 0, 0.08),
+  0 3Px 6Px -4Px rgba(0, 0, 0, 0.12), 0 9Px 28Px 8Px rgba(0, 0, 0, 0.05);
+
+.#{$floatButtonCls} {
+  position: fixed;
+  display: inline-flex;
+  flex-shrink: 0;
+  box-sizing: border-box;
+
+  &--embedded {
+    position: relative;
+    right: auto;
+    bottom: auto;
+    z-index: auto;
+  }
+
+  &-body {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8Px;
+    min-width: $floatButtonSize;
+    min-height: $floatButtonSize;
+    border: none;
+    border-radius: 50%;
+    cursor: pointer;
+    font-size: 20Px;
+    line-height: 1;
+    color: rgba(0, 0, 0, 0.88);
+    background: #fff;
+    box-shadow: $floatButtonShadow;
+    transition: color 0.2s, background 0.2s, box-shadow 0.2s;
+    -webkit-tap-highlight-color: transparent;
+    text-decoration: none;
+
+    &:active {
+      filter: brightness(0.95);
+    }
+  }
+
+  &--shape-square &-body {
+    border-radius: variable.$trionesBorderRadius;
+  }
+
+  &--has-content &-body {
+    min-height: $floatButtonSize;
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
+  &--type-primary &-body {
+    color: #fff;
+    background: variable.$trionesColorPrimary;
+  }
+
+  &-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  &-content {
+    font-size: variable.$trionesFontSizeSm;
+    font-weight: 500;
+    white-space: nowrap;
+  }
+}
+
+.#{$floatButtonGroupCls} {
+  position: fixed;
+  display: flex;
+  gap: 12Px;
+  align-items: flex-end;
+  box-sizing: border-box;
+
+  &--placement {
+    &-top {
+      flex-direction: column;
+    }
+    &-bottom {
+      flex-direction: column;
+    }
+    &-left {
+      flex-direction: row;
+    }
+    &-right {
+      flex-direction: row;
+    }
+  }
+
+  &--menu {
+    align-items: center;
+  }
+
+  &-list {
+    display: flex;
+    flex-direction: column;
+    gap: 12Px;
+    align-items: flex-end;
+
+    &--hidden {
+      display: none;
+    }
+  }
+
+  &--placement-left &-list,
+  &--placement-right &-list {
+    flex-direction: column;
+  }
+
+  /** 小程序点击外部关闭：全屏遮罩；极淡背景避免部分机型不响应 tap */
+  &-weapp-outside-mask {
+    background: rgba(0, 0, 0, 0.001);
+  }
+}