@nocobase/client 0.7.3-alpha.1 → 0.7.4-alpha.7

package/lib/collection-manager/interfaces/o2o.js

@@ -218,6 +218,7 @@ var o2o = {
                   description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
                   'x-decorator': 'FormItem',
                   'x-component': 'Input',
+                  'x-validator': 'uid',
                   'x-disabled': '{{ !createOnly }}'
                 }
               }
@@ -389,6 +390,7 @@ var oho = {
                   description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
                   'x-decorator': 'FormItem',
                   'x-component': 'Input',
+                  'x-validator': 'uid',
                   'x-disabled': '{{ !createOnly }}'
                 }
               }
@@ -547,6 +549,7 @@ var obo = {
                   description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
                   'x-decorator': 'FormItem',
                   'x-component': 'Input',
+                  'x-validator': 'uid',
                   'x-disabled': '{{ !createOnly }}'
                 }
               }

package/lib/collection-manager/interfaces/password.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.password = void 0;
 
-var _properties = require("./properties");
-
 var _i18n = require("../../i18n");
 
+var _properties = require("./properties");
+
 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; }
@@ -23,6 +23,7 @@ var password = {
   title: '{{t("Password")}}',
   default: {
     type: 'password',
+    hidden: true,
     // name,
     uiSchema: {
       type: 'string',
@@ -30,6 +31,7 @@ var password = {
       'x-component': 'Password'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   validateSchema: function validateSchema(fieldSchema) {
     return {

package/lib/collection-manager/interfaces/percent.js

@@ -79,6 +79,7 @@ var percent = {
       }
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.x-component-props.step': {
       type: 'string',

package/lib/collection-manager/interfaces/phone.js

@@ -33,6 +33,7 @@ var phone = {
 
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   filterable: {
     operators: _properties.operators.string

package/lib/collection-manager/interfaces/properties/index.d.ts

@@ -21,6 +21,7 @@ export declare const defaultProps: {
         'x-disabled': string;
         'x-decorator': string;
         'x-component': string;
+        'x-validator': string;
         description: string;
     };
     type: import("@formily/react").Stringify<{

package/lib/collection-manager/interfaces/properties/index.js

@@ -267,6 +267,7 @@ var defaultProps = {
     'x-disabled': '{{ !createOnly }}',
     'x-decorator': 'FormItem',
     'x-component': 'Input',
+    'x-validator': 'uid',
     description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
   },
   type: type

package/lib/collection-manager/interfaces/properties/operators.js

@@ -95,11 +95,11 @@ var datetime = [{
   value: '$dateNotAfter'
 }, {
   label: "{{ t('is empty') }}",
-  value: '$null',
+  value: '$empty',
   noValue: true
 }, {
   label: "{{ t('is not empty') }}",
-  value: '$notNull',
+  value: '$notEmpty',
   noValue: true
 }];
 exports.datetime = datetime;
@@ -213,11 +213,11 @@ var time = [{
   value: '$neq'
 }, {
   label: '{{t("is empty")}}',
-  value: '$null',
+  value: '$empty',
   noValue: true
 }, {
   label: '{{t("is not empty")}}',
-  value: '$notNull',
+  value: '$notEmpty',
   noValue: true
 }];
 exports.time = time;

package/lib/collection-manager/interfaces/radioGroup.js

@@ -29,6 +29,7 @@ var radioGroup = {
       'x-component': 'Radio.Group'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.enum': _properties.dataSource
   }),

package/lib/collection-manager/interfaces/richText.js

@@ -30,6 +30,7 @@ var richText = {
       'x-component': 'RichText'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;

package/lib/collection-manager/interfaces/select.js

@@ -30,6 +30,7 @@ var select = {
       enum: []
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.enum': _properties.dataSource
   }),

package/lib/collection-manager/interfaces/textarea.js

@@ -30,6 +30,7 @@ var textarea = {
       'x-component': 'Input.TextArea'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread({}, _properties.defaultProps),
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;

package/lib/collection-manager/interfaces/time.js

@@ -28,6 +28,7 @@ var time = {
       'x-component': 'TimePicker'
     }
   },
+  hasDefaultValue: true,
   properties: _objectSpread(_objectSpread({}, _properties.defaultProps), {}, {
     'uiSchema.x-component-props.format': {
       type: 'string',

package/lib/locale/en_US.d.ts

@@ -54,7 +54,7 @@ declare const _default: {
     "Select data source": string;
     Calendar: string;
     Kanban: string;
-    "Select group field": string;
+    "Select grouping field": string;
     Media: string;
     Markdown: string;
     Wysiwyg: string;
@@ -373,7 +373,7 @@ declare const _default: {
     "Reference template": string;
     "Create calendar block": string;
     "Create kanban block": string;
-    "Group field": string;
+    "Grouping field": string;
     "Tab name": string;
     "Current record blocks": string;
     "Popup message": string;
@@ -554,5 +554,6 @@ declare const _default: {
     "Enabled languages": string;
     "View all plugins": string;
     Print: string;
+    'Single select and radio fields can be used as the grouping field': string;
 };
 export default _default;

package/lib/locale/en_US.js

@@ -60,7 +60,7 @@ var _default = {
   "Select data source": "Select data source",
   "Calendar": "Calendar",
   "Kanban": "Kanban",
-  "Select group field": "Select group field",
+  "Select grouping field": "Select grouping field",
   "Media": "Media",
   "Markdown": "Markdown",
   "Wysiwyg": "Wysiwyg",
@@ -379,7 +379,7 @@ var _default = {
   "Reference template": "Reference template",
   "Create calendar block": "Create calendar block",
   "Create kanban block": "Create kanban block",
-  "Group field": "Group field",
+  "Grouping field": "Grouping field",
   "Tab name": "Tab name",
   "Current record blocks": "Current record blocks",
   "Popup message": "Popup message",
@@ -559,6 +559,7 @@ var _default = {
   "Regular expression": "Pattern",
   "Enabled languages": "Enabled languages",
   "View all plugins": "View all plugins",
-  "Print": "Print"
+  "Print": "Print",
+  'Single select and radio fields can be used as the grouping field': 'Single select and radio fields can be used as the grouping field'
 };
 exports.default = _default;

package/lib/locale/zh_CN.d.ts

@@ -54,7 +54,7 @@ declare const _default: {
     "Select data source": string;
     Calendar: string;
     Kanban: string;
-    "Select group field": string;
+    "Select grouping field": string;
     Media: string;
     Markdown: string;
     Wysiwyg: string;
@@ -251,6 +251,8 @@ declare const _default: {
     "The field value cannot be greater than ": string;
     "The field value cannot be less than ": string;
     "The field value is not an integer number": string;
+    "Set default value": string;
+    "Default value": string;
     "is before": string;
     "is after": string;
     "is on or after": string;
@@ -408,7 +410,8 @@ declare const _default: {
     'Reference template': string;
     'Create calendar block': string;
     'Create kanban block': string;
-    'Group field': string;
+    'Grouping field': string;
+    'Single select and radio fields can be used as the grouping field': string;
     'Tab name': string;
     'Current record blocks': string;
     'Popup message': string;

package/lib/locale/zh_CN.js

@@ -60,7 +60,7 @@ var _default = {
   "Select data source": "选择数据源",
   "Calendar": "日历",
   "Kanban": "看板",
-  "Select group field": "选择分组字段",
+  "Select grouping field": "选择分组字段",
   "Media": "多媒体",
   "Markdown": "Markdown",
   "Wysiwyg": "富文本",
@@ -257,6 +257,8 @@ var _default = {
   "The field value cannot be greater than ": "数值不能大于",
   "The field value cannot be less than ": "数值不能小于",
   "The field value is not an integer number": "数字不是整数",
+  "Set default value": "设置默认值",
+  "Default value": "默认值",
   "is before": "早于",
   "is after": "晚于",
   "is on or after": "不早于",
@@ -414,7 +416,8 @@ var _default = {
   'Reference template': '引用模板',
   'Create calendar block': '创建日历区块',
   'Create kanban block': '创建看板区块',
-  'Group field': '分组字段',
+  'Grouping field': '分组字段',
+  'Single select and radio fields can be used as the grouping field': '数据表的单选字段可以作为分组字段',
   'Tab name': '标签名称',
   'Current record blocks': '当前数据区块',
   'Popup message': '弹窗提示消息',

package/lib/plugin-manager/PluginManager.d.ts

@@ -7,6 +7,7 @@ declare type PluginManagerType = {
     Toolbar?: React.FC<ToolbarProps> & {
         Item?: React.FC<MenuItemProps & {
             selected?: boolean;
+            subtitle?: string;
         }>;
     };
 };

package/lib/plugin-manager/PluginManager.js

@@ -9,6 +9,8 @@ exports.usePrefixCls = exports.RemotePluginManagerToolbar = exports.PluginManage
 
 var _icons = require("@ant-design/icons");
 
+var _css = require("@emotion/css");
+
 var _antd = require("antd");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -23,7 +25,9 @@ var _apiClient = require("../api-client");
 
 var _context = require("./context");
 
-var _excluded = ["selected", "icon", "title"];
+var _templateObject;
+
+var _excluded = ["selected", "icon", "title", "subtitle"];
 
 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); }
 
@@ -35,6 +39,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 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; }
@@ -154,14 +160,21 @@ PluginManager.Toolbar.Item = function (props) {
   var selected = props.selected,
       icon = props.icon,
       title = props.title,
+      subtitle = props.subtitle,
       others = _objectWithoutProperties(props, _excluded);
 
   var prefix = usePrefixCls();
   var className = (0, _classnames.default)(_defineProperty({}, "".concat(prefix, "-menu-item-selected"), selected));
 
   if (item.pin) {
+    var subtitleComponent = subtitle && /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          font-size: 12px;\n          color: #999;\n        "])))
+    }, subtitle);
+
+    var titleComponent = /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", null, title), subtitleComponent);
+
     return /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-      title: title
+      title: titleComponent
     }, /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, _objectSpread(_objectSpread({}, others), {}, {
       className: className,
       eventKey: item.component

package/lib/schema-component/antd/calendar/Calendar.Designer.js

@@ -32,12 +32,17 @@ 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 useOptions = function useOptions() {
+  var _fields$filter;
+
+  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'string';
   var compile = (0, _.useCompile)();
 
   var _useCollection = (0, _collectionManager.useCollection)(),
       fields = _useCollection.fields;
 
-  var options = fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
+  var options = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
+    return field.type === type;
+  })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
     var _field$uiSchema;
 
     return {
@@ -74,7 +79,6 @@ var CalendarDesigner = function CalendarDesigner() {
 
   var template = (0, _schemaTemplates.useSchemaTemplate)();
   var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : (_fieldSchema$xDecora$ = _fieldSchema$xDecora.params) === null || _fieldSchema$xDecora$ === void 0 ? void 0 : _fieldSchema$xDecora$.filter) || {};
-  var options = useOptions();
   var fieldNames = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2['fieldNames']) || {};
   var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.resource;
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
@@ -83,14 +87,16 @@ var CalendarDesigner = function CalendarDesigner() {
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Title field'),
     value: fieldNames.title,
-    options: options,
+    options: useOptions('string'),
     onChange: function onChange(title) {
       var _schema;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['title'] = title;
       field.decoratorProps.params = fieldNames;
-      fieldSchema['x-decorator-props']['params'] = fieldNames;
+      fieldSchema['x-decorator-props']['params'] = fieldNames; // Select切换option后value未按照预期切换，固增加以下代码
+
+      fieldSchema['x-decorator-props']['fieldNames'] = fieldNames;
       service.refresh();
       dn.emit('patch', {
         schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-decorator-props', field.decoratorProps), _schema)
@@ -100,14 +106,14 @@ var CalendarDesigner = function CalendarDesigner() {
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Start date field'),
     value: fieldNames.start,
-    options: options,
+    options: useOptions('date'),
     onChange: function onChange(start) {
       var _schema2;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['start'] = start;
-      field.decoratorProps.params = fieldNames;
-      fieldSchema['x-decorator-props']['params'] = fieldNames;
+      field.decoratorProps.fieldNames = fieldNames;
+      fieldSchema['x-decorator-props']['fieldNames'] = fieldNames;
       service.refresh();
       dn.emit('patch', {
         schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', field.decoratorProps), _schema2)
@@ -117,14 +123,14 @@ var CalendarDesigner = function CalendarDesigner() {
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('End date field'),
     value: fieldNames.end,
-    options: options,
+    options: useOptions('date'),
     onChange: function onChange(end) {
       var _schema3;
 
       var fieldNames = field.decoratorProps.fieldNames || {};
       fieldNames['end'] = end;
-      field.decoratorProps.params = fieldNames;
-      fieldSchema['x-decorator-props']['params'] = fieldNames;
+      field.decoratorProps.fieldNames = fieldNames;
+      fieldSchema['x-decorator-props']['fieldNames'] = fieldNames;
       service.refresh();
       dn.emit('patch', {
         schema: (_schema3 = {}, _defineProperty(_schema3, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema3, 'x-decorator-props', field.decoratorProps), _schema3)

package/lib/schema-component/antd/date-picker/DatePicker.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { DatePickerProps as AntdDatePickerProps, RangePickerProps as AntdRangePickerProps } from 'antd/lib/date-picker';
+import React from 'react';
 declare type ComposedDatePicker = React.FC<AntdDatePickerProps> & {
     RangePicker?: React.FC<AntdRangePickerProps>;
 };

package/lib/schema-component/antd/date-picker/DatePicker.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.DatePicker = void 0;
 
-var _antd = require("antd");
-
 var _react = require("@formily/react");
 
+var _antd = require("antd");
+
 var _ReadPretty = require("./ReadPretty");
 
 var _util = require("./util");

package/lib/schema-component/antd/date-picker/ReadPretty.js

@@ -9,14 +9,14 @@ var _builtins__ = require("@formily/antd/lib/__builtins__");
 
 var _shared = require("@formily/shared");
 
+var _client = require("@nocobase/utils/client");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _util = require("./util");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var ReadPretty = function ReadPretty() {
@@ -33,8 +33,8 @@ ReadPretty.DatePicker = function (props) {
   var prefixCls = (0, _builtins__.usePrefixCls)('description-date-picker', props);
 
   var getLabels = function getLabels() {
-    var format = (0, _util.getDefaultFormat)(props);
-    var m = (0, _util.str2moment)(props.value, props);
+    var format = (0, _client.getDefaultFormat)(props);
+    var m = (0, _client.str2moment)(props.value, props);
     var labels = _moment.default.isMoment(m) ? m.format(format) : '';
     return (0, _shared.isArr)(labels) ? labels.join('~') : labels;
   };
@@ -46,10 +46,10 @@ ReadPretty.DatePicker = function (props) {
 
 ReadPretty.DateRangePicker = function (props) {
   var prefixCls = (0, _builtins__.usePrefixCls)('description-text', props);
-  var format = (0, _util.getDefaultFormat)(props);
+  var format = (0, _client.getDefaultFormat)(props);
 
   var getLabels = function getLabels() {
-    var m = (0, _util.str2moment)(props.value, props);
+    var m = (0, _client.str2moment)(props.value, props);
 
     if (!m) {
       return '';

package/lib/schema-component/antd/date-picker/util.d.ts

@@ -1,18 +1,8 @@
-import type { DatePickerProps } from 'antd/lib/date-picker';
 import moment from 'moment';
-export interface Str2momentOptions {
-    gmt?: boolean;
-    picker?: 'year' | 'month' | 'week' | 'quarter';
-}
-export declare const str2moment: (value?: string | string[], options?: Str2momentOptions) => any;
 export interface Moment2strOptions {
     showTime?: boolean;
     gmt?: boolean;
     picker?: 'year' | 'month' | 'week' | 'quarter';
 }
 export declare const moment2str: (value?: moment.Moment | moment.Moment[], options?: Moment2strOptions) => string | string[] | moment.Moment | moment.Moment[];
-export declare const getDefaultFormat: (props: DatePickerProps & {
-    dateFormat: string;
-    timeFormat: string;
-}) => string | import("rc-picker/lib/interface").CustomFormat<moment.Moment> | (string | import("rc-picker/lib/interface").CustomFormat<moment.Moment>)[];
 export declare const mapDateFormat: () => (props: any) => any;

package/lib/schema-component/antd/date-picker/util.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.str2moment = exports.moment2str = exports.mapDateFormat = exports.getDefaultFormat = void 0;
+exports.moment2str = exports.mapDateFormat = void 0;
+
+var _client = require("@nocobase/utils/client");
 
 var _moment = _interopRequireDefault(require("moment"));
 
@@ -15,22 +17,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; }
 
-var toGmt = function toGmt(value) {
-  if (!value) {
-    return value;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map(function (val) {
-      return "".concat(val.format('YYYY-MM-DD'), "T").concat(val.format('HH:mm:ss.SSS'), "Z");
-    });
-  }
-
-  if (_moment.default.isMoment(value)) {
-    return "".concat(value.format('YYYY-MM-DD'), "T").concat(value.format('HH:mm:ss.SSS'), "Z");
-  }
-};
-
 var toStringByPicker = function toStringByPicker(value, picker) {
   if (picker === 'year') {
     return value.format('YYYY') + '-01-01T00:00:00.000Z';
@@ -67,47 +53,6 @@ var toGmtByPicker = function toGmtByPicker(value, picker) {
   }
 };
 
-var toLocal = function toLocal(value) {
-  if (!value) {
-    return value;
-  }
-
-  if (Array.isArray(value)) {
-    return value.map(function (val) {
-      return val.toISOString();
-    });
-  }
-
-  if (_moment.default.isMoment(value)) {
-    return value.toISOString();
-  }
-};
-
-var toMoment = function toMoment(val, options) {
-  if (_moment.default.isMoment(val)) {
-    return val;
-  }
-
-  var gmt = options.gmt,
-      picker = options.picker;
-
-  if (gmt || picker) {
-    val = val.replace('T', ' ').replace('Z', '');
-    return (0, _moment.default)(val);
-  }
-
-  return (0, _moment.default)(val);
-};
-
-var str2moment = function str2moment(value) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return Array.isArray(value) ? value.map(function (val) {
-    return toMoment(val, options);
-  }) : value ? toMoment(value, options) : value;
-};
-
-exports.str2moment = str2moment;
-
 var moment2str = function moment2str(value) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var showTime = options.showTime,
@@ -119,7 +64,7 @@ var moment2str = function moment2str(value) {
   }
 
   if (showTime) {
-    return gmt ? toGmt(value) : toLocal(value);
+    return gmt ? (0, _client.toGmt)(value) : (0, _client.toLocal)(value);
   }
 
   return toGmtByPicker(value, picker);
@@ -127,41 +72,13 @@ var moment2str = function moment2str(value) {
 
 exports.moment2str = moment2str;
 
-var getDefaultFormat = function getDefaultFormat(props) {
-  if (props.format) {
-    return props.format;
-  }
-
-  if (props.dateFormat) {
-    if (props['showTime']) {
-      return "".concat(props.dateFormat, " ").concat(props.timeFormat || 'HH:mm:ss');
-    }
-
-    return props.dateFormat;
-  }
-
-  if (props['picker'] === 'month') {
-    return 'YYYY-MM';
-  } else if (props['picker'] === 'quarter') {
-    return 'YYYY-\\QQ';
-  } else if (props['picker'] === 'year') {
-    return 'YYYY';
-  } else if (props['picker'] === 'week') {
-    return 'YYYY-wo';
-  }
-
-  return props['showTime'] ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
-};
-
-exports.getDefaultFormat = getDefaultFormat;
-
 var mapDateFormat = function mapDateFormat() {
   return function (props) {
-    var format = getDefaultFormat(props);
+    var format = (0, _client.getDefaultFormat)(props);
     var _onChange = props.onChange;
     return _objectSpread(_objectSpread({}, props), {}, {
       format: format,
-      value: str2moment(props.value, props),
+      value: (0, _client.str2moment)(props.value, props),
       onChange: function onChange(value) {
         if (_onChange) {
           _onChange(moment2str(value, props));