@teamix/pro 1.2.18 → 1.2.19

package/lib/actions/dialog.js

@@ -16,6 +16,8 @@ var _reactRouterDom = require("react-router-dom");
 
 var _components = require("@alicloudfe/components");
 
+var _popConfirm = _interopRequireDefault(require("@teamix/pop-confirm"));
+
 var _utils = require("@teamix/utils");
 
 var _form = _interopRequireWildcard(require("../form"));
@@ -29,7 +31,7 @@ var _request = require("./request");
 var _utils2 = require("./utils");
 
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _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 }; }
 
@@ -102,7 +104,9 @@ function useDialogAction(action, actionContext) {
   var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
 
-  var onActionStart = function onActionStart(context) {
+  var onActionStart = function onActionStart(context, e) {
+    var _objectSpread2;
+
     var url = action.url,
         method = action.method,
         params = action.params,
@@ -126,6 +130,7 @@ function useDialogAction(action, actionContext) {
         dialogQuickShowType = _getTargetValue.dialogQuickShowType,
         _getTargetValue$messa = _getTargetValue.messageType,
         messageType = _getTargetValue$messa === void 0 ? 'notice' : _getTargetValue$messa,
+        popType = _getTargetValue.popType,
         beforeRequest = _getTargetValue.beforeRequest,
         onTrigger = _getTargetValue.onTrigger,
         link = _getTargetValue.link,
@@ -135,20 +140,25 @@ function useDialogAction(action, actionContext) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
-        containerProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+        containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var isDrawer = dialogType === 'drawer';
-    var container = isDrawer ? _components.Drawer : _components.Dialog;
-    var dialogOnlyProps = {
+    var isPop = dialogType === 'pop';
+    var container = isDrawer ? _components.Drawer : isPop ? _popConfirm.default : _components.Dialog;
+    var containerProps = isDrawer ? {
+      okText: (0, _utils.getMessage)('ok'),
+      cancelText: (0, _utils.getMessage)('cancel'),
+      closeable: !loading
+    } : isPop ? {
+      type: popType,
+      trigger: e.currentTarget
+    } : {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      }
+      },
+      closeable: !loading
     };
-    var containerOtherProps = isDrawer ? {
-      okText: (0, _utils.getMessage)('ok'),
-      cancelText: (0, _utils.getMessage)('cancel')
-    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {
@@ -243,27 +253,19 @@ function useDialogAction(action, actionContext) {
       key: (0, _utils.uuid)()
     }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _objectSpread(_objectSpread({
-      // @ts-ignore
-      onOk: onOk,
-      title: addContextForReactNode(title, dialogContext),
-      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"
-      }, (0, _message.renderProMessage)(message, {
-        type: 'notice'
-      })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-after-content"
-      }, addContextForReactNode(afterContent, dialogContext)), footerDescription && /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
-      }, renderDialogFooterDescription(footerDescription))),
-      closeable: !loading,
-      footerAlign: footerAlign,
-      className: (0, _classnames.default)('teamix-pro-action-dialog', {
-        'has-footer-description': !!footerDescription
-      })
-    }, containerOtherProps), containerProps);
+    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", {
+      className: "teamix-pro-dialog-before-content"
+    }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-message"
+    }, (0, _message.renderProMessage)(message, {
+      type: 'notice'
+    })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-after-content"
+    }, addContextForReactNode(afterContent, dialogContext)), !isPop && footerDescription && /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
+    }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", (0, _classnames.default)('teamix-pro-action-dialog', {
+      'has-footer-description': !!footerDescription
+    })), _objectSpread2), containerProps), containerOtherProps);
 
     var ret = container.show(quickShowProps);
     store.hide = ret.hide;

package/lib/actions/index.d.ts

@@ -7,6 +7,7 @@ import { DialogAction } from './dialog';
 import { DialogFormAction } from './dialog-form';
 import { DialogTableAction } from './dialog-table';
 import { DialogInfoAction } from './dialog-info';
+import { PopConfirmAction } from './pop-confirm';
 import './index.scss';
 export declare type ProActionConfig = ({
     type: 'dialog-form' | 'drawer-form';
@@ -15,6 +16,8 @@ export declare type ProActionConfig = ({
 } & DialogTableAction) | ({
     type: 'dialog-info' | 'drawer-info';
 } & DialogInfoAction) | ({
+    type: 'pop-confirm' | 'danger-pop-confirm';
+} & PopConfirmAction) | ({
     type: 'dialog' | 'drawer' | 'confirm' | 'danger-confirm' | 'notice' | 'error';
 } & DialogAction) | ({
     type: 'request';

package/lib/actions/index.js

@@ -47,6 +47,10 @@ var _drawerTable = require("./drawer-table");
 
 var _drawerInfo = require("./drawer-info");
 
+var _popConfirm = require("./pop-confirm");
+
+var _dangerPopConfirm = require("./danger-pop-confirm");
+
 require("./index.scss");
 
 var _excluded = ["type"],
@@ -155,6 +159,14 @@ function useAction(config, context) {
     return (0, _drawerInfo.useDrawerInfoAction)(others, context);
   }
 
+  if (type === 'pop-confirm') {
+    return (0, _popConfirm.usePopConfirmAction)(others, context);
+  }
+
+  if (type === 'danger-pop-confirm') {
+    return (0, _dangerPopConfirm.useDangerPopConfirmAction)(others, context);
+  }
+
   var registedAction = RegistedActions.get(type);
 
   if (!registedAction) {

package/lib/actions/pop-confirm.d.ts

@@ -0,0 +1,9 @@
+import { IPopConfirmProps } from '@teamix/pop-confirm';
+import { DialogAction } from './dialog';
+export declare type PopConfirmAction = DialogAction & Omit<IPopConfirmProps, 'type' | 'trigger'> & {
+    popType?: IPopConfirmProps['type'];
+};
+export declare function usePopConfirmAction(action: PopConfirmAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
+};
+export default usePopConfirmAction;

package/lib/actions/pop-confirm.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.usePopConfirmAction = usePopConfirmAction;
+
+var _utils = require("@teamix/utils");
+
+var _dialog = _interopRequireDefault(require("./dialog"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function usePopConfirmAction(action, context) {
+  return (0, _dialog.default)((0, _utils.deepMerge)({
+    dialogType: 'pop',
+    align: 'br'
+  }, action), context);
+}
+
+var _default = usePopConfirmAction;
+exports.default = _default;

package/lib/form/Components/LightFilter/componentMap.d.ts

@@ -1,2 +1,3 @@
 declare const componentMap: any;
-export default componentMap;
+declare const inputCategory: any[];
+export { componentMap, inputCategory };

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

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.inputCategory = exports.componentMap = void 0;
 var componentMap = {
   Radio: 'Select',
   Checkbox: 'Select'
 };
-var _default = componentMap;
-exports.default = _default;
+exports.componentMap = componentMap;
+var inputCategory = ['Input', 'Password', 'TextArea', 'NumberPicker', 'Percent', 'Money'];
+exports.inputCategory = inputCategory;

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

@@ -8,6 +8,7 @@ import './index.scss';
 interface ILightFiter {
     size?: 'small' | 'medium' | 'large';
     defaultFilterValue?: string;
+    onFilterChange?: (schema?: any) => any;
     filterProps?: SelectProps;
     buttonProps?: ButtonProps;
 }

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

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("@teamix/utils");
 
-var _componentMap = _interopRequireDefault(require("./componentMap"));
+var _componentMap = require("./componentMap");
 
 require("./index.scss");
 
@@ -53,13 +53,12 @@ var useMain = function useMain(active) {
   var main = [];
   schema.mapProperties(function (schema, name) {
     // console.log(schema.required); // 添加 *
-    // console.log(schema);
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
           title: '',
-          'x-component': _componentMap.default[schema['x-component']] || schema['x-component']
+          'x-component': _componentMap.componentMap[schema['x-component']] || schema['x-component']
         })
       });
     }
@@ -78,16 +77,21 @@ var useFilterItems = function useFilterItems() {
     });
   });
   return filterItems;
+}; // 是否输入框类型的组件
+
+
+var isInputCategory = function isInputCategory(currentSchema) {
+  var component = currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema['x-component'];
+  return _componentMap.inputCategory.includes(component);
 };
 
 var LightFilter = (0, _react2.observer)(function (props) {
-  var _filterItems$;
+  var _filterItems$, _main$;
 
-  var field = (0, _react2.useField)();
-  var schema = (0, _react2.useFieldSchema)();
   var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
 
@@ -97,6 +101,7 @@ var LightFilter = (0, _react2.observer)(function (props) {
       setActive = _useState2[1];
 
   var main = useMain(active);
+  var currentSchema = (_main$ = main[0]) === null || _main$ === void 0 ? void 0 : _main$.schema;
   var defaultCls = (0, _utils.usePrefixCls)();
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-light-filter'
@@ -107,20 +112,21 @@ var LightFilter = (0, _react2.observer)(function (props) {
     return /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
       key: key,
       name: name,
-      schema: schema,
-      filterProperties: function filterProperties(schema) {
-        return true;
-      }
+      schema: schema
     });
   });
+  var onSelectChange = (0, _react.useCallback)(function (value) {
+    setActive(value);
+    onFilterChange && onFilterChange(currentSchema);
+  }, [onFilterChange]);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size))
+    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size), isInputCategory(currentSchema) ? "".concat(prefixCls, "-input-category") : '')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-main")
   }, /*#__PURE__*/_react.default.createElement(_components.Select, _objectSpread(_objectSpread({}, filterProps), {}, {
     className: (0, _classnames.default)("".concat(prefixCls, "-select"), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
     dataSource: filterItems,
-    onChange: setActive,
+    onChange: onSelectChange,
     value: active
   })), content), /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-addonAfter")

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

@@ -18,10 +18,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
     box-sizing: border-box;
     border: var(--search-normal-normal-border-width, 1px) solid
       var(--color-line1-2, #d9d9d9);
-    border-right: 0;
     border-radius: var(--search-normal-corner, 2px);
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
     // 表单项选择
     .#{$light-filter}-select {
       min-width: auto;
@@ -44,6 +41,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
 
   // 按钮后缀
   .#{$light-filter}-addonAfter {
+    display: none;
     .#{$css-prefix}btn {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
@@ -54,6 +52,18 @@ $light-filter: #{teamix-pro-form}-light-filter;
   }
 }
 
+// LightFilter输入类
+.#{$light-filter}-input-category {
+  .#{$light-filter}-main {
+    border-right: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .#{$light-filter}-addonAfter {
+    display: block;
+  }
+}
+
 // LightFilter无边框
 .#{$form-item-cls}-bordered-none {
   .#{$form-item-cls}-control {