@teamix/pro 1.4.6 → 1.4.9

package/lib/actions/dialog-form.js

@@ -59,6 +59,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 toJS = _form.formilyReactive.toJS;
+
 function getDefaultFormPropsByDialogSize(size) {
   if (size === 'small') {
     return {
@@ -205,51 +207,55 @@ function useDialogFormAction(action, context) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var _innerFormRef$current;
 
-          var beforeRequestContext, requestContext;
+          var beforeRequestContext, fields, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
+                  fields = toJS((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
+
                   if (!propsBeforeRequest) {
-                    _context.next = 13;
+                    _context.next = 14;
                     break;
                   }
 
-                  _context.prev = 1;
-                  _context.next = 4;
-                  return (0, _utils.resolveMaybePromiseMethod)(propsBeforeRequest, context);
+                  _context.prev = 2;
+                  _context.next = 5;
+                  return (0, _utils.resolveMaybePromiseMethod)(propsBeforeRequest, _objectSpread(_objectSpread({}, context), {}, {
+                    fields: fields
+                  }));
 
-                case 4:
+                case 5:
                   beforeRequestContext = _context.sent;
-                  _context.next = 10;
+                  _context.next = 11;
                   break;
 
-                case 7:
-                  _context.prev = 7;
-                  _context.t0 = _context["catch"](1);
+                case 8:
+                  _context.prev = 8;
+                  _context.t0 = _context["catch"](2);
                   beforeRequestContext = false;
 
-                case 10:
+                case 11:
                   if (!(beforeRequestContext === false)) {
-                    _context.next = 13;
+                    _context.next = 14;
                     break;
                   }
 
                   reject(false);
                   return _context.abrupt("return");
 
-                case 13:
+                case 14:
                   requestContext = Object.assign({
-                    fields: (_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values
+                    fields: fields
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
-                case 15:
+                case 16:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[1, 7]]);
+          }, _callee, null, [[2, 8]]);
         }))).catch(function () {
           resolve(false);
         });

package/lib/actions/dialog.d.ts

@@ -4,7 +4,7 @@ import { quickShowDrawerProps } from '@alicloudfe/components/types/drawer';
 import { ProFormSchema, ProFormSchemaItem } from '../form';
 import { ProMessageProps } from '../utils/message';
 import { RequestAction } from './request';
-export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShowConfig, 'onError' | 'type'>, Omit<quickShowDrawerProps, 'trigger' | 'animation' | 'height' | 'locale' | 'onOk' | 'onCancel' | 'onError'> {
+export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShowConfig, 'onError' | 'type'>, Omit<quickShowDrawerProps, 'trigger' | 'animation' | 'height' | 'locale' | 'onError'> {
     /** 点击「确认按钮」后的数据请求地址，非必填，不填就不发请求 */
     url?: string;
     /** 弹窗类型，支持普通弹窗和抽屉两种模式，默认为普通弹窗 */
@@ -25,6 +25,10 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     schema?: any;
     /** 弹窗内容区的组件 */
     component?: any;
+    /** 点击确定自定义回调函数 */
+    onOk?: any;
+    /** 点击取消自定义回调函数  */
+    onCancel?: any;
 }
 export declare function useDialogAction(action: DialogAction, actionContext?: any, hasForm?: boolean): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog.js

@@ -30,7 +30,7 @@ var _request = require("./request");
 
 var _utils2 = require("./utils");
 
-var _excluded = ["trigger", "url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
+var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
     _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -77,7 +77,9 @@ var FooterForm = function FooterForm(props) {
   var schema = props.schema,
       context = props.context,
       formRef = props.formRef;
-  var form = (0, _form.createForm)();
+  var form = (0, _react.useMemo)(function () {
+    return (0, _form.createForm)();
+  }, []);
   (0, _react.useEffect)(function () {
     formRef.current = form;
   }, []);
@@ -110,6 +112,7 @@ function useDialogAction(action, actionContext, hasForm) {
 
     var trigger = action.trigger,
         url = action.url,
+        customRequest = action.customRequest,
         method = action.method,
         params = action.params,
         data = action.data,
@@ -120,6 +123,8 @@ function useDialogAction(action, actionContext, hasForm) {
         formatResult = action.formatResult,
         onSuccess = action.onSuccess,
         onError = action.onError,
+        propsOnOk = action.onOk,
+        propsOnCancel = action.onCancel,
         others = _objectWithoutProperties(action, _excluded);
 
     var _getTargetValue = (0, _utils.getTargetValue)(others, context),
@@ -200,33 +205,34 @@ function useDialogAction(action, actionContext, hasForm) {
 
                 case 6:
                   onFinish && onFinish();
+                  propsOnOk && propsOnOk(context);
                   resolve(true);
-                  _context.next = 18;
+                  _context.next = 19;
                   break;
 
-                case 10:
-                  _context.prev = 10;
+                case 11:
+                  _context.prev = 11;
                   _context.t0 = _context["catch"](2);
                   setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form，则直接关闭弹窗
 
                   if (!(beforeRequest && !hasForm)) {
-                    _context.next = 16;
+                    _context.next = 17;
                     break;
                   }
 
                   resolve(true);
                   return _context.abrupt("return");
 
-                case 16:
+                case 17:
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 18:
+                case 19:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[2, 10]]);
+          }, _callee, null, [[2, 11]]);
         }));
 
         return function (_x) {
@@ -249,7 +255,9 @@ function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
+    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "onCancel", function onCancel() {
+      propsOnCancel && propsOnCancel(context);
+    }), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-message"

package/lib/card/index.js

@@ -267,8 +267,7 @@ var ProCard = function ProCard(props) {
       value: description,
       type: "text",
       render: {
-        ellipsis: true,
-        tooltip: description
+        ellipsis: true
       }
     })));
   };

package/lib/card/index.scss

@@ -32,7 +32,7 @@
     $grid-columns: 24;
     @for $i from 1 through $grid-columns {
       &-#{$i} {
-        $width: percentage($i/$grid-columns);
+        $width: percentage($i / $grid-columns);
         flex: 0 0 $width;
         width: $width;
         max-width: $width;
@@ -52,7 +52,7 @@
       }
     }
 
-    &-name{
+    &-name {
       flex-shrink: 0;
     }
 

package/lib/form/Components/LightFilter/index.js

@@ -135,6 +135,11 @@ var LightFilter = (0, _react2.observer)(function (props) {
     setActive(value);
     onFilterChange && onFilterChange(value);
   }, [onFilterChange]);
+  (0, _react.useEffect)(function () {
+    if (!filterItems.length) {
+      setActive(undefined);
+    }
+  }, [filterItems.length]);
   return /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(basePrefix(size), prefixCls({
       '': true,
@@ -143,7 +148,7 @@ var LightFilter = (0, _react2.observer)(function (props) {
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: prefixCls('main')
   }, /*#__PURE__*/_react.default.createElement(_components.Select, _objectSpread(_objectSpread({}, filterProps), {}, {
-    className: (0, _classnames.default)(prefixCls('select'), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
+    className: (0, _classnames.default)(prefixCls('select'), _defineProperty({}, prefixCls('select-none'), !content.length), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
     dataSource: filterItems,
     onChange: onSelectChange,
     value: active

package/lib/form/Components/LightFilter/index.scss

@@ -37,6 +37,11 @@ $light-filter: #{teamix-pro-form}-light-filter;
         padding-right: 0;
       }
     }
+    .#{$light-filter}-select-none {
+      .#{$css-prefix}input-control {
+        padding-right: var(--input-m-icon-padding-right, 8px);
+      }
+    }
   }
 
   // 按钮后缀

package/lib/form/Filter/index.js

@@ -45,7 +45,7 @@ var _useBindUrl2 = _interopRequireDefault(require("./useBindUrl"));
 
 require("./index.scss");
 
-var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "bindUrl", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "bindUrl", "onFilter", "onInit", "onReset", "onExpand", "onChange", "form"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -106,6 +106,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       outerReset = props.onReset,
       onExpand = props.onExpand,
       onChange = props.onChange,
+      form = props.form,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var _useSpecialProps = (0, _useSpecialProps2.default)(props),
@@ -324,7 +325,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         });
       }
     });
-  }, []); // 创建轻量筛选表单实例
+  }, [form]); // 创建轻量筛选表单实例
 
   var lightForm = (0, _react.useMemo)(function () {
     return (0, _core.createForm)({
@@ -335,7 +336,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         });
       }
     });
-  }, []); // 创建高级筛选表单实例
+  }, [form]); // 创建高级筛选表单实例
 
   var advancedForm = (0, _react.useMemo)(function () {
     return (0, _core.createForm)({
@@ -355,7 +356,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         });
       }
     });
-  }, []);
+  }, [form]);
   var formMap = {
     simple: simpleForm,
     light: lightForm,

package/lib/form/ProForm/index.js

@@ -121,7 +121,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     return outerForm || (0, _core.createForm)({
       validateFirst: validateFirst
     });
-  }, []);
+  }, [outerForm]);
   var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
   var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
@@ -182,7 +182,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         });
       });
     }
-  }, [onChange]);
+  }, [onChange, form]);
   (0, _react.useEffect)(function () {
     // 配置国际化
     (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');

package/lib/form/ProForm/index.scss

@@ -332,6 +332,11 @@
   }
 }
 
+// ArrayTable
+.#{$form-array}-table-status-select {
+  display: none;
+}
+
 // SelectTable
 .#{$teamix-pro-form}-select-table-column-tree
   > .#{$css-prefix}table-cell-wrapper {

package/lib/form/SchemaForm/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@formily/react");
 
+var _utils = require("@teamix/utils");
+
 var _adapterType = _interopRequireDefault(require("./adapterType"));
 
 var _adapterComponent = _interopRequireDefault(require("./adapterComponent"));
@@ -49,7 +51,7 @@ var _reactions = require("./reactions");
 
 var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
 
-var _utils = require("../utils");
+var _utils2 = require("../utils");
 
 var _warning = _interopRequireDefault(require("../warning"));
 
@@ -173,8 +175,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       var _newItem2 = newItem,
           component = _newItem2.component,
           type = _newItem2.type,
-          _newItem2$name = _newItem2.name,
-          name = _newItem2$name === void 0 ? (0, _utils.getFieldName)(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), suffix) : _newItem2$name,
+          name = _newItem2.name,
           decorator = _newItem2.decorator,
           decoratorProps = _newItem2.decoratorProps,
           dataSource = _newItem2.dataSource,
@@ -185,8 +186,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
           tooltip = _newItem2.tooltip,
           request = _newItem2.request,
           data = _newItem2.data,
-          otherProps = _objectWithoutProperties(_newItem2, _excluded); // 默认类型
+          otherProps = _objectWithoutProperties(_newItem2, _excluded); // 默认字段名
+
 
+      var defaultName = !name ? (0, _utils2.getFieldName)(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), suffix) : name; // 默认类型
 
       var defaultType = (0, _adapterType.default)(type, originalComponent); // 默认装饰组件
 
@@ -225,7 +228,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
         schemaScopeRef.current[k] = v;
       });
-      var formatParam = (0, _utils.mapSchemaName)(_objectSpread(_objectSpread({}, otherProps), {}, {
+      var formatParam = (0, _utils2.mapSchemaName)(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
         component: component,
         decorator: defaultDecorator,
@@ -245,7 +248,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var recursiveItems = items ? formatSchema([items], suffix) : {}; // 配置组件属性
 
-      schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
+      if ((0, _utils.isUsable)(item)) {
+        schemaProperties[defaultName] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
+      }
     });
     return schemaProperties;
   }, []);

package/lib/index-without-icon.d.ts

@@ -0,0 +1,32 @@
+import ProAction from './actions';
+import ProCard from './card';
+import ProField from './field';
+import ProForm from './form';
+import hooks from './hooks';
+import ProInfo from './info';
+import ProPageContainer from './page-container';
+import ProPageHeader from './page-header';
+import ProTable from './table';
+import ProSkeleton from './skeleton';
+import utils from './utils';
+import ProSidebar from './sidebar';
+import { ProTimeline } from './timeline';
+import * as nocode from './nocode';
+import * as templates from './templates';
+import TeamixIcon from '@teamix/icon';
+import './global.scss';
+export * from './actions';
+export * from './card';
+export * from './field';
+export * from './form';
+export * from './info';
+export * from './nocode';
+export * from './page-container';
+export * from './page-header';
+export * from './skeleton';
+export * from './table';
+export * from './sidebar';
+export * from './utils';
+export * from './timeline';
+declare const version = "1.4.7";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };