@teamix/pro 1.4.25-bugfix.2 → 1.4.25-bugfix.3

package/lib/form/typing.d.ts

@@ -34,24 +34,6 @@ export interface ProFormRequestConfig extends Omit<ProFormCommonRequestConfig, '
     extraConfig?: AnyObject;
     onComplete?: (res?: any, field?: any, context?: any) => any;
 }
-export interface CascadeWhen {
-    left: string;
-    op: string;
-    right: any;
-}
-export interface Cascade {
-    when: CascadeWhen[];
-    logic?: '||' | '&&';
-    props?: any;
-    state?: any;
-    dataSourceFilter?: any[];
-    dataSourceHide?: any[];
-}
-export interface OnChange {
-    when: CascadeWhen[];
-    logic?: '||' | '&&';
-    values: any;
-}
 export interface ProFormSchemaItem {
     type?: string;
     name?: string;
@@ -79,8 +61,6 @@ export interface ProFormSchemaItem {
     default?: any;
     request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
-    cascade?: Cascade[];
-    onChange?: OnChange[];
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
 interface AutoLayout {
@@ -106,7 +86,6 @@ export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     onInitialComplete?: (form: FormType) => void;
     breakpoints?: number[] | boolean;
     autoLayout?: AutoLayout | boolean;
-    component?: any;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;
@@ -119,14 +98,13 @@ export interface FilterProps extends ProFormProps {
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
     className?: string;
-    addonBefore?: ReactNode | any;
-    addonAfter?: ReactNode | any;
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
     inlineContent?: ReactNode;
     panelContent?: ReactNode;
     count?: number;
     expand?: boolean;
     onExpand?: (expand: boolean) => void;
-    children?: React.ReactNode;
 }
 export interface QueryFilterProps extends ProFormProps {
     /**
@@ -143,9 +121,9 @@ export interface QueryFilterProps extends ProFormProps {
     /** 是否强制清除 */
     forceClear?: boolean;
     /** 顶部筛选区前缀 */
-    addonBefore?: ReactNode | any;
+    addonBefore?: ReactNode;
     /** 顶部筛选区后缀 */
-    addonAfter?: ReactNode | any;
+    addonAfter?: ReactNode;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
     /** 顶部筛选区筛选项配置 */

package/lib/form/utils.d.ts

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

package/lib/form/utils.js

@@ -4,24 +4,43 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.mapMode = exports.mapDataSource = exports.initializeRequestExpression = exports.getFieldName = void 0;
+
 var _core = require("@formily/core");
+
 var _formily = require("@teamix/formily");
+
 var _utils = require("@teamix/utils");
+
 var _schemaNameMap = _interopRequireDefault(require("./schemaNameMap"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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."); }
+
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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."); }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /**
  * 映射字段size，主要是default转medium
  * @param props component的props
@@ -30,9 +49,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  */
 var mapSize = function mapSize(props, field) {
   var layout = _objectSpread(_objectSpread({}, (0, _formily.useFormShallowLayout)()), (0, _formily.useFormLayout)());
+
   var takeSize = function takeSize() {
     return layout.size === 'default' ? 'medium' : layout.size;
   };
+
   return _objectSpread(_objectSpread({}, props), {}, {
     size: props.size || takeSize()
   });
@@ -43,62 +64,84 @@ var mapSize = function mapSize(props, field) {
  * @param field 当前字段实例
  * @returns 映射后的字段属性
  */
+
+
 exports.mapSize = mapSize;
+
 var mapStatus = function mapStatus(props, field) {
   var _field$data;
+
   var takeStatus = function takeStatus() {
     var _field$warnings, _field$decoratorProps, _field$decoratorProps2;
+
     if (!field) return;
     if (field['loading'] || field['validating']) return 'loading';
     if (field['invalid']) return 'error';
     if ((_field$warnings = field['warnings']) === null || _field$warnings === void 0 ? void 0 : _field$warnings.length) return 'warning';
     if (((_field$decoratorProps = field.decoratorProps) === null || _field$decoratorProps === void 0 ? void 0 : _field$decoratorProps.feedbackStatus) === 'pending') return 'loading'; // 新增
+
     return (_field$decoratorProps2 = field.decoratorProps) === null || _field$decoratorProps2 === void 0 ? void 0 : _field$decoratorProps2.feedbackStatus;
   };
+
   var takeState = function takeState(state) {
     if (state === 'validating' || state === 'pending') return 'loading';
     return state;
   };
+
   var state = takeState(props.state) || takeStatus();
   var result = {
     state: state
-  };
-  // 当组件处于loading状态时，仅可读不可写。
+  }; // 当组件处于loading状态时，仅可读不可写。
+
   if (state === 'loading' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
     result.readOnly = true;
   }
+
   return _objectSpread(_objectSpread({}, props), result);
 };
+
 exports.mapStatus = mapStatus;
+
 var patchDataSource = function patchDataSource() {
   var dataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
   var removeEmptyChildren = function removeEmptyChildren(data) {
     var result = _objectSpread({}, data);
+
     if (!result.children || result.children.length === 0) {
       delete result.children;
     } else {
       result.children = result.children.map(removeEmptyChildren);
     }
+
     return result;
   };
+
   return (0, _utils.isArr)(dataSource) ? dataSource.map(removeEmptyChildren) : [];
 };
+
 var mapDataSource = function mapDataSource(props, field) {
   var _props$dataSource;
+
   if ((0, _core.isVoidField)(field)) {
     return props;
   }
+
   return _objectSpread(_objectSpread({}, props), {}, {
     dataSource: patchDataSource((_props$dataSource = props.dataSource) !== null && _props$dataSource !== void 0 ? _props$dataSource : field === null || field === void 0 ? void 0 : field.dataSource)
   });
 };
+
 exports.mapDataSource = mapDataSource;
+
 var mapMode = function mapMode(props, field) {
   return _objectSpread(_objectSpread({}, props), {}, {
     mode: (field === null || field === void 0 ? void 0 : field.readPretty) ? 'read' : 'edit'
   });
 };
+
 exports.mapMode = mapMode;
+
 var getFieldName = function getFieldName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'FieldName';
   var suffix = arguments.length > 1 ? arguments[1] : undefined;
@@ -109,17 +152,22 @@ var getFieldName = function getFieldName() {
  * @param obj
  * @returns
  */
+
+
 exports.getFieldName = getFieldName;
+
 var mapSchemaName = function mapSchemaName(obj) {
   var temp = {};
   Object.entries(obj).map(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
-      key = _ref2[0],
-      value = _ref2[1];
+        key = _ref2[0],
+        value = _ref2[1];
+
     var newKey = (0, _utils.getValueByValue)(_schemaNameMap.default, key, {
       inputKey: 'proForm',
       outputKey: 'formily'
     }) || key;
+
     if (value !== undefined && value !== null) {
       if ((0, _utils.isArr)(value)) {
         if (value.length) {
@@ -142,11 +190,15 @@ var mapSchemaName = function mapSchemaName(obj) {
  * @param v 数组或其他
  * @returns 合并数组或合并其他值
  */
+
+
 exports.mapSchemaName = mapSchemaName;
+
 var mergeArrayValue = function mergeArrayValue(arr, v) {
   if ((0, _utils.isArr)(v)) {
     return [].concat(_toConsumableArray(arr), _toConsumableArray(v));
   }
+
   return [].concat(_toConsumableArray(arr), [v]);
 };
 /**
@@ -155,7 +207,10 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
  * @param suffix scope名称后缀
  * @returns 表达式和scope上下文
  */
+
+
 exports.mergeArrayValue = mergeArrayValue;
+
 var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
   if ((0, _utils.isPlainObj)(config)) {
     var requestConfigName = "$requestConfig_".concat(suffix);
@@ -164,6 +219,8 @@ var initializeRequestExpression = function initializeRequestExpression(config, m
       scope: _defineProperty({}, requestConfigName, config)
     };
   }
+
   return {};
 };
+
 exports.initializeRequestExpression = initializeRequestExpression;

package/lib/form/warning.js

@@ -4,15 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var warning = function warning(item) {
-  var newItem = _objectSpread({}, item);
-  // if (xxx) {
+  var newItem = _objectSpread({}, item); // if (xxx) {
   //   console.warn('xxx');
   // }
+
+
   return newItem;
 };
+
 var _default = warning;
 exports.default = _default;

package/lib/global.scss

@@ -1,5 +1,3 @@
-@import "./xconsole.scss";
-@import "next-xconsole";
 // transition 切换主题优化，暂时先写到 pro 里，后面加到基础组件里
 
 // table 行背景色
@@ -44,4 +42,4 @@ button.next-btn.next-medium.next-btn-normal {
 // 可关闭tag
 .next-tag.next-tag.next-tag.next-tag-closable.next-tag-level-normal.next-tag-closable {
   transition: color 0s;
-}
+}

package/lib/hooks/index.js

@@ -1,12 +1,17 @@
 "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
 });
 exports.default = void 0;
+
 var hooks = _interopRequireWildcard(require("@teamix/hooks"));
+
 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); }
+
 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; }
+
 var _default = hooks;
 exports.default = _default;

package/lib/index-without-icon.js

@@ -1,6 +1,7 @@
 "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
 });
@@ -109,7 +110,9 @@ Object.defineProperty(exports, "utils", {
   }
 });
 exports.version = void 0;
+
 var _actions = _interopRequireWildcard(require("./actions"));
+
 Object.keys(_actions).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -121,7 +124,9 @@ Object.keys(_actions).forEach(function (key) {
     }
   });
 });
+
 var _card = _interopRequireWildcard(require("./card"));
+
 Object.keys(_card).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -133,7 +138,9 @@ Object.keys(_card).forEach(function (key) {
     }
   });
 });
+
 var _field = _interopRequireWildcard(require("./field"));
+
 Object.keys(_field).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -145,7 +152,9 @@ Object.keys(_field).forEach(function (key) {
     }
   });
 });
+
 var _form = _interopRequireWildcard(require("./form"));
+
 Object.keys(_form).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -157,8 +166,11 @@ Object.keys(_form).forEach(function (key) {
     }
   });
 });
+
 var _hooks = _interopRequireDefault(require("./hooks"));
+
 var _info = _interopRequireWildcard(require("./info"));
+
 Object.keys(_info).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -170,7 +182,9 @@ Object.keys(_info).forEach(function (key) {
     }
   });
 });
+
 var _pageContainer = _interopRequireWildcard(require("./page-container"));
+
 Object.keys(_pageContainer).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -182,7 +196,9 @@ Object.keys(_pageContainer).forEach(function (key) {
     }
   });
 });
+
 var _pageHeader = _interopRequireWildcard(require("./page-header"));
+
 Object.keys(_pageHeader).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -194,7 +210,9 @@ Object.keys(_pageHeader).forEach(function (key) {
     }
   });
 });
+
 var _table = _interopRequireWildcard(require("./table"));
+
 Object.keys(_table).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -206,7 +224,9 @@ Object.keys(_table).forEach(function (key) {
     }
   });
 });
+
 var _skeleton = _interopRequireWildcard(require("./skeleton"));
+
 Object.keys(_skeleton).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -218,7 +238,9 @@ Object.keys(_skeleton).forEach(function (key) {
     }
   });
 });
+
 var _utils = _interopRequireWildcard(require("./utils"));
+
 Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -230,7 +252,9 @@ Object.keys(_utils).forEach(function (key) {
     }
   });
 });
+
 var _sidebar = _interopRequireWildcard(require("./sidebar"));
+
 Object.keys(_sidebar).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -242,7 +266,9 @@ Object.keys(_sidebar).forEach(function (key) {
     }
   });
 });
+
 var _timeline = require("./timeline");
+
 Object.keys(_timeline).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -254,7 +280,9 @@ Object.keys(_timeline).forEach(function (key) {
     }
   });
 });
+
 var nocode = _interopRequireWildcard(require("./nocode"));
+
 exports.nocode = nocode;
 Object.keys(nocode).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -267,16 +295,22 @@ Object.keys(nocode).forEach(function (key) {
     }
   });
 });
+
 var templates = _interopRequireWildcard(require("./templates"));
+
 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); }
+
 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; }
-// 不带有设置图标源的入口文件
 
+// 不带有设置图标源的入口文件
 // import ProLayout from './layout';
-
 var version = '1.4.7';
 exports.version = version;

package/lib/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.18";
+declare const version = "1.4.25-bugfix.3";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };