@teamix/pro 1.1.4 → 1.1.8

package/lib/form/SchemaForm/initializeArrayItems.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["decoratorProps"],
-    _excluded2 = ["props", "children", "items"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -13,90 +11,34 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-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; }
+var initializeItems = function initializeItems(items) {
+  if (items) {
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items'
+    });
+  }
 
-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; }
+  return items;
+};
 
 var initializeChildren = function initializeChildren(item) {
-  var decoratorProps = item.decoratorProps,
-      otherProps = _objectWithoutProperties(item, _excluded);
-
-  return _objectSpread({
+  var decoratorProps = item.decoratorProps;
+  return _objectSpread(_objectSpread({}, item), decoratorProps ? {
     decoratorProps: _objectSpread({
       feedbackLayout: 'none'
     }, decoratorProps)
-  }, otherProps);
-};
-
-var initializeAddition = function initializeAddition(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayItems.Addition'
-  });
-};
-
-var initializeString = function initializeString(items, props) {
-  return [{
-    name: 'items',
-    component: 'FormFlex',
-    props: props,
-    decoratorProps: {
-      feedbackLayout: 'none'
-    },
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
-};
-
-var initializeObject = function initializeObject(items, props) {
-  return [{
-    name: 'items',
-    type: 'object',
-    children: [{
-      component: 'FormFlex',
-      props: props,
-      children: items.map(function (item) {
-        return initializeChildren(item);
-      })
-    }]
-  }];
-};
-
-var initializeItems = function initializeItems(items, decoratorProps) {
-  return [{
-    name: 'items',
-    type: 'object',
-    decorator: 'ArrayItems.Item',
-    decoratorProps: decoratorProps,
-    children: items
-  }];
+  } : {});
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
+  var _item$children = item.children,
       children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      otherProps = _objectWithoutProperties(item, _excluded2);
-
-  var _props$itemType = props.itemType,
-      itemType = _props$itemType === void 0 ? 'string' : _props$itemType,
-      _props$itemTypeProps = props.itemTypeProps,
-      itemTypeProps = _props$itemTypeProps === void 0 ? {} : _props$itemTypeProps;
-  var renderItemsMap = {
-    string: initializeString(items, itemTypeProps),
-    object: initializeObject(items, itemTypeProps),
-    card: initializeItems(items, {
-      type: 'card'
-    })
-  };
-  return _objectSpread(_objectSpread({}, otherProps), {}, {
+      items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
     children: children.map(function (item) {
-      return initializeAddition(item);
+      return initializeChildren(item);
     }),
-    items: renderItemsMap[itemType]
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/lib/form/SchemaForm/initializeArrayTable.js

@@ -4,12 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["title", "decoratorProps"],
-    _excluded2 = ["props", "children", "items"];
-
-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; }
+var _excluded = ["title", "decoratorProps"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -17,55 +12,50 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 initializeChildren = function initializeChildren(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayTable.Addition'
-  });
-};
+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; }
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
       decoratorProps = item.decoratorProps,
-      otherProps = _objectWithoutProperties(item, _excluded);
+      children = _objectWithoutProperties(item, _excluded);
 
-  return _objectSpread(_objectSpread({}, otherProps), {}, {
+  return {
     component: 'ArrayTable.Column',
     props: _objectSpread(_objectSpread({}, decoratorProps), {}, {
       title: title
     }),
-    children: [_objectSpread({}, otherProps)]
-  });
+    children: [_objectSpread({}, children)]
+  };
 };
 
 var initializeItems = function initializeItems(items) {
-  return [{
-    name: 'items',
-    type: 'object',
-    children: items.map(function (item) {
-      return initializeColumn(item);
-    })
-  }];
+  if (items) {
+    var _items$children;
+
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items',
+      children: (_items$children = items.children) === null || _items$children === void 0 ? void 0 : _items$children.map(function (item) {
+        return initializeColumn(item);
+      })
+    });
+  }
+
+  return items;
 };
 
 var initialize = function initialize(item) {
   var _item$props = item.props,
       props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      otherProps = _objectWithoutProperties(item, _excluded2);
-
-  return _objectSpread(_objectSpread({}, otherProps), {}, {
+      items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
     props: _objectSpread({
       pagination: {
         pageSize: 10
       }
     }, props),
-    children: children.map(function (item) {
-      return initializeChildren(item);
-    }),
-    items: initializeItems(items)
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/lib/form/SchemaForm/initializeFormButton.js

@@ -4,8 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["component", "props"],
-    _excluded2 = ["props", "component"];
+var _excluded = ["sticky"];
+
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -13,10 +16,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-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; }
-
 var buttonTextMap = {
   Submit: '提交',
   Reset: '重置'
@@ -24,58 +23,56 @@ var buttonTextMap = {
 
 var initializeButton = function initializeButton(item) {
   var component = item.component,
-      props = item.props,
-      otherProps = _objectWithoutProperties(item, _excluded);
-
-  return _objectSpread({
+      _item$props = item.props,
+      props = _item$props === void 0 ? {} : _item$props;
+  return _objectSpread(_objectSpread({}, item), {}, {
     component: component,
     props: _objectSpread({
       children: buttonTextMap[component]
     }, props)
-  }, otherProps);
+  });
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      component = item.component,
-      otherProps = _objectWithoutProperties(item, _excluded2);
+  var component = item.component,
+      _item$props2 = item.props,
+      props = _item$props2 === void 0 ? {} : _item$props2,
+      _item$decoratorProps = item.decoratorProps,
+      decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps;
 
   var sticky = props.sticky,
-      align = props.align,
-      gutter = props.gutter;
-  var alignProps = align ? {
-    align: align
-  } : {};
-  var gutterProps = gutter ? {
-    gutter: gutter
-  } : {};
+      otherProps = _objectWithoutProperties(props, _excluded); // 单个按钮
+
 
   if (component && ['Submit', 'Reset'].includes(component)) {
     return initializeButton(item);
   }
 
-  var decoratorTemp = {
-    title: ' ',
+  var commonMode = _objectSpread(_objectSpread({
+    title: ' '
+  }, item), {}, {
+    component: component,
+    props: otherProps,
     decorator: 'FormButtonGroup.FormItem',
-    decoratorProps: {
+    decoratorProps: _objectSpread({
       inset: false
-    },
-    props: _objectSpread(_objectSpread({}, alignProps), gutterProps)
-  };
+    }, decoratorProps)
+  }); // 吸底模式
+
 
   if (sticky) {
-    decoratorTemp = {
-      title: '',
-      decorator: 'FormButtonGroup.Sticky',
-      decoratorProps: _objectSpread({}, alignProps),
-      props: _objectSpread({}, gutterProps)
+    return {
+      component: 'Affix',
+      props: {
+        offsetBottom: 0,
+        className: 'teamix-pro-form-button-affix'
+      },
+      children: [commonMode]
     };
-  }
+  } // 普通模式
+
 
-  return _objectSpread(_objectSpread({
-    component: component
-  }, decoratorTemp), otherProps);
+  return commonMode;
 };
 
 var _default = initialize;

package/lib/form/SchemaForm/initializeFormGroup.d.ts

@@ -1,3 +1,3 @@
-import type { ISchemaProItem } from '../typing';
-declare const initialize: (item: ISchemaProItem) => ISchemaProItem;
+import type { IFormSchemaItem } from '../typing';
+declare const initialize: (item: IFormSchemaItem) => IFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormStep.d.ts

@@ -1,3 +1,5 @@
-import type { ISchemaProItem } from '../typing';
-declare const initialize: (item: ISchemaProItem) => ISchemaProItem;
+import type { IFormSchemaItem } from '../typing';
+declare const initialize: (item: IFormSchemaItem & {
+    col?: number;
+}) => IFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeFormStep.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _excluded = ["props", "children", "title"],
-    _excluded2 = ["props", "children"];
+    _excluded2 = ["col", "style"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -17,6 +17,13 @@ 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 getWidth = function getWidth(col, length) {
+  var newCol = col !== null && col !== void 0 ? col : (length + 1) * 4;
+  newCol = newCol > 24 ? 24 : newCol;
+  var width = 100 / 24 * newCol;
+  return "".concat(width, "%");
+};
+
 var initializeStepPane = function initializeStepPane(item) {
   var _item$props = item.props,
       props = _item$props === void 0 ? {} : _item$props,
@@ -38,17 +45,24 @@ var initialize = function initialize(item) {
   var _item$props2 = item.props,
       props = _item$props2 === void 0 ? {} : _item$props2,
       _item$children2 = item.children,
-      children = _item$children2 === void 0 ? [] : _item$children2,
-      otherProps = _objectWithoutProperties(item, _excluded2);
+      children = _item$children2 === void 0 ? [] : _item$children2;
 
-  return _objectSpread({
+  var col = props.col,
+      style = props.style,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var width = getWidth(col, children.length);
+  return _objectSpread(_objectSpread({}, item), {}, {
     props: _objectSpread({
-      labelPlacement: 'hoz'
-    }, props),
+      labelPlacement: 'hoz',
+      style: _objectSpread({
+        width: width
+      }, style)
+    }, otherProps),
     children: children.map(function (item) {
       return initializeStepPane(item);
     })
-  }, otherProps);
+  });
 };
 
 var _default = initialize;

package/lib/form/SchemaForm/initializeFormTab.d.ts

@@ -1,3 +1,3 @@
-import type { ISchemaProItem } from '../typing';
-declare const initialize: (item: ISchemaProItem) => ISchemaProItem;
+import type { IFormSchemaItem } from '../typing';
+declare const initialize: (item: IFormSchemaItem) => IFormSchemaItem;
 export default initialize;

package/lib/form/SchemaForm/initializeProField.js

@@ -40,7 +40,7 @@ var proFieldTypeMap = {
   YearPicker: 'dateYear',
   QuarterPicker: 'dateQuarter',
   DateRangePicker: 'dateRange',
-  // TimeRangePicker: 'timeRange',
+  TimeRangePicker: 'timeRange',
   DateTimeRangePicker: 'dateTimeRange',
   WeekRangePicker: 'dateWeekRange',
   MonthRangePicker: 'dateMonthRange',
@@ -49,10 +49,10 @@ var proFieldTypeMap = {
   Transfer: 'transfer',
   ColorPicker: 'color',
   ColorRadio: 'colorRadio',
-  ColorSwatches: 'colorSwatches',
-  ColorTwitter: 'colorTwitter',
   IconPicker: 'icon',
   JsonInput: 'json',
+  TagPicker: 'tagFilter',
+  Range: 'range',
   Search: 'search' // Upload: 'upload',
 
 };

package/lib/form/SchemaForm/reactions.d.ts

@@ -1,4 +1,4 @@
-import type { IRequestConfig } from '../';
+import type { IRequestConfig } from '../typing';
 declare const useRequest: (requestConfig: IRequestConfig) => (field: any) => Promise<any>;
 declare const useAsyncDataSource: (services: any) => (field: any) => void;
 export { useRequest, useAsyncDataSource };

package/lib/form/SchemaForm/reactions.js

@@ -15,7 +15,7 @@ var useRequest = function useRequest(requestConfig) {
         params = requestConfig.params,
         data = requestConfig.data,
         when = requestConfig.when,
-        formatter = requestConfig.formatter,
+        formatResult = requestConfig.formatResult,
         onSuccess = requestConfig.onSuccess,
         onError = requestConfig.onError;
     var whenResult = (0, _utils.isFn)(when) ? when(field) : {};
@@ -35,7 +35,7 @@ var useRequest = function useRequest(requestConfig) {
       data: newData !== null && newData !== void 0 ? newData : data
     }).then(function (data) {
       // 默认按request返回res.data.data处理
-      var dataSource = formatter ? formatter(data, {
+      var dataSource = formatResult ? formatResult(data, {
         paramMap: _utils.paramMap,
         listToTree: _utils.listToTree
       }) : data;

package/lib/form/index.d.ts

@@ -1,20 +1,28 @@
 /**
- * 导出全部 @teamix/formily 方法，支持完全自主定义表单
+ * 导出ProForm的TS
+ */
+export * from './typing';
+/**
+ * 使用别名导出formily相关内容
  */
 export * as formilyCore from '@formily/core';
 export * as formilyReact from '@formily/react';
-export * from '@teamix/formily';
-export * from './Filter';
-export * from './typing';
+export * as formilyReactive from '@formily/reactive';
+export * as formilyTeamix from '@teamix/formily';
 /**
- * 导出常用方法等
+ * 导出常用formily内容，需谨慎限制
  */
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { createSchemaField, Field, FormConsumer } from '@formily/react';
-import { toJS } from '@formily/reactive';
-export { createForm, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, Field, createSchemaField, FormConsumer, toJS, };
+import { FormConsumer } from '@formily/react';
+import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, };
+/**
+ * 导出 Filter 组件
+ */
+import { AdvancedFilter, SimpleFilter, QueryFilter } from './Filter';
+export { AdvancedFilter, SimpleFilter, QueryFilter };
 /**
- * 导出封装的 ProForm 组件，支持快速搭建表单
+ * 导出 ProForm 组件，支持快速搭建表单
  */
 import ProForm from './ProForm';
 export default ProForm;