@teamix/pro 1.5.23 → 1.5.25

package/es/form/Filter/index2.js

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

package/es/form/ProForm/index.js

@@ -22,6 +22,7 @@ import useAutoLayout from './useAutoLayout';
 import useInitialRequest from './useInitialRequest';
 import validateLocale from '../locales/validate';
 import './index.scss';
+import FormItem2 from '../Components/FormItem2';
 registerValidateLocale(validateLocale);
 var formilyComponents = {
   FormLayout: FormLayout,
@@ -49,7 +50,8 @@ var formilyComponents = {
   SelectTable: SelectTable,
   Affix: Affix,
   LightFilter: LightFilter,
-  Text: Text
+  Text: Text,
+  FormItem2: FormItem2
 };
 var ProForm = /*#__PURE__*/memo(function (_ref) {
   var outerForm = _ref.form,

package/es/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/es/image/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["src", "transformUrl"];
+var _excluded = ["src", "transformUrl", "theme"];
 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; }
@@ -21,8 +21,9 @@ var localeMap = {
 export default (function (props) {
   var src = props.src,
     transformUrl = props.transformUrl,
+    themeProp = props.theme,
     extra = _objectWithoutProperties(props, _excluded);
-  var _useState = useState(props.theme || 'light'),
+  var _useState = useState(themeProp || 'light'),
     _useState2 = _slicedToArray(_useState, 2),
     theme = _useState2[0],
     setTheme = _useState2[1];

package/es/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.25";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.23';
+var version = '1.5.25';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

package/es/table/components/ToolBar/index.js

@@ -166,7 +166,7 @@ var ToolBar = function ToolBar(props) {
       flat: flat
     }),
     ref: toolBarRef
-  }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape, /*#__PURE__*/React.createElement("div", {
+  }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape, toolBarAutoWidth && /*#__PURE__*/React.createElement("div", {
     className: cls('shadow'),
     ref: toolBarContentRef
   }, renderFlatShape));

package/es/table/index.js

@@ -191,7 +191,7 @@ var ProTable = function ProTable(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     sort = _useState10[0],
     setSort = _useState10[1];
-  var _useState11 = useState(!propsDataSource && requestWhenMount && propsShowSkeleton && !!url),
+  var _useState11 = useState(!propsDataSource && requestWhenMount && propsShowSkeleton),
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -677,7 +677,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 () {
@@ -840,7 +840,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 () {
@@ -873,7 +873,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/es/table/index.scss

@@ -1,3 +1,4 @@
+@import "xconsole";
 $prefix: 'teamix-pro-table';
 $fullscreenPadding: 24px;
 

package/es/table/xconsole.scss

@@ -0,0 +1,6 @@
+.theme-xconsole {
+  .next-menu-item-inner {
+    display: flex;
+    align-items: center;
+  }
+}

package/es/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/lib/actions/index.js

@@ -147,6 +147,7 @@ var buttonContent = function buttonContent(content, iconType, iconSize, context)
     return renderedContent;
   }
   return [/*#__PURE__*/_react.default.createElement(_icon.default, {
+    className: 'teamix-pro-action-prefix-icon',
     type: iconType,
     size: iconSize,
     key: "teamix-button-icon"
@@ -156,7 +157,7 @@ var ProActionButton = function ProActionButton(props) {
   var config = props.config,
     icon = props.icon,
     _props$iconSize = props.iconSize,
-    iconSize = _props$iconSize === void 0 ? 'medium' : _props$iconSize,
+    iconSize = _props$iconSize === void 0 ? 'small' : _props$iconSize,
     _props$type = props.type,
     type = _props$type === void 0 ? 'primary' : _props$type,
     context = props.context,
@@ -238,7 +239,7 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
   if (dataTeamixSpm) {
     buttonProps['data-teamix-spm'] = dataTeamixSpm;
   }
-  var content = buttonContent(children, icon, undefined, context);
+  var content = buttonContent(children, icon, 'small', context);
   var baseToolTipProps = _objectSpread({
     triggerType: 'hover',
     align: 't',
@@ -286,7 +287,8 @@ function renderCommonActionButtonMenuItem(action, key, context, dataTeamixSpm) {
 }
 var ProActionMenuButton = function ProActionMenuButton(props) {
   var icon = props.icon,
-    iconSize = props.iconSize,
+    _props$iconSize2 = props.iconSize,
+    iconSize = _props$iconSize2 === void 0 ? 'small' : _props$iconSize2,
     label = props.label,
     actions = props.actions,
     children = props.children,

package/lib/actions/index.scss

@@ -139,3 +139,7 @@
     background: var(--drawer-bg);
   }
 }
+
+.teamix-pro-action-prefix-icon {
+  margin-right: 4px
+}

package/lib/form/Components/FormItem2/animation.scss

@@ -0,0 +1,72 @@
+@-webkit-keyframes antShowHelpIn {
+  0% {
+    -webkit-transform: translateY(-5px);
+    transform: translateY(-5px);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
+.#{$form-item-cls}-help-appear,
+.#{$form-item-cls}-help-enter {
+  -webkit-animation-duration: 0.3s;
+  animation-duration: 0.3s;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+  -webkit-animation-play-state: paused;
+  animation-play-state: paused;
+}
+
+.#{$form-item-cls}-help-appear.#{$form-item-cls}-help-appear-active,
+.#{$form-item-cls}-help-enter.#{$form-item-cls}-help-enter-active {
+  -webkit-animation-name: antShowHelpIn;
+  animation-name: antShowHelpIn;
+  -webkit-animation-play-state: running;
+  animation-play-state: running;
+}
+
+.#{$form-item-cls}-help-appear,
+.#{$form-item-cls}-help-enter {
+  opacity: 0;
+}
+
+.#{$form-item-cls}-help-appear,
+.#{$form-item-cls}-help-enter {
+  -webkit-animation-timing-function: cubic-bezier(0.645, 0.045, 0.355, 1);
+  animation-timing-function: cubic-bezier(0.645, 0.045, 0.355, 1);
+}
+
+@keyframes antShowHelpIn {
+  0% {
+    -webkit-transform: translateY(-5px);
+    transform: translateY(-5px);
+    opacity: 0;
+  }
+
+  to {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
+@-webkit-keyframes antShowHelpOut {
+  to {
+    -webkit-transform: translateY(-5px);
+    transform: translateY(-5px);
+    opacity: 0;
+  }
+}
+
+@keyframes antShowHelpOut {
+  to {
+    -webkit-transform: translateY(-5px);
+    transform: translateY(-5px);
+    opacity: 0;
+  }
+}

package/lib/form/Components/FormItem2/grid.scss

@@ -0,0 +1,173 @@
+.#{$form-item-cls} {
+  .#{$form-item-cls}-item-col-24 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 100%;
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+
+  .#{$form-item-cls}-item-col-23 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 95.83333333%;
+    flex: 0 0 95.83333333%;
+    max-width: 95.83333333%;
+  }
+
+  .#{$form-item-cls}-item-col-22 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 91.66666667%;
+    flex: 0 0 91.66666667%;
+    max-width: 91.66666667%;
+  }
+
+  .#{$form-item-cls}-item-col-21 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 87.5%;
+    flex: 0 0 87.5%;
+    max-width: 87.5%;
+  }
+
+  .#{$form-item-cls}-item-col-20 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 83.33333333%;
+    flex: 0 0 83.33333333%;
+    max-width: 83.33333333%;
+  }
+
+  .#{$form-item-cls}-item-col-19 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 79.16666667%;
+    flex: 0 0 79.16666667%;
+    max-width: 79.16666667%;
+  }
+
+  .#{$form-item-cls}-item-col-18 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 75%;
+    flex: 0 0 75%;
+    max-width: 75%;
+  }
+
+  .#{$form-item-cls}-item-col-17 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 70.83333333%;
+    flex: 0 0 70.83333333%;
+    max-width: 70.83333333%;
+  }
+
+  .#{$form-item-cls}-item-col-16 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 66.66666667%;
+    flex: 0 0 66.66666667%;
+    max-width: 66.66666667%;
+  }
+
+  .#{$form-item-cls}-item-col-15 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 62.5%;
+    flex: 0 0 62.5%;
+    max-width: 62.5%;
+  }
+
+  .#{$form-item-cls}-item-col-14 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 58.33333333%;
+    flex: 0 0 58.33333333%;
+    max-width: 58.33333333%;
+  }
+
+  .#{$form-item-cls}-item-col-13 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 54.16666667%;
+    flex: 0 0 54.16666667%;
+    max-width: 54.16666667%;
+  }
+
+  .#{$form-item-cls}-item-col-12 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 50%;
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+
+  .#{$form-item-cls}-item-col-11 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 45.83333333%;
+    flex: 0 0 45.83333333%;
+    max-width: 45.83333333%;
+  }
+
+  .#{$form-item-cls}-item-col-10 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 41.66666667%;
+    flex: 0 0 41.66666667%;
+    max-width: 41.66666667%;
+  }
+
+  .#{$form-item-cls}-item-col-9 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 37.5%;
+    flex: 0 0 37.5%;
+    max-width: 37.5%;
+  }
+
+  .#{$form-item-cls}-item-col-8 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 33.33333333%;
+    flex: 0 0 33.33333333%;
+    max-width: 33.33333333%;
+  }
+
+  .#{$form-item-cls}-item-col-7 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 29.16666667%;
+    flex: 0 0 29.16666667%;
+    max-width: 29.16666667%;
+  }
+
+  .#{$form-item-cls}-item-col-6 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 25%;
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+
+  .#{$form-item-cls}-item-col-5 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 20.83333333%;
+    flex: 0 0 20.83333333%;
+    max-width: 20.83333333%;
+  }
+
+  .#{$form-item-cls}-item-col-4 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 16.66666667%;
+    flex: 0 0 16.66666667%;
+    max-width: 16.66666667%;
+  }
+
+  .#{$form-item-cls}-item-col-3 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 12.5%;
+    flex: 0 0 12.5%;
+    max-width: 12.5%;
+  }
+
+  .#{$form-item-cls}-item-col-2 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 8.33333333%;
+    flex: 0 0 8.33333333%;
+    max-width: 8.33333333%;
+  }
+
+  .#{$form-item-cls}-item-col-1 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 4.16666667%;
+    flex: 0 0 4.16666667%;
+    max-width: 4.16666667%;
+  }
+
+  .#{$form-item-cls}-item-col-0 {
+    display: none;
+  }
+}

package/lib/form/Components/FormItem2/index.d.ts

@@ -0,0 +1,41 @@
+import React from 'react';
+export interface IFormItemProps {
+    className?: string;
+    style?: React.CSSProperties;
+    prefix?: string;
+    label?: React.ReactNode;
+    colon?: boolean;
+    layout?: 'vertical' | 'horizontal' | 'inline';
+    tooltip?: React.ReactNode;
+    tooltipLayout?: 'icon' | 'text';
+    tooltipIcon?: React.ReactNode;
+    labelStyle?: React.CSSProperties;
+    labelAlign?: 'left' | 'right';
+    labelWrap?: boolean;
+    labelWidth?: number | string;
+    wrapperWidth?: number | string;
+    labelCol?: number;
+    wrapperCol?: number;
+    wrapperAlign?: 'left' | 'right';
+    wrapperWrap?: boolean;
+    wrapperStyle?: React.CSSProperties;
+    fullness?: boolean;
+    addonBefore?: React.ReactNode;
+    addonAfter?: React.ReactNode;
+    size?: 'small' | 'default' | 'large';
+    inset?: boolean;
+    extra?: React.ReactNode;
+    feedbackText?: React.ReactNode;
+    feedbackLayout?: 'loose' | 'terse' | 'popover' | 'none' | 'hover-popover' | (string & {});
+    feedbackStatus?: 'error' | 'warning' | 'success' | 'pending' | (string & {});
+    feedbackIcon?: React.ReactNode;
+    asterisk?: boolean;
+    gridSpan?: number;
+    bordered?: boolean;
+}
+declare type ComposeFormItem = React.FC<React.PropsWithChildren<IFormItemProps>> & {
+    BaseItem?: React.FC<React.PropsWithChildren<IFormItemProps>>;
+};
+export declare const BaseItem: React.FC<React.PropsWithChildren<IFormItemProps>>;
+export declare const FormItem2: ComposeFormItem;
+export default FormItem2;