@teamix/pro 1.3.15 → 1.3.16

package/lib/form/ProForm/useFieldSchema.js

@@ -28,45 +28,70 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  * @returns schema 配置
  */
 var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
-  return field.reduce(function (prev, curr, index) {
+  return [].concat(field).reduce(function (prev, curr, index) {
+    var _curr$type;
+
     var _ref = curr.props || {},
         id = _ref.id,
         _ref$children = _ref.children,
         children = _ref$children === void 0 ? [] : _ref$children,
         _ref$reactions = _ref.reactions,
         reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
-        rest = _objectWithoutProperties(_ref, _excluded); // 获取字段额外的 schema 配置（From ProForm）
+        rest = _objectWithoutProperties(_ref, _excluded);
 
+    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
 
-    var extraFieldProps = extra[index] || {};
+    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
 
-    if (id !== extraFieldProps.id) {
-      // 索引不匹配，通过 id 查找获取
-      extraFieldProps = (0, _utils.getValueByValue)(extra, id, {
-        inputKey: 'id',
-        outputKey: '__whole__'
-      }) || (0, _utils.getValueByValue)(wholeExtra, id, {
-        inputKey: 'id',
-        outputKey: '__whole__'
-      });
+    if (displayName === 'ProFormField') {
+      // 获取字段额外的 schema 配置（From ProForm）
+      var extraFieldProps = extra[index] || {};
 
-      if (extraFieldProps) {
-        console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+      if (id !== extraFieldProps.id) {
+        // 索引不匹配，通过 id 查找获取
+        extraFieldProps = (0, _utils.getValueByValue)(extra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        }) || (0, _utils.getValueByValue)(wholeExtra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        });
+
+        if (extraFieldProps) {
+          console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+        }
       }
+
+      var _ref2 = extraFieldProps || {},
+          extraId = _ref2.id,
+          _ref2$children = _ref2.children,
+          extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
+          _ref2$reactions = _ref2.reactions,
+          extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
+          extraRest = _objectWithoutProperties(_ref2, _excluded2);
+
+      var mergedReactions = [].concat(reactions, extraReactions);
+      var mergedChildren = children ? getMergedSchema(children, extraChildren, wholeExtra) : [];
+      prev.push(_objectSpread(_objectSpread(_objectSpread({}, (0, _utils.deepMerge)(rest, extraRest)), mergedReactions.length && {
+        reactions: mergedReactions
+      }), mergedChildren.length && {
+        children: mergedChildren
+      }));
+    } else if ((0, _utils.isStr)(type)) {
+      prev.push({
+        component: type,
+        props: curr.props
+      });
+    } else if ((0, _utils.isStr)(displayName)) {
+      prev.push({
+        decorator: displayName,
+        decoratorProps: _objectSpread({
+          id: id
+        }, rest),
+        children: children ? getMergedSchema(children, [], wholeExtra) : []
+      });
     }
 
-    var _ref2 = extraFieldProps || {},
-        extraId = _ref2.id,
-        _ref2$children = _ref2.children,
-        extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
-        _ref2$reactions = _ref2.reactions,
-        extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
-        extraRest = _objectWithoutProperties(_ref2, _excluded2);
-
-    prev.push(_objectSpread(_objectSpread({}, (0, _utils.deepMerge)(rest, extraRest)), {}, {
-      reactions: [].concat(reactions, extraReactions),
-      children: (children === null || children === void 0 ? void 0 : children.length) ? getMergedSchema(children, extraChildren, wholeExtra) : []
-    }));
     return prev;
   }, []);
 };
@@ -80,11 +105,7 @@ var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
 var _default = function _default(_ref3) {
   var children = _ref3.children,
       schema = _ref3.schema;
-  var field = [].concat(children !== null && children !== void 0 ? children : []).filter(function (item) {
-    var _item$type, _item$props;
-
-    return (item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.name) === '' && (item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.component);
-  }); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
+  var field = [].concat(children !== null && children !== void 0 ? children : []); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
 
   if (field.length) {
     return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);

package/lib/form/SchemaForm/reactions.js

@@ -35,10 +35,13 @@ var $request = function $request(field, context, _ref, type) {
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {}; // 执行通用数据请求
+  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {}; // 合并请求参数
+
+  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult); // 执行通用数据请求
+
 
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
+    params: mergedParams,
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
@@ -48,7 +51,10 @@ var $request = function $request(field, context, _ref, type) {
     onSuccess: (0, _utils.isFn)(onSuccess) ? function (res) {
       return onSuccess(res, field, context);
     } : onSuccess
-  }), context);
+  }), _objectSpread(_objectSpread({}, context), {}, {
+    field: field,
+    params: mergedParams
+  }));
 }; // 通用请求配置上下文
 
 

package/lib/form/typing.d.ts

@@ -2,6 +2,7 @@ import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import type { CommonRequestConfig } from '@teamix/utils';
+import type { UrlStateOptions } from '@teamix/hooks';
 import React from 'react';
 interface AnyObject {
     [propName: string]: any;
@@ -124,6 +125,8 @@ export interface QueryFilterProps extends ProFormProps {
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */
     filterDebounce?: number;
+    /** 绑定URL参数 */
+    bindUrl?: boolean | UrlStateOptions;
     /** 表单初始化（含异步默认值）后回调函数 */
     onInit?: (values: any) => void;
     /** 表单筛选回调函数 */

package/lib/form/utils.d.ts

@@ -43,5 +43,13 @@ declare const mergeArrayValue: (arr: any[], v?: any) => any[];
  * @param suffix scope名称后缀
  * @returns 表达式和scope上下文
  */
-declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => any;
+declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => {
+    expression: string;
+    scope: {
+        [x: string]: object;
+    };
+} | {
+    expression?: undefined;
+    scope?: undefined;
+};
 export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression, };

package/lib/form/utils.js

@@ -13,14 +13,8 @@ var _utils = require("@teamix/utils");
 
 var _schemaNameMap = _interopRequireDefault(require("./schemaNameMap"));
 
-var _excluded = ["customRequest"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -218,33 +212,15 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
 exports.mergeArrayValue = mergeArrayValue;
 
 var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
-  var schema = {};
-
   if ((0, _utils.isPlainObj)(config)) {
-    var customRequest = config.customRequest,
-        requestConfig = _objectWithoutProperties(config, _excluded);
-
     var requestConfigName = "$requestConfig_".concat(suffix);
-
-    if ((0, _utils.isFn)(customRequest)) {
-      var _scope;
-
-      // 自定义请求方法 customRequest
-      var customRequestName = "$customRequest_".concat(suffix);
-      schema = {
-        expression: "{{".concat(mode, "(").concat(customRequestName, ",context,").concat(requestConfigName, ")}}"),
-        scope: (_scope = {}, _defineProperty(_scope, customRequestName, customRequest), _defineProperty(_scope, requestConfigName, requestConfig), _scope)
-      };
-    } else {
-      // pro 通用数据请求 $request
-      schema = {
-        expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
-        scope: _defineProperty({}, requestConfigName, requestConfig)
-      };
-    }
+    return {
+      expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
+      scope: _defineProperty({}, requestConfigName, config)
+    };
   }
 
-  return schema;
+  return {};
 };
 
 exports.initializeRequestExpression = initializeRequestExpression;

package/lib/global.scss

@@ -0,0 +1,45 @@
+// transition 切换主题优化，暂时先写到 pro 里，后面加到基础组件里
+
+// table 行背景色
+tr.next-table-row{
+  transition: color 0s;
+}
+
+// normal 按钮
+button.next-btn.next-medium.next-btn-normal {
+  transition: color 0s;
+}
+
+// input 背景色
+.next-input.next-medium {
+  transition: color 0s;
+}
+
+// radio 背景色
+.next-radio-wrapper.checked .next-radio-inner:after {
+  transition: color 0s;
+}
+
+.next-radio-wrapper .next-radio-inner {
+  transition: color 0s;
+}
+
+// checkbox 背景色
+.next-checkbox-wrapper .next-checkbox-inner {
+  transition: color 0s;
+}
+
+// 侧导背景色
+.next-menu-item.next-nav-item {
+  transition: color 0s;
+}
+
+// 标签背景色
+.next-tag {
+  transition: color 0s;
+}
+
+// 可关闭tag
+.next-tag.next-tag.next-tag.next-tag-closable.next-tag-level-normal.next-tag-closable {
+  transition: color 0s;
+}

package/lib/index.d.ts

@@ -13,6 +13,7 @@ import ProSidebar from './sidebar';
 import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
+import './global.scss';
 export * from './actions';
 export * from './card';
 export * from './field';
@@ -26,5 +27,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.15";
+declare const version = "1.3.16";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -295,6 +295,8 @@ exports.templates = templates;
 
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
+require("./global.scss");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -305,5 +307,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.3.15';
+var version = '1.3.16';
 exports.version = version;

package/lib/page-header/index.d.ts

@@ -20,6 +20,8 @@ export declare type ProPageHeaderDataItem = {
 export declare type ProPageHeaderProps = {
     /** 标题 */
     title?: React.ReactNode;
+    /** 标题说明 */
+    titleTooltip?: React.ReactNode;
     /** 描述 */
     description?: React.ReactNode;
     /** 图标 */

package/lib/page-header/index.js

@@ -27,7 +27,7 @@ require("./index.scss");
 
 var _excluded = ["text", "children"],
     _excluded2 = ["color", "title", "num", "className"],
-    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style", "tabs"];
+    _excluded3 = ["title", "titleTooltip", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style", "tabs"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -42,6 +42,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 var cls = (0, _utils.baseClass)('teamix-pro-page-header');
+var Tooltip = _components.Balloon.Tooltip;
 
 var renderNav = function renderNav(breadcrumbs) {
   if (breadcrumbs && breadcrumbs.length) {
@@ -152,6 +153,7 @@ var renderTabs = function renderTabs(tabs) {
 
 var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
+      titleTooltip = props.titleTooltip,
       description = props.description,
       icon = props.icon,
       iconColor = props.iconColor,
@@ -219,7 +221,15 @@ var ProPageHeader = function ProPageHeader(props) {
       size: "large"
     }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon)), /*#__PURE__*/_react.default.createElement("span", {
       className: cls('title-name')
-    }, title), (0, _utils.renderTags)(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
+    }, title, titleTooltip && /*#__PURE__*/_react.default.createElement(Tooltip, {
+      trigger: /*#__PURE__*/_react.default.createElement("span", {
+        className: cls('title-tooltip-icon')
+      }, /*#__PURE__*/_react.default.createElement(_icon.default, {
+        type: "info-circle-line",
+        size: "xs"
+      })),
+      align: "t"
+    }, titleTooltip)), (0, _utils.renderTags)(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
   };
 
   return /*#__PURE__*/_react.default.createElement("header", _objectSpread({

package/lib/page-header/index.scss

@@ -43,6 +43,7 @@ $prefix: 'teamix-pro-page-header';
     font-weight: 500;
     align-items: center;
     word-break: break-all;
+    color: var(--color-text1-4);
 
     &-name {
       white-space: nowrap;
@@ -50,6 +51,13 @@ $prefix: 'teamix-pro-page-header';
       text-overflow: ellipsis;
     }
 
+    &-tooltip-icon {
+      position: relative;
+      margin-left: 2px;
+      display: inline-flex;
+      top: -7px;
+    }
+
     &-icon {
       padding: var(--s-1, 4px);
     }

package/lib/table/components/Layout/index.scss

@@ -32,11 +32,11 @@ $prefix: 'teamix-pro-table-layout';
   &-filter-btn:not(:first-child) {
     margin-left: 8px;
   }
-  &-panel-filter {
-    margin: 8px 0;
-    padding: 16px;
-    background: var(--panel-filter-bg, var(--color-fill1-2));
-  }
+  // &-panel-filter {
+  //   margin: 8px 0;
+  //   padding: 16px;
+  //   background: var(--panel-filter-bg, var(--color-fill1-2));
+  // }
   &-main-action {
     margin-bottom: 8px;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",