@teamix/pro 1.4.15 → 1.4.16

package/dist/pro.js

@@ -75930,14 +75930,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 
 function eventHandler(action, actionContext, onTrigger) {
-  var _ref;
+  var _baseProps;
 
   var _action$trigger = action.trigger,
       trigger = _action$trigger === void 0 ? 'onClick' : _action$trigger,
       preventDefault = action.preventDefault,
       stopPropagation = action.stopPropagation,
       beforeAction = action.beforeAction;
-  return _ref = {}, _ref["" + trigger] = function () {
+  var openIdentifier = action.openIdentifier;
+  var baseProps = (_baseProps = {}, _baseProps["" + trigger] = function () {
     var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
       var beforeActionContext;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -75996,7 +75997,15 @@ function eventHandler(action, actionContext, onTrigger) {
     }
 
     return _;
-  }(), _ref;
+  }(), _baseProps);
+
+  if (openIdentifier) {
+    baseProps = Object.assign({}, baseProps, {
+      id: openIdentifier
+    });
+  }
+
+  return baseProps;
 }
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (eventHandler)));
 
@@ -76399,9 +76408,10 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _utils_message__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(94891);
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
 /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(95983);
+/* harmony import */ var _teamix_hooks__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(42341);
 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"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className", "openIdentifier"];
 
 function _extends() { _extends = Object.assign || 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); }
 
@@ -76423,6 +76433,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
+
 function addContextForReactNode(content, context) {
   if (typeof content === 'function' && context) {
     return content(context);
@@ -76464,6 +76475,10 @@ function useDialogAction(action, actionContext, hasForm) {
   var footerDescriptionRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
   var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useHistory)();
 
+  var _useUrlState = (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_10__.useUrlState)(),
+      urlState = _useUrlState[0],
+      setUrlState = _useUrlState[1];
+
   var onActionStart = function onActionStart(context, e) {
     var _extends2;
 
@@ -76504,7 +76519,18 @@ function useDialogAction(action, actionContext, hasForm) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
+        openIdentifier = _getTargetValue.openIdentifier,
         containerOtherProps = _objectWithoutPropertiesLoose(_getTargetValue, _excluded2);
+    /**
+     *  判断是否含有 openIdentifierIdentifiy参数 ,更改对应 url
+     */
+
+
+    if (openIdentifier) {
+      setUrlState({
+        openIdentifier: openIdentifier
+      });
+    }
 
     var isDrawer = dialogType === 'drawer';
     var isPop = dialogType === 'pop';
@@ -76610,10 +76636,18 @@ function useDialogAction(action, actionContext, hasForm) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
+    var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_11__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
+      setUrlState({
+        openIdentifier: undefined
+      });
       propsOnCancel && propsOnCancel(context);
+    }, _extends2.onClose = function onClose() {
+      setUrlState({
+        openIdentifier: undefined
+      });
+      hide == null ? void 0 : hide();
     }, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -76699,10 +76733,19 @@ function useDrawerTableAction(action, context) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "T": () => (/* binding */ useDrawerAction)
 /* harmony export */ });
-/* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28653);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28653);
+
 
 function useDrawerAction(action, context) {
-  return (0,_dialog__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(Object.assign({
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    var _action$openIdentifie, _action$openIdentifie2;
+
+    var dom = document.getElementById((_action$openIdentifie = (_action$openIdentifie2 = action.openIdentifier) == null ? void 0 : _action$openIdentifie2.toString()) != null ? _action$openIdentifie : '');
+    dom == null ? void 0 : dom.click();
+  }, []);
+  return (0,_dialog__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(Object.assign({
     dialogType: 'drawer'
   }, action), context);
 }
@@ -80034,9 +80077,11 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
   var mergedComponents = _extends({}, globalComponents, components, formilyComponents, _Components_ProField__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z);
 
   var onAutoSubmit = (0,_useAutoSubmit__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(onSubmit, context);
+  console.log(otherProps);
   var autoTeamixLayout = (0,_useAutoLayout__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(_extends({}, otherProps, {
     schema: schema
   }), formRef);
+  console.log(autoTeamixLayout);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
     // 配置表单默认值
     if (initialValues) {
@@ -80130,7 +80175,7 @@ var useAutoLayout = function useAutoLayout(_ref, formRef) {
       autoLabel = _ref2.autoLabel;
 
   var breakpoints = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return autoLabel ? false : breakpoints;
+    return autoLabel ? false : outBreakpoints;
   }, []); // 当前断点不支持Col更新
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
@@ -80901,7 +80946,8 @@ var initialize = function initialize(item) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-var _excluded = ["title", "decoratorProps"];
+var _excluded = ["title", "decoratorProps"],
+    _excluded2 = ["title", "dataIndex", "cell", "htmlTitle", "sortable", "width", "align", "alignHeader", "filters", "filterMode", "filterMenuProps", "lock", "resizable", "colSpan"];
 
 function _extends() { _extends = Object.assign || 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); }
 
@@ -80909,16 +80955,49 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
-      decoratorProps = item.decoratorProps,
-      children = _objectWithoutPropertiesLoose(item, _excluded);
-
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps,
+      children = _objectWithoutPropertiesLoose(item, _excluded); // 将Table.Column属性和组件FormItem属性通过decoratorProps统一传入，再分别赋值
+
+
+  var columnTitle = decoratorProps.title,
+      dataIndex = decoratorProps.dataIndex,
+      cell = decoratorProps.cell,
+      htmlTitle = decoratorProps.htmlTitle,
+      sortable = decoratorProps.sortable,
+      width = decoratorProps.width,
+      align = decoratorProps.align,
+      alignHeader = decoratorProps.alignHeader,
+      filters = decoratorProps.filters,
+      filterMode = decoratorProps.filterMode,
+      filterMenuProps = decoratorProps.filterMenuProps,
+      lock = decoratorProps.lock,
+      resizable = decoratorProps.resizable,
+      colSpan = decoratorProps.colSpan,
+      formItemDecoratorProps = _objectWithoutPropertiesLoose(decoratorProps, _excluded2);
+
+  var columnProperties = {
+    title: title != null ? title : columnTitle,
+    dataIndex: dataIndex,
+    cell: cell,
+    htmlTitle: htmlTitle,
+    sortable: sortable,
+    width: width,
+    align: align,
+    alignHeader: alignHeader,
+    filters: filters,
+    filterMode: filterMode,
+    filterMenuProps: filterMenuProps,
+    lock: lock,
+    resizable: resizable,
+    colSpan: colSpan
+  };
   return {
     component: 'ArrayTable.Column',
-    props: _extends({}, decoratorProps, {
-      // 将ArrayTable.Column理解为decorator，传入decoratorProps作为component的props
-      title: title
-    }),
-    children: [_extends({}, children)]
+    props: columnProperties,
+    children: [_extends({}, children, {
+      decoratorProps: formItemDecoratorProps
+    })]
   };
 };
 
@@ -82585,7 +82664,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.4.15';
+var version = '1.4.16';
 
 
 /***/ }),
@@ -87644,16 +87723,18 @@ var Layout = function Layout(props) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
         addonBefore: renderMainAction(),
-        addonAfter: renderAddonAfter()
-      }), afterDataFilter && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-        className: "mb8 " + cls('after-data-filter-wrapper')
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "mb8 " + cls('after-data-filter-wrapper')
+        }, afterDataFilter) : null
+      }));
     } else {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
-        addonAfter: renderAddonAfter()
-      }), ' ', afterDataFilter && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-        className: "mb8 " + cls('after-data-filter-wrapper')
-      }, afterDataFilter));
+        addonAfter: renderAddonAfter(),
+        children: afterDataFilter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "mb8 " + cls('after-data-filter-wrapper')
+        }, afterDataFilter) : null
+      }));
     }
   }; // 区域组合渲染