@innoways/drip-form-theme-antd 6.2.3 → 6.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # Change Log
2
2
 
3
+ ## 6.2.5
4
+
5
+ ### Patch Changes
6
+
7
+ - Added single checkbox feature
8
+ - Updated dependencies
9
+ - @innoways/hooks@6.2.5
10
+ - @innoways/utils@6.2.5
11
+
12
+ ## 6.2.4
13
+
14
+ ### Patch Changes
15
+
16
+ - Added bottom button bgcolor and global bgcolor config, changed date picker to flatpickr
17
+ - Updated dependencies
18
+ - @innoways/hooks@6.2.4
19
+ - @innoways/utils@6.2.4
20
+
3
21
  ## 6.2.3
4
22
 
5
23
  ### Patch Changes
package/dist/index.css CHANGED
@@ -3,11 +3,13 @@
3
3
  flex-wrap: wrap;
4
4
  justify-content: flex-start;
5
5
  }
6
+
6
7
  .country_state_city_container {
7
8
  margin-bottom: 20px;
8
9
  margin-right: 15px;
9
10
  display: flex;
10
11
  }
12
+
11
13
  .country_state_city_label {
12
14
  width: 82px;
13
15
  justify-content: flex-start;
@@ -16,21 +18,59 @@
16
18
  font-size: 12px;
17
19
  color: rgb(0 0, 0);
18
20
  }
21
+
19
22
  .drip_table_field_tree .ant-table {
20
23
  background: transparent;
21
24
  }
25
+
22
26
  .drip_table_field_tree .ant-table-cell {
23
27
  border: none;
24
28
  background: transparent;
25
29
  }
30
+
26
31
  .drip_table_field_tree .ant-table-thead > tr > th {
27
32
  background: transparent;
28
33
  }
34
+
29
35
  .drip_table_field_tree .ant-table-row:hover > td,
30
36
  .drip_table_field_tree .ant-table-cell-row-hover {
31
37
  background: none !important;
32
38
  }
33
39
 
40
+ .drip_date_picker_input:focus-visible {
41
+ -webkit-box-shadow: none;
42
+ border-color: var(--ant-primary-color-hover);
43
+ box-shadow: 0 0 0 2px var(--ant-primary-color-outline);
44
+ border-right-width: 1px !important;
45
+ outline: 0;
46
+ }
47
+
48
+ .drip_date_picker_input {
49
+ width: 100%;
50
+ border: 1px solid #d9d9d9;
51
+ border-radius: 4px;
52
+ padding: 4px 11px;
53
+ font-size: 12px;
54
+ height: 32px;
55
+ line-height: 1.5;
56
+ color: rgba(0, 0, 0, 0.65);
57
+ background-color: #fff;
58
+ background-image: none;
59
+ position: relative;
60
+ cursor: text;
61
+ transition: all 0.3s;
62
+ outline: none;
63
+ }
64
+ .flatpickr-day.selected {
65
+ background: var(--ant-primary-color) !important;
66
+ color: #fff;
67
+ border-color: var(--ant-primary-color);
68
+ }
69
+ .flatpickr-months .flatpickr-prev-month:hover svg,
70
+ .flatpickr-months .flatpickr-next-month:hover svg {
71
+ fill: var(--ant-primary-color-hover) !important;
72
+ }
73
+
34
74
  .drip-form--colorpicker {
35
75
  display: flex;
36
76
  }
package/dist/index.js CHANGED
@@ -32,6 +32,8 @@ import locale from 'antd/es/date-picker/locale/en_US';
32
32
  import _typeof from '@babel/runtime/helpers/typeof';
33
33
  import 'antd/es/date-picker/style';
34
34
  import _DatePicker from 'antd/es/date-picker';
35
+ import Flatpickr from 'react-flatpickr';
36
+ import 'flatpickr/dist/flatpickr.min.css';
35
37
  import 'antd/es/button/style';
36
38
  import _Button from 'antd/es/button';
37
39
  import { SketchPicker } from 'react-color';
@@ -150,9 +152,9 @@ var config$k = {
150
152
 
151
153
  var _excluded$l = ["multiline", "disabled", "onChange", "fieldData", "fieldKey", "dispatch", "disabled_input", "style", "asyncValidate", "getKey", "formMode", "autoSize", "type"];
152
154
 
153
- function ownKeys$a(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; }
155
+ function ownKeys$9(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; }
154
156
 
155
- function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$a(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
157
+ function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$9(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
156
158
  var TextArea$1 = _Input.TextArea;
157
159
 
158
160
  var TextField = function TextField(_ref) {
@@ -184,7 +186,7 @@ var TextField = function TextField(_ref) {
184
186
  updatedType = _useState4[0],
185
187
  setUpdatedType = _useState4[1];
186
188
 
187
- var _onChange = useField(_objectSpread$a({
189
+ var _onChange = useField(_objectSpread$9({
188
190
  fieldKey: fieldKey,
189
191
  onChange: onChange,
190
192
  asyncValidate: asyncValidate,
@@ -1266,9 +1268,9 @@ var config$j = {
1266
1268
  var _excluded$k = ["fieldKey", "fieldData", "dispatch", "options", "buttonStyle", "onChange", "asyncValidate", "getKey", "formMode", "renderType", "style"],
1267
1269
  _excluded2$2 = ["value", "label", "description"];
1268
1270
 
1269
- function ownKeys$9(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; }
1271
+ function ownKeys$8(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; }
1270
1272
 
1271
- function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$9(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
1273
+ function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$8(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
1272
1274
  var TextArea = _Input.TextArea;
1273
1275
 
1274
1276
  var RadioField = function RadioField(_ref) {
@@ -1316,7 +1318,7 @@ var RadioField = function RadioField(_ref) {
1316
1318
  }
1317
1319
 
1318
1320
  var handleRadioTextChange = function handleRadioTextChange(value, key) {
1319
- _onChange(_objectSpread$9(_objectSpread$9({}, fieldData), {}, _defineProperty({}, key, value)));
1321
+ _onChange(_objectSpread$8(_objectSpread$8({}, fieldData), {}, _defineProperty({}, key, value)));
1320
1322
  };
1321
1323
 
1322
1324
  var renderRadioField = function renderRadioField() {
@@ -1334,7 +1336,7 @@ var RadioField = function RadioField(_ref) {
1334
1336
  onChange: function onChange(e) {
1335
1337
  return renderType === 'radioNumber' ? handleRadioTextChange(e.target.value, 'radio') : _onChange(e);
1336
1338
  },
1337
- style: _objectSpread$9(_objectSpread$9({}, style), {}, {
1339
+ style: _objectSpread$8(_objectSpread$8({}, style), {}, {
1338
1340
  width: renderType === 'radioNumber' ? '30%' : style === null || style === void 0 ? void 0 : style.width
1339
1341
  })
1340
1342
  }), options.map(function (item, idx) {
@@ -1356,7 +1358,7 @@ var RadioField = function RadioField(_ref) {
1356
1358
  return handleRadioTextChange(e.target.value, 'text');
1357
1359
  },
1358
1360
  value: fieldData.text,
1359
- style: _objectSpread$9(_objectSpread$9({}, style), {}, {
1361
+ style: _objectSpread$8(_objectSpread$8({}, style), {}, {
1360
1362
  margin: '0 10px 0 10px',
1361
1363
  width: '34%',
1362
1364
  minWidth: '300px'
@@ -18756,9 +18758,9 @@ var config$i = {
18756
18758
 
18757
18759
  var _excluded$i = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "asyncValidate", "getKey", "formMode", "renderType"];
18758
18760
 
18759
- function ownKeys$8(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; }
18761
+ function ownKeys$7(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; }
18760
18762
 
18761
- function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$8(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
18763
+ function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$7(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
18762
18764
 
18763
18765
  var NumberField = function NumberField(_ref) {
18764
18766
  var disabled = _ref.disabled,
@@ -18792,7 +18794,7 @@ var NumberField = function NumberField(_ref) {
18792
18794
  }, dispatch);
18793
18795
 
18794
18796
  var onPhoneCodeChange = function onPhoneCodeChange(key, value) {
18795
- setNumbers(_objectSpread$8(_objectSpread$8({}, numbers), {}, _defineProperty({}, key, value)));
18797
+ setNumbers(_objectSpread$7(_objectSpread$7({}, numbers), {}, _defineProperty({}, key, value)));
18796
18798
  };
18797
18799
 
18798
18800
  useEffect(function () {
@@ -18850,7 +18852,7 @@ var NumberField = function NumberField(_ref) {
18850
18852
  return onPhoneCodeChange('country_id', e);
18851
18853
  },
18852
18854
  value: numbers.country_id,
18853
- style: _objectSpread$8(_objectSpread$8({}, style), {}, {
18855
+ style: _objectSpread$7(_objectSpread$7({}, style), {}, {
18854
18856
  width: '20%',
18855
18857
  marginRight: '5px'
18856
18858
  })
@@ -18860,7 +18862,7 @@ var NumberField = function NumberField(_ref) {
18860
18862
  return onPhoneCodeChange('city_id', e);
18861
18863
  },
18862
18864
  value: numbers.city_id,
18863
- style: _objectSpread$8(_objectSpread$8({}, style), {}, {
18865
+ style: _objectSpread$7(_objectSpread$7({}, style), {}, {
18864
18866
  width: '20%',
18865
18867
  marginRight: '5px'
18866
18868
  })
@@ -18870,7 +18872,7 @@ var NumberField = function NumberField(_ref) {
18870
18872
  return onPhoneCodeChange('phone', e);
18871
18873
  },
18872
18874
  value: numbers.phone,
18873
- style: _objectSpread$8(_objectSpread$8({}, style), {}, {
18875
+ style: _objectSpread$7(_objectSpread$7({}, style), {}, {
18874
18876
  width: '60%'
18875
18877
  })
18876
18878
  }, restProps)));
@@ -19990,9 +19992,9 @@ var getIconComponent = function getIconComponent(iconName) {
19990
19992
 
19991
19993
  var _excluded$d = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "renderType", "queryConfig", "renderOptionAsChildren"];
19992
19994
 
19993
- function ownKeys$7(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; }
19995
+ function ownKeys$6(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; }
19994
19996
 
19995
- function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$7(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19997
+ function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19996
19998
  var Option = _Select.Option;
19997
19999
 
19998
20000
  var SelectField$1 = function SelectField(props) {
@@ -20055,7 +20057,7 @@ var SelectField$1 = function SelectField(props) {
20055
20057
  }, dispatch);
20056
20058
 
20057
20059
  var handleSelectNumberChange = function handleSelectNumberChange(value, key) {
20058
- _onChange(_objectSpread$7(_objectSpread$7({}, fieldData), {}, _defineProperty({}, key, value)));
20060
+ _onChange(_objectSpread$6(_objectSpread$6({}, fieldData), {}, _defineProperty({}, key, value)));
20059
20061
  }; // 不管单选多选,均可搜索
20060
20062
 
20061
20063
 
@@ -20076,7 +20078,7 @@ var SelectField$1 = function SelectField(props) {
20076
20078
  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
20077
20079
 
20078
20080
  if (width) {
20079
- style = _objectSpread$7(_objectSpread$7({}, style), {}, {
20081
+ style = _objectSpread$6(_objectSpread$6({}, style), {}, {
20080
20082
  width: width
20081
20083
  });
20082
20084
  }
@@ -20118,7 +20120,7 @@ var SelectField$1 = function SelectField(props) {
20118
20120
  }, renderSelect(function (e) {
20119
20121
  return handleSelectNumberChange(e, 'select1');
20120
20122
  }, fieldData.select1, '50%', options), /*#__PURE__*/React.createElement(_InputNumber, {
20121
- style: _objectSpread$7(_objectSpread$7({
20123
+ style: _objectSpread$6(_objectSpread$6({
20122
20124
  marginLeft: '10px'
20123
20125
  }, style), {}, {
20124
20126
  width: '50%'
@@ -20142,7 +20144,7 @@ var SelectField$1 = function SelectField(props) {
20142
20144
  }, renderSelect(function (e) {
20143
20145
  return handleSelectNumberChange(e, 'select1');
20144
20146
  }, fieldData.select1, '33%', options), /*#__PURE__*/React.createElement(_InputNumber, {
20145
- style: _objectSpread$7(_objectSpread$7({}, style), {}, {
20147
+ style: _objectSpread$6(_objectSpread$6({}, style), {}, {
20146
20148
  margin: '0 10px 0 10px',
20147
20149
  width: '34%'
20148
20150
  }),
@@ -20302,27 +20304,27 @@ var config$d = {
20302
20304
  }
20303
20305
  };
20304
20306
 
20305
- function ownKeys$6(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; }
20307
+ function ownKeys$5(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; }
20306
20308
 
20307
- function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
20309
+ function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
20308
20310
 
20309
20311
  var SelectField = function SelectField(props) {
20310
20312
  var queryConfig = props.queryConfig;
20311
20313
 
20312
20314
  if ((queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.optionsType) === 'country') {
20313
- return /*#__PURE__*/React.createElement(select$5, _objectSpread$6(_objectSpread$6({}, props), config$h.unitedSchema.ui));
20315
+ return /*#__PURE__*/React.createElement(select$5, _objectSpread$5(_objectSpread$5({}, props), config$h.unitedSchema.ui));
20314
20316
  }
20315
20317
 
20316
20318
  if ((queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.optionsType) === 'state') {
20317
- return /*#__PURE__*/React.createElement(select$4, _objectSpread$6(_objectSpread$6({}, props), config$g.unitedSchema.ui));
20319
+ return /*#__PURE__*/React.createElement(select$4, _objectSpread$5(_objectSpread$5({}, props), config$g.unitedSchema.ui));
20318
20320
  }
20319
20321
 
20320
20322
  if ((queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.optionsType) === 'city' && (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.operationMethod) === 'stateCity') {
20321
- return /*#__PURE__*/React.createElement(select$3, _objectSpread$6(_objectSpread$6({}, props), config$f.unitedSchema.ui));
20323
+ return /*#__PURE__*/React.createElement(select$3, _objectSpread$5(_objectSpread$5({}, props), config$f.unitedSchema.ui));
20322
20324
  }
20323
20325
 
20324
20326
  if ((queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.optionsType) === 'city' && (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.operationMethod) === 'countryCity') {
20325
- return /*#__PURE__*/React.createElement(select$2, _objectSpread$6(_objectSpread$6({}, props), config$e.unitedSchema.ui));
20327
+ return /*#__PURE__*/React.createElement(select$2, _objectSpread$5(_objectSpread$5({}, props), config$e.unitedSchema.ui));
20326
20328
  }
20327
20329
 
20328
20330
  return /*#__PURE__*/React.createElement(select$1, props);
@@ -20515,9 +20517,9 @@ var config$c = {
20515
20517
  }
20516
20518
  };
20517
20519
 
20518
- function ownKeys$5(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; }
20520
+ function ownKeys$4(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; }
20519
20521
 
20520
- function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
20522
+ function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
20521
20523
  var commonStyle = {
20522
20524
  height: 40,
20523
20525
  lineHeight: '40px',
@@ -20526,17 +20528,17 @@ var commonStyle = {
20526
20528
  };
20527
20529
  var styleTypeMap = {
20528
20530
  none: null,
20529
- success: _objectSpread$5({
20531
+ success: _objectSpread$4({
20530
20532
  backgroundColor: '#F6FFED'
20531
20533
  }, commonStyle),
20532
- error: _objectSpread$5({
20534
+ error: _objectSpread$4({
20533
20535
  backgroundColor: '#FFF2F0'
20534
20536
  }, commonStyle),
20535
- warning: _objectSpread$5({
20537
+ warning: _objectSpread$4({
20536
20538
  backgroundColor: '#fff7e1',
20537
20539
  color: '#feb00e'
20538
20540
  }, commonStyle),
20539
- info: _objectSpread$5({
20541
+ info: _objectSpread$4({
20540
20542
  backgroundColor: '#E6F7FF'
20541
20543
  }, commonStyle)
20542
20544
  };
@@ -20554,7 +20556,7 @@ var NullField = function NullField(_ref) {
20554
20556
 
20555
20557
  if (renderType === 'divider') {
20556
20558
  return /*#__PURE__*/React.createElement("div", {
20557
- style: _objectSpread$5({
20559
+ style: _objectSpread$4({
20558
20560
  height: '1px',
20559
20561
  border: 'none',
20560
20562
  backgroundColor: 'grey'
@@ -20570,7 +20572,7 @@ var NullField = function NullField(_ref) {
20570
20572
 
20571
20573
  headings.push( /*#__PURE__*/React.createElement("div", {
20572
20574
  key: i,
20573
- style: _objectSpread$5(_objectSpread$5(_objectSpread$5({
20575
+ style: _objectSpread$4(_objectSpread$4(_objectSpread$4({
20574
20576
  wordBreak: 'break-all'
20575
20577
  }, style), styleTypeMap[styleType]), {}, {
20576
20578
  width: columnsWidth
@@ -21129,7 +21131,7 @@ var config$9 = {
21129
21131
  };
21130
21132
 
21131
21133
  var _excluded$a = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "allowClear", "range", "use12Hours", "asyncValidate", "format", "getKey", "formMode"];
21132
- var RangePicker$1 = _TimePicker.RangePicker;
21134
+ var RangePicker = _TimePicker.RangePicker;
21133
21135
 
21134
21136
  var TimePickerField = function TimePickerField(_ref) {
21135
21137
  var _restProps$placeholde;
@@ -21192,7 +21194,7 @@ var TimePickerField = function TimePickerField(_ref) {
21192
21194
  }, [fieldData, format, range]); // view 模式
21193
21195
 
21194
21196
  if (formMode === 'view') return fieldData ? typeCheck(fieldData) === 'Array' ? fieldData.join(' ~ ') : fieldData : null;
21195
- return range ? /*#__PURE__*/React.createElement(RangePicker$1, _extends({}, isValid ? {
21197
+ return range ? /*#__PURE__*/React.createElement(RangePicker, _extends({}, isValid ? {
21196
21198
  value: fieldData ? [moment(fieldData[0], format), moment(fieldData[1], format)] : null
21197
21199
  } : null, {
21198
21200
  onChange: _onChange,
@@ -21474,29 +21476,24 @@ var config$8 = {
21474
21476
  };
21475
21477
 
21476
21478
  var _excluded$9 = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "range", "format", "picker", "asyncValidate", "showTime", "getKey", "formMode"];
21477
-
21478
- function ownKeys$4(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; }
21479
-
21480
- function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
21481
- var RangePicker = _DatePicker.RangePicker;
21479
+ _DatePicker.RangePicker;
21482
21480
 
21483
21481
  var DatePickerField = function DatePickerField(_ref) {
21484
21482
  var disabled = _ref.disabled,
21485
21483
  onChange = _ref.onChange,
21486
21484
  fieldData = _ref.fieldData,
21487
21485
  fieldKey = _ref.fieldKey,
21488
- dispatch = _ref.dispatch,
21489
- style = _ref.style,
21490
- range = _ref.range,
21486
+ dispatch = _ref.dispatch;
21487
+ _ref.style;
21488
+ var range = _ref.range,
21491
21489
  _ref$format = _ref.format,
21492
- format = _ref$format === void 0 ? 'YYYY-MM-DD HH:mm:ss' : _ref$format,
21493
- _ref$picker = _ref.picker,
21494
- picker = _ref$picker === void 0 ? 'date' : _ref$picker,
21495
- asyncValidate = _ref.asyncValidate,
21490
+ format = _ref$format === void 0 ? 'YYYY-MM-DD' : _ref$format;
21491
+ _ref.picker;
21492
+ var asyncValidate = _ref.asyncValidate,
21496
21493
  showTime = _ref.showTime,
21497
21494
  getKey = _ref.getKey,
21498
- formMode = _ref.formMode,
21499
- restProps = _objectWithoutProperties(_ref, _excluded$9);
21495
+ formMode = _ref.formMode;
21496
+ _objectWithoutProperties(_ref, _excluded$9);
21500
21497
 
21501
21498
  /**
21502
21499
  * 暂时不支持的DatePicker功能
@@ -21504,9 +21501,9 @@ var DatePickerField = function DatePickerField(_ref) {
21504
21501
  * picker目前只支持
21505
21502
  */
21506
21503
  var _useState = useState(false),
21507
- _useState2 = _slicedToArray(_useState, 2),
21508
- isValid = _useState2[0],
21509
- setValid = _useState2[1];
21504
+ _useState2 = _slicedToArray(_useState, 2);
21505
+ _useState2[0];
21506
+ var setValid = _useState2[1];
21510
21507
 
21511
21508
  var _onChange = useField({
21512
21509
  fieldKey: fieldKey,
@@ -21538,32 +21535,86 @@ var DatePickerField = function DatePickerField(_ref) {
21538
21535
  }, [fieldData, format, range]); // view 模式
21539
21536
 
21540
21537
  if (formMode === 'view') return fieldData ? typeCheck(fieldData) === 'Array' ? fieldData.join(' ~ ') : fieldData : null;
21541
- return range ? /*#__PURE__*/React.createElement(RangePicker, _extends({
21542
- picker: picker,
21543
- disabled: disabled
21544
- }, isValid ? {
21545
- value: fieldData ? [moment(fieldData[0], format), moment(fieldData[1], format)] : undefined
21546
- } : null, {
21538
+ return /*#__PURE__*/React.createElement(React.Fragment, null, range ? /*#__PURE__*/React.createElement(Flatpickr, {
21539
+ id: "range-picker",
21540
+ className: "form-control border-0",
21541
+ value: fieldData ? [fieldData[0], fieldData[1]] : [],
21547
21542
  onChange: _onChange,
21548
- format: format,
21549
- locale: locale,
21550
- showTime: _typeof(showTime) === 'object' ? _objectSpread$4(_objectSpread$4({}, showTime), {}, {
21551
- defaultValue: [moment(showTime.defaultValue, showTime.format), moment(showTime.defaultValue, showTime.format)]
21552
- }) : showTime
21553
- }, restProps)) : /*#__PURE__*/React.createElement(_DatePicker, _extends({
21554
- picker: picker
21555
- }, isValid ? {
21556
- value: fieldData ? moment(fieldData) : null
21557
- } : null, {
21558
- format: format,
21543
+ options: {
21544
+ mode: 'range',
21545
+ allowInput: true
21546
+ }
21547
+ }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Flatpickr, {
21548
+ type: "date",
21559
21549
  disabled: disabled,
21560
- onChange: _onChange,
21561
- locale: locale,
21562
- style: style,
21563
- showTime: _typeof(showTime) === 'object' ? _objectSpread$4(_objectSpread$4({}, showTime), {}, {
21564
- defaultValue: moment(showTime.defaultValue, showTime.format)
21565
- }) : showTime
21566
- }, restProps));
21550
+ value: fieldData ? [new Date(moment(fieldData).format(format))] : [],
21551
+ onChange: function onChange(date) {
21552
+ if (date.length) {
21553
+ _onChange(date[0]);
21554
+ } else {
21555
+ _onChange(fieldData);
21556
+ }
21557
+ },
21558
+ id: "default-picker",
21559
+ options: {
21560
+ enableTime: _typeof(showTime) === 'object',
21561
+ altInput: true,
21562
+ allowInput: false,
21563
+ altFormat: _typeof(showTime) === 'object' ? 'd-M-Y H:i' : 'd-M-Y',
21564
+ dateFormat: _typeof(showTime) === 'object' ? 'd-M-Y H:i' : 'D-M-Y',
21565
+ altInputClass: 'drip_date_picker_input'
21566
+ }
21567
+ }))); // return range ? (
21568
+ // <RangePicker
21569
+ // picker={picker}
21570
+ // disabled={disabled}
21571
+ // {...(isValid
21572
+ // ? {
21573
+ // value: fieldData
21574
+ // ? [moment(fieldData[0], format), moment(fieldData[1], format)]
21575
+ // : undefined,
21576
+ // }
21577
+ // : null)}
21578
+ // onChange={_onChange}
21579
+ // format={format}
21580
+ // locale={locale}
21581
+ // showTime={
21582
+ // typeof showTime === 'object'
21583
+ // ? {
21584
+ // ...showTime,
21585
+ // defaultValue: [
21586
+ // moment(showTime.defaultValue, showTime.format),
21587
+ // moment(showTime.defaultValue, showTime.format),
21588
+ // ],
21589
+ // }
21590
+ // : showTime
21591
+ // }
21592
+ // {...restProps}
21593
+ // />
21594
+ // ) : (
21595
+ // <DatePicker
21596
+ // picker={picker}
21597
+ // {...(isValid
21598
+ // ? {
21599
+ // value: fieldData ? moment(fieldData) : null,
21600
+ // }
21601
+ // : null)}
21602
+ // format={format}
21603
+ // disabled={disabled}
21604
+ // onChange={_onChange}
21605
+ // locale={locale}
21606
+ // style={style}
21607
+ // showTime={
21608
+ // typeof showTime === 'object'
21609
+ // ? {
21610
+ // ...showTime,
21611
+ // defaultValue: moment(showTime.defaultValue, showTime.format),
21612
+ // }
21613
+ // : showTime
21614
+ // }
21615
+ // {...restProps}
21616
+ // />
21617
+ // )
21567
21618
  };
21568
21619
 
21569
21620
  DatePickerField.propTypes = {
@@ -21809,6 +21860,23 @@ var config$6 = {
21809
21860
  }]
21810
21861
  },
21811
21862
  fieldKey: 'formMode'
21863
+ }, {
21864
+ fieldKey: 'singleChekbox',
21865
+ type: 'boolean',
21866
+ title: 'Is SingleChekbox',
21867
+ "default": false,
21868
+ ui: {
21869
+ type: 'switch'
21870
+ }
21871
+ }, {
21872
+ fieldKey: 'singleLabel',
21873
+ type: 'string',
21874
+ title: 'Label of the checkbox',
21875
+ "default": 'Signle',
21876
+ ui: {
21877
+ type: 'text',
21878
+ vcontrol: 'return props.formData.ui.singleChekbox'
21879
+ }
21812
21880
  }, {
21813
21881
  fieldKey: 'disabled',
21814
21882
  type: 'boolean',
@@ -21823,7 +21891,8 @@ var config$6 = {
21823
21891
  title: 'Support all selection',
21824
21892
  "default": false,
21825
21893
  ui: {
21826
- type: 'switch'
21894
+ type: 'switch',
21895
+ vcontrol: 'return !props.formData.ui.singleChekbox'
21827
21896
  }
21828
21897
  }, {
21829
21898
  fieldKey: 'options',
@@ -21834,7 +21903,8 @@ var config$6 = {
21834
21903
  type: 'array',
21835
21904
  style: {
21836
21905
  marginBottom: '20px'
21837
- }
21906
+ },
21907
+ vcontrol: 'return !props.formData.ui.singleChekbox'
21838
21908
  },
21839
21909
  items: {
21840
21910
  type: 'object',
@@ -21880,7 +21950,7 @@ var config$6 = {
21880
21950
  }
21881
21951
  };
21882
21952
 
21883
- var _excluded$7 = ["fieldKey", "fieldData", "dispatch", "needCheckAll", "options", "onChange", "asyncValidate", "getKey", "formMode"];
21953
+ var _excluded$7 = ["fieldKey", "fieldData", "dispatch", "needCheckAll", "options", "onChange", "asyncValidate", "getKey", "formMode", "singleChekbox", "singleLabel"];
21884
21954
 
21885
21955
  function ownKeys$3(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; }
21886
21956
 
@@ -21901,6 +21971,10 @@ var CheckboxField = function CheckboxField(_ref) {
21901
21971
  asyncValidate = _ref.asyncValidate,
21902
21972
  getKey = _ref.getKey,
21903
21973
  formMode = _ref.formMode,
21974
+ _ref$singleChekbox = _ref.singleChekbox,
21975
+ singleChekbox = _ref$singleChekbox === void 0 ? false : _ref$singleChekbox,
21976
+ _ref$singleLabel = _ref.singleLabel,
21977
+ singleLabel = _ref$singleLabel === void 0 ? 'Single' : _ref$singleLabel,
21904
21978
  restProps = _objectWithoutProperties(_ref, _excluded$7);
21905
21979
 
21906
21980
  var _onChange = useField({
@@ -22031,6 +22105,17 @@ var CheckboxField = function CheckboxField(_ref) {
22031
22105
  return prev ? "".concat(prev, "; ").concat(typeof cur === 'string' ? cur : cur === null || cur === void 0 ? void 0 : cur.label) : "".concat(typeof cur === 'string' ? cur : cur === null || cur === void 0 ? void 0 : cur.label);
22032
22106
  }, '');
22033
22107
  return curOption || null;
22108
+ }
22109
+
22110
+ if (singleChekbox) {
22111
+ return /*#__PURE__*/React.createElement(_Checkbox, _extends({
22112
+ value: fieldData,
22113
+ onChange: function onChange(e) {
22114
+ var _e$target;
22115
+
22116
+ return _onChange(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.checked);
22117
+ }
22118
+ }, restProps), singleLabel);
22034
22119
  } // needCheckAll: 特殊props,用于判断是否使用全选
22035
22120
 
22036
22121
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@innoways/drip-form-theme-antd",
3
- "version": "6.2.3",
3
+ "version": "6.2.5",
4
4
  "author": "JDFED",
5
5
  "description": "drip-form antd主题包",
6
6
  "main": "dist/index.js",
@@ -31,14 +31,17 @@
31
31
  "dependencies": {
32
32
  "@ant-design/icons": "^4.7.0",
33
33
  "@babel/runtime": "^7.10.2",
34
- "@innoways/hooks": "^6.2.3",
35
- "@innoways/utils": "^6.2.3",
34
+ "@innoways/hooks": "^6.2.5",
35
+ "@innoways/utils": "^6.2.5",
36
36
  "antd": "^4.16.13",
37
+ "flatpickr": "^4.6.13",
37
38
  "moment": "^2.26.0",
38
39
  "react-color": "^2.18.1",
40
+ "react-flatpickr": "^3.10.13",
39
41
  "use-immer": "^0.6.0"
40
42
  },
41
43
  "devDependencies": {
44
+ "@types/react-flatpickr": "^3.8.11",
42
45
  "prop-types": "^15.7.2"
43
46
  },
44
47
  "peerDependencies": {