@teamix/pro 1.5.23 → 1.5.24

package/lib/form/Components/form-layout/index.js

@@ -0,0 +1,88 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFormShallowLayout = exports.useFormLayout = exports.useFormDeepLayout = exports.default = exports.FormLayoutShallowContext = exports.FormLayoutDeepContext = exports.FormLayout = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _useResponsiveFormLayout = require("./useResponsiveFormLayout");
+var _builtins__ = require("../__builtins__");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _excluded = ["shallow", "children", "prefix", "className", "style"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+var FormLayoutDeepContext = /*#__PURE__*/(0, _react.createContext)({});
+exports.FormLayoutDeepContext = FormLayoutDeepContext;
+var FormLayoutShallowContext = /*#__PURE__*/(0, _react.createContext)({});
+exports.FormLayoutShallowContext = FormLayoutShallowContext;
+var useFormDeepLayout = function useFormDeepLayout() {
+  return (0, _react.useContext)(FormLayoutDeepContext);
+};
+exports.useFormDeepLayout = useFormDeepLayout;
+var useFormShallowLayout = function useFormShallowLayout() {
+  return (0, _react.useContext)(FormLayoutShallowContext);
+};
+exports.useFormShallowLayout = useFormShallowLayout;
+var useFormLayout = function useFormLayout() {
+  return _objectSpread(_objectSpread({}, useFormDeepLayout()), useFormShallowLayout());
+};
+exports.useFormLayout = useFormLayout;
+var FormLayout = function FormLayout(_ref) {
+  var _cls;
+  var shallow = _ref.shallow,
+    children = _ref.children,
+    prefix = _ref.prefix,
+    className = _ref.className,
+    style = _ref.style,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
+  var _useResponsiveFormLay = (0, _useResponsiveFormLayout.useResponsiveFormLayout)(otherProps),
+    ref = _useResponsiveFormLay.ref,
+    props = _useResponsiveFormLay.props;
+  var deepLayout = useFormDeepLayout();
+  var formPrefixCls = (0, _builtins__.usePrefixCls)('form', {
+    prefix: prefix
+  });
+  var layoutPrefixCls = (0, _builtins__.usePrefixCls)('formily-layout', {
+    prefix: prefix
+  });
+  var layoutClassName = (0, _classnames.default)(layoutPrefixCls, (_cls = {}, _defineProperty(_cls, "".concat(formPrefixCls, "-").concat(props.layout), true), _defineProperty(_cls, "".concat(formPrefixCls, "-rtl"), props.direction === 'rtl'), _defineProperty(_cls, "".concat(formPrefixCls, "-").concat(props.size), props.size), _cls), className);
+  var renderChildren = function renderChildren() {
+    var newDeepLayout = _objectSpread({}, deepLayout);
+    if (!shallow) {
+      Object.assign(newDeepLayout, props);
+    } else {
+      if (props.size) {
+        newDeepLayout.size = props.size;
+      }
+      if (props.colon) {
+        newDeepLayout.colon = props.colon;
+      }
+    }
+    return /*#__PURE__*/_react.default.createElement(FormLayoutDeepContext.Provider, {
+      value: newDeepLayout
+    }, /*#__PURE__*/_react.default.createElement(FormLayoutShallowContext.Provider, {
+      value: shallow ? props : undefined
+    }, children));
+  };
+  return /*#__PURE__*/_react.default.createElement("div", {
+    ref: ref,
+    className: layoutClassName,
+    style: style
+  }, renderChildren());
+};
+exports.FormLayout = FormLayout;
+FormLayout.defaultProps = {
+  shallow: true
+};
+FormLayout.useFormDeepLayout = useFormDeepLayout;
+FormLayout.useFormShallowLayout = useFormShallowLayout;
+FormLayout.useFormLayout = useFormLayout;
+var _default = FormLayout;
+exports.default = _default;

package/lib/form/Components/form-layout/style.d.ts

@@ -0,0 +1 @@
+

package/lib/form/Components/form-layout/style.js

@@ -0,0 +1,3 @@
+"use strict";
+
+// @ts-ignore

package/lib/form/Components/form-layout/useResponsiveFormLayout.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="react" />
+interface IProps {
+    breakpoints?: number[];
+    layout?: 'vertical' | 'horizontal' | 'inline' | ('vertical' | 'horizontal' | 'inline')[];
+    labelCol?: number | number[];
+    wrapperCol?: number | number[];
+    labelAlign?: 'right' | 'left' | ('right' | 'left')[];
+    wrapperAlign?: 'right' | 'left' | ('right' | 'left')[];
+    [props: string]: any;
+}
+interface IUseResponsiveFormLayout {
+    (props: IProps): {
+        ref: React.MutableRefObject<HTMLDivElement>;
+        props: any;
+    };
+}
+export declare const useResponsiveFormLayout: IUseResponsiveFormLayout;
+export {};

package/lib/form/Components/form-layout/useResponsiveFormLayout.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useResponsiveFormLayout = void 0;
+var _react = require("react");
+var _shared = require("@formily/shared");
+var _excluded = ["breakpoints", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"];
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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; }
+var calcBreakpointIndex = function calcBreakpointIndex(breakpoints, width) {
+  for (var i = 0; i < breakpoints.length; i++) {
+    if (width <= breakpoints[i]) {
+      return i;
+    }
+  }
+};
+var calcFactor = function calcFactor(value, breakpointIndex) {
+  if (Array.isArray(value)) {
+    var _value$breakpointInde;
+    if (breakpointIndex === -1) return value[0];
+    return (_value$breakpointInde = value[breakpointIndex]) !== null && _value$breakpointInde !== void 0 ? _value$breakpointInde : value[value.length - 1];
+  } else {
+    return value;
+  }
+};
+var factor = function factor(value, breakpointIndex) {
+  return (0, _shared.isValid)(value) ? calcFactor(value, breakpointIndex) : value;
+};
+var calculateProps = function calculateProps(target, props) {
+  var clientWidth = target.clientWidth;
+  var breakpoints = props.breakpoints,
+    layout = props.layout,
+    labelAlign = props.labelAlign,
+    wrapperAlign = props.wrapperAlign,
+    labelCol = props.labelCol,
+    wrapperCol = props.wrapperCol,
+    otherProps = _objectWithoutProperties(props, _excluded);
+  var breakpointIndex = calcBreakpointIndex(breakpoints, clientWidth);
+  return _objectSpread({
+    layout: factor(layout, breakpointIndex),
+    labelAlign: factor(labelAlign, breakpointIndex),
+    wrapperAlign: factor(wrapperAlign, breakpointIndex),
+    labelCol: factor(labelCol, breakpointIndex),
+    wrapperCol: factor(wrapperCol, breakpointIndex)
+  }, otherProps);
+};
+var useResponsiveFormLayout = function useResponsiveFormLayout(props) {
+  var ref = (0, _react.useRef)(null);
+  var breakpoints = props.breakpoints;
+  if (!(0, _shared.isArr)(breakpoints)) {
+    return {
+      ref: ref,
+      props: props
+    };
+  }
+  var _useState = (0, _react.useState)(props),
+    _useState2 = _slicedToArray(_useState, 2),
+    layoutProps = _useState2[0],
+    setLayout = _useState2[1];
+  var updateUI = function updateUI() {
+    if (ref.current) {
+      setLayout(calculateProps(ref.current, props));
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var observer = function observer() {
+      updateUI();
+    };
+    var resizeObserver = new ResizeObserver(observer);
+    if (ref.current) {
+      resizeObserver.observe(ref.current);
+    }
+    updateUI();
+    return function () {
+      resizeObserver.disconnect();
+    };
+  }, []);
+  return {
+    ref: ref,
+    props: layoutProps
+  };
+};
+exports.useResponsiveFormLayout = useResponsiveFormLayout;

package/lib/form/Filter/AdvancedFilter.js

@@ -74,7 +74,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             component: 'Submit',
             props: {
               style: {
-                marginRight: -8
+                marginRight: -4
               },
               children: (0, _utils.getMessage)('search')
             }

package/lib/form/Filter/index2.js

@@ -131,7 +131,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             component: 'Submit',
             props: {
               style: _objectSpread({}, triggerType === 'submit' ? {
-                marginRight: -8
+                marginRight: -4
               } : {
                 display: 'none'
               }),

package/lib/form/ProForm/index.js

@@ -23,6 +23,7 @@ var _useAutoLayout = _interopRequireDefault(require("./useAutoLayout"));
 var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 var _validate = _interopRequireDefault(require("../locales/validate"));
 require("./index.scss");
+var _FormItem = _interopRequireDefault(require("../Components/FormItem2"));
 var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -59,7 +60,8 @@ var formilyComponents = {
   SelectTable: _formily.SelectTable,
   Affix: _components.Affix,
   LightFilter: _LightFilter.default,
-  Text: _index.default
+  Text: _index.default,
+  FormItem2: _FormItem.default
 };
 var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var outerForm = _ref.form,

package/lib/image/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export declare type ProImageProps = {
     src: {
         /** 中文亮色图片地址，默认 url */
@@ -16,6 +17,6 @@ export declare type ProImageProps = {
     theme?: 'dark' | 'light';
     /** 自定义改造 url 的函数 */
     transformUrl?: (value: string) => string;
-};
+} & React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
 declare const _default: (props: ProImageProps) => JSX.Element | null;
 export default _default;

package/lib/image/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _utils = require("@teamix/utils");
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
-var _excluded = ["src", "transformUrl"];
+var _excluded = ["src", "transformUrl", "theme"];
 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; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -30,8 +30,9 @@ var localeMap = {
 var _default = function _default(props) {
   var src = props.src,
     transformUrl = props.transformUrl,
+    themeProp = props.theme,
     extra = _objectWithoutProperties(props, _excluded);
-  var _useState = (0, _react.useState)(props.theme || 'light'),
+  var _useState = (0, _react.useState)(themeProp || 'light'),
     _useState2 = _slicedToArray(_useState, 2),
     theme = _useState2[0],
     setTheme = _useState2[1];

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.23";
+declare const version = "1.5.24";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.23';
+var version = '1.5.24';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/table/index.js

@@ -212,7 +212,7 @@ var ProTable = function ProTable(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     sort = _useState10[0],
     setSort = _useState10[1];
-  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton && !!url),
+  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -698,7 +698,7 @@ var ProTable = function ProTable(props) {
     // 如果开启了 autoRedirect 当当前页数不为1，并且data为空的时候，重定向到第一页
     if (autoRedirect) {
       var _next$data;
-      if (!(next === null || next === void 0 ? void 0 : (_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length) && pageSize > 1) {
+      if (!(next === null || next === void 0 ? void 0 : (_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length) && currentPage > 1) {
         setCurrentPage(1);
         setShowLoading(true);
         setTimeout(function () {
@@ -861,7 +861,7 @@ var ProTable = function ProTable(props) {
           if (success === true) {
             // 如果开启了 autoRedirect 当当前页数不为1，并且data为空的时候，重定向到第一页
             if (autoRedirect) {
-              if (!(dataRes === null || dataRes === void 0 ? void 0 : dataRes.length) && pageSize > 1) {
+              if (!(dataRes === null || dataRes === void 0 ? void 0 : dataRes.length) && currentPage > 1) {
                 setCurrentPage(1);
                 setShowLoading(true);
                 setTimeout(function () {
@@ -894,7 +894,7 @@ var ProTable = function ProTable(props) {
             time = 60 * 1000;
           }
           if (autoRefresh && typeof autoRefresh !== 'boolean') {
-            time = autoRefresh ? autoRefresh(data) : 0;
+            time = autoRefresh ? autoRefresh(dataRes) : 0;
           }
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {

package/lib/xconsole.scss

@@ -1,4 +1,5 @@
 .theme-xconsole {
+  --tab-item-padding-lr-size-m: var(--s-4, 16px);
   --color-event-p9: rgba(121, 197, 224, 1);
   --color-event-p10: rgba(175, 222, 240, 1);
   --color-event-p8: rgba(73, 173, 209, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",