@teamix/pro 1.2.31 → 1.2.35

package/es/actions/dialog-form.js

@@ -1,5 +1,11 @@
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+
+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(); }
 
@@ -27,7 +33,7 @@ import React, { useState, useEffect, createRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm } from '../form';
-import { getTargetValue } from '@teamix/utils';
+import { getTargetValue, resolveMaybePromiseMethod } from '@teamix/utils';
 import { doRequest } from './request';
 import useDialogAction from './dialog';
 import { addContext } from './utils';
@@ -134,6 +140,7 @@ export 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__*/createRef();
@@ -154,13 +161,55 @@ export 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 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/es/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/es/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 };