@teamix/pro 1.2.30 → 1.2.34

package/es/table/utils/index.js

@@ -16,129 +16,76 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
-
-var state = {
-  fullScreenState: false,
-  filterRules: {},
-  filterColumns: []
-};
-
-var _initState = cloneDeepLodash(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
-
-
-var callback = {
-  fullScreenState: {}
-};
-var initCallback = cloneDeepLodash(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
-
-var tableCallback = {}; // 组件内监听事件
-// 组件内对全局状态的更改
-
-var mutations = {
-  getState: function getState() {
-    return state;
-  },
-  setState: function setState(key, value) {
-    state[key] = value;
-    useOn(key, value);
-
-    if (mutations.hasOwnProperty(key)) {
-      mutations[key] = value;
-    }
-  },
-  initState: function initState() {
-    state = cloneDeepLodash(_initState);
-  },
-  filterColumns: state.filterColumns,
-  setFullScreenState: function setFullScreenState(fullScreenState) {
-    state.fullScreenState = fullScreenState;
-    useOn('fullScreenState', fullScreenState);
-  },
-
-  /**
-   * 设置筛选列规则
-   * @param rules 规则
-   * @param dataIndex column.dataIndex
-   */
-  setFilterRules: function setFilterRules(rules) {
-    state.filterRules = rules;
-  },
-
-  /**
-   * 获取筛选规则。为params
-   */
-  getFilterRules: function getFilterRules() {
-    var result = {};
-
-    if (state.filterRules) {
-      result = Object.entries(state.filterRules).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            k = _ref2[0],
-            v = _ref2[1];
-
-        return _defineProperty({}, k, v.params);
-      }).reduce(function (acc, cur) {
-        acc = _objectSpread(_objectSpread({}, acc), cur);
-        return acc;
-      }, {});
-    }
+import cloneDeepLodash from 'lodash.clonedeep'; // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内对全局状态的更改
+
+var getMutations = function getMutations(actionRef) {
+  var _actionRef$current2, _actionRef$current2$g, _actionRef$current2$g2;
+
+  return {
+    setFullScreenState: function setFullScreenState(fullScreenState) {
+      var _actionRef$current, _actionRef$current$se;
+
+      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'fullScreenState', fullScreenState);
+    },
+    filterColumns: (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getState) === null || _actionRef$current2$g === void 0 ? void 0 : (_actionRef$current2$g2 = _actionRef$current2$g.call(_actionRef$current2)) === null || _actionRef$current2$g2 === void 0 ? void 0 : _actionRef$current2$g2.filterColumns,
+
+    /**
+     * 设置筛选列规则
+     * @param rules 规则
+     * @param dataIndex column.dataIndex
+     */
+    setFilterRules: function setFilterRules(rules) {
+      var _actionRef$current3, _actionRef$current3$s;
+
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterRules', rules);
+    },
+
+    /**
+     * 获取筛选规则。为params
+     */
+    getFilterRules: function getFilterRules() {
+      var _actionRef$current4, _actionRef$current4$g;
+
+      var result = {};
+      var filterRules = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getState) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4).filterRules;
+
+      if (filterRules) {
+        result = Object.entries(filterRules).map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+
+          return _defineProperty({}, k, v.params);
+        }).reduce(function (acc, cur) {
+          acc = _objectSpread(_objectSpread({}, acc), cur);
+          return acc;
+        }, {});
+      }
 
-    return result;
-  },
-
-  /**
-   * 绑定监听函数
-   * @param fun 监听函数
-   * @param state 需要监听的state
-   * @param name 监听名（作为销毁唯一id使用）
-   */
-  on: function on(fun, state, name) {
-    if (!callback[state]) {
-      callback[state] = {};
+      return result;
     }
-
-    callback[state][name] = fun;
-  },
-  off: function off(name) {
-    callback = Object.fromEntries(Object.entries(callback).map(function (_ref4) {
-      var _ref5 = _slicedToArray(_ref4, 2),
-          k = _ref5[0],
-          v = _ref5[1];
-
-      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref6) {
-        var _ref7 = _slicedToArray(_ref6, 1),
-            k = _ref7[0];
-
-        return k !== name;
-      }));
-      return [k, filterV];
-    }));
-  }
+  };
 }; // 调用绑定的监听函数
 
-var useOn = function useOn(state) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
+
+export function actionRefUseStateOn(callback, state) {
+  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    args[_key - 2] = arguments[_key];
   }
 
   if (callback[state]) {
-    Object.entries(callback[state]).forEach(function (_ref8) {
-      var _ref9 = _slicedToArray(_ref8, 2),
-          k = _ref9[0],
-          v = _ref9[1];
+    Object.entries(callback[state]).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
 
       if (v) {
         v === null || v === void 0 ? void 0 : v.apply(void 0, args);
       }
     });
   }
-}; // 初始化 actionRef
-
-
-export function initActionRef() {
-  state = cloneDeepLodash(_initState);
-  callback = cloneDeepLodash(initCallback);
 }
 /** table 组件内监听 不对外暴露 */
 
@@ -165,12 +112,14 @@ export function emit(key) {
     fun.apply(void 0, args);
   }
 }
-export function useActionType(ref, action) {
-  // 合并自定义事件
-  var userAction = _objectSpread(_objectSpread({}, action), mutations);
+export function initActionRef(ref, action) {
+  var userAction = _objectSpread(_objectSpread({}, action), getMutations(ref));
 
   ref.current = userAction;
 }
+export function useActionType(ref, action) {
+  ref.current = _objectSpread(_objectSpread({}, ref.current), action);
+}
 export function cloneDeep(obj) {
   return cloneDeepLodash(obj);
 }

package/lib/actions/dialog-form.js

@@ -1,7 +1,5 @@
 "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
 });
@@ -25,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -33,6 +31,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _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); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 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."); }
@@ -157,6 +161,7 @@ function useDialogFormAction(action, context) {
       _action$size = action.size,
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
+      propsBeforeRequest = action.beforeRequest,
       others = _objectWithoutProperties(action, _excluded2);
 
   var formRef = /*#__PURE__*/(0, _react.createRef)();
@@ -177,13 +182,55 @@ function useDialogFormAction(action, context) {
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
-    beforeRequest: function beforeRequest() {
-      return new Promise(function (resolve) {
-        formRef.current.validate().then(function () {
-          resolve({
-            fields: formRef.current.values
-          });
-        }).catch(function () {
+    beforeRequest: function beforeRequest(context) {
+      return new Promise(function (resolve, reject) {
+        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var beforeRequestContext, requestContext;
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (!propsBeforeRequest) {
+                    _context.next = 13;
+                    break;
+                  }
+
+                  _context.prev = 1;
+                  _context.next = 4;
+                  return (0, _utils.resolveMaybePromiseMethod)(propsBeforeRequest, context);
+
+                case 4:
+                  beforeRequestContext = _context.sent;
+                  _context.next = 10;
+                  break;
+
+                case 7:
+                  _context.prev = 7;
+                  _context.t0 = _context["catch"](1);
+                  beforeRequestContext = false;
+
+                case 10:
+                  if (!(beforeRequestContext === false)) {
+                    _context.next = 13;
+                    break;
+                  }
+
+                  reject(false);
+                  return _context.abrupt("return");
+
+                case 13:
+                  requestContext = Object.assign({
+                    fields: formRef.current.values
+                  }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
+                  resolve(requestContext);
+
+                case 15:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[1, 7]]);
+        }))).catch(function () {
           resolve(false);
         });
       });

package/lib/common.scss

@@ -0,0 +1,22 @@
+// 容器滚动条样式
+@mixin hybridcloud-scrollbar {
+  &::-webkit-scrollbar {
+    width: 12px;
+    height: 12px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-color: transparent;
+    border-style: solid;
+    border-width: 4px;
+    background-clip: content-box;
+    border-radius: 6px;
+    background-color: var(--scrollbar-thumb-bg);
+    &:hover {
+      border-width: 3px;
+      background-color: var(--scrollbar-thumb-hover-bg); 
+    }
+  }
+  &::-webkit-scrollbar-track {
+    background-color: transparent;
+  }
+}

package/lib/form/Filter/SimpleFilter.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // 初始化Search组件，内置部分属性
 var initializeSearch = function initializeSearch(schema) {
-  var searchName;
+  var searchName = '';
   var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
       searchName = item.name;
@@ -104,6 +104,13 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
   }, [searchName, searchValue.current]);
+  (0, _react.useEffect)(function () {
+    var _props$form$initialVa, _props$form$initialVa2;
+
+    // 处理Search组件，缓存input的默认值
+    var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
+    searchValue.current = (0, _utils.isValid)(searchDefaultValue) ? searchDefaultValue : '';
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: simpleSchema,

package/lib/form/Filter/index.d.ts

@@ -1,13 +1,9 @@
 import React from 'react';
-import type { IFilterProps } from '../typing';
+import { QueryFilterLayout } from './Layout';
+import type { QueryFilterProps } from '../typing';
 import './index.scss';
 /**
- * 简单筛选
+ * 查询筛选
  */
-declare const SimpleFilter: React.FC<IFilterProps>;
-/**
- * 高级筛选
- */
-declare const AdvancedFilter: React.FC<IFilterProps>;
-export { AdvancedFilter, SimpleFilter };
-export default AdvancedFilter;
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter, QueryFilterLayout };