tntd 1.4.4 → 1.4.7

package/lib/QueryForm/Field/Select.js

@@ -1,100 +1,64 @@
-"use strict";
-
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-require("antd/lib/select/style");
-
-var _select = _interopRequireDefault(require("antd/lib/select"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_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 _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 Option = _select["default"].Option;
-
-var _default = function _default(props) {
-  var options = props.options,
-      params = props.params,
-      _props$queryKey = props.queryKey,
-      queryKey = _props$queryKey === void 0 ? 'name' : _props$queryKey,
-      _props$fieldNames = props.fieldNames,
-      fieldNames = _props$fieldNames === void 0 ? {
-    label: 'label',
-    value: 'value'
-  } : _props$fieldNames,
-      loadData = props.loadData,
-      rest = _objectWithoutProperties(props, ["options", "params", "queryKey", "fieldNames", "loadData"]);
-
-  var _useState = (0, _react.useState)(options || []),
-      _useState2 = _slicedToArray(_useState, 2),
-      items = _useState2[0],
-      setItems = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(''),
-      _useState4 = _slicedToArray(_useState3, 2),
-      query = _useState4[0],
-      setQuery = _useState4[1];
-
-  var onSearch = function onSearch(val) {
-    setQuery(val);
-  };
-
-  if (loadData) {
-    (0, _react.useEffect)(function () {
-      loadData(_objectSpread(_defineProperty({}, queryKey, query), params || {})).then(function (items) {
-        setItems(items);
-      });
-    }, [params, query]);
-  }
-
-  (0, _react.useEffect)(function () {
-    setItems(options || []);
-  }, [options]);
-  return _react["default"].createElement(_select["default"], _extends({
-    allowClear: true,
-    showSearch: true,
-    optionFilterProp: "children",
-    onSearch: onSearch
-  }, rest), items.map(function (item) {
-    var labelKey = (fieldNames == null ? void 0 : fieldNames.label) || 'label';
-    var valueKey = (fieldNames == null ? void 0 : fieldNames.value) || 'value';
-    var value = item instanceof Object ? item[valueKey] : item;
-    var label = item instanceof Object ? item[labelKey] : item;
-    var optionProps = item instanceof Object ? item : {};
-    return _react["default"].createElement(Option, _extends({}, optionProps, {
-      key: value,
-      value: value
-    }), label);
-  }));
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+const { Option } = Select;
+
+export default props => {
+    const {
+        options,
+        params,
+        queryKey = 'name',
+        fieldNames = {
+            label: 'label',
+            value: 'value'
+        },
+        loadData,
+        ...rest
+    } = props;
+    const [items, setItems] = useState(options || []);
+    const [query, setQuery] = useState('');
+    const onSearch = val => {
+        setQuery(val);
+    };
+
+    if (loadData) {
+        useEffect(() => {
+            loadData({
+                [queryKey]: query,
+                ...(params || {})
+            }).then(items => {
+                setItems(items);
+            });
+        }, [params, query]);
+    }
+
+    useEffect(() => {
+        setItems(options || []);
+    }, [options]);
+
+    return (
+        <Select
+            allowClear
+            showSearch
+            optionFilterProp="children"
+            onSearch={onSearch}
+            {...rest}
+        >
+            {
+                items.map(item => {
+                    const labelKey = fieldNames?.label || 'label';
+                    const valueKey = fieldNames?.value || 'value';
+                    const value = item instanceof Object ? item[valueKey] : item;
+                    const label = item instanceof Object ? item[labelKey] : item;
+                    const optionProps = item instanceof Object ? item : {};
+
+                    return (
+                        <Option {...optionProps} key={value} value={value}>
+                            {label}
+                        </Option>
+                    );
+                })
+            }
+        </Select>
+    );
 };
-
-exports["default"] = _default;

package/lib/QueryForm/Field/SelectInput.js

@@ -1,115 +1,70 @@
-"use strict";
-
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-require("antd/lib/input/style");
-
-var _input = _interopRequireDefault(require("antd/lib/input"));
-
-require("antd/lib/select/style");
-
-var _select = _interopRequireDefault(require("antd/lib/select"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _lodash = require("lodash");
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_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 _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 Option = _select["default"].Option;
-
-var _default = function _default(props) {
-  var _props$options = props.options,
-      options = _props$options === void 0 ? [] : _props$options,
-      addonBeforeStyle = props.addonBeforeStyle,
-      inputProps = _objectWithoutProperties(props, ["options", "addonBeforeStyle"]);
-
-  var _useState = (0, _react.useState)(options),
-      _useState2 = _slicedToArray(_useState, 2),
-      items = _useState2[0],
-      setItems = _useState2[1];
-
-  var getInitialKey = function getInitialKey() {
-    var key = (0, _lodash.get)(options, '0.value');
-
-    if (inputProps.value) {
-      key = (0, _lodash.get)(Object.keys(inputProps.value), '0') || key;
-    }
-
-    return key;
-  };
-
-  var _useState3 = (0, _react.useState)(getInitialKey()),
-      _useState4 = _slicedToArray(_useState3, 2),
-      key = _useState4[0],
-      setKey = _useState4[1];
-
-  var onKeyChange = function onKeyChange(key) {
-    setKey(key);
-    props.onChange(_defineProperty({}, key, ''));
-  };
-
-  var onChange = function onChange(evt) {
-    props.onChange(_defineProperty({}, key, evt.target.value));
-  };
-
-  var addonBefore = _react["default"].createElement(_select["default"], {
-    value: key,
-    onChange: onKeyChange,
-    style: _objectSpread({
-      width: '120px'
-    }, addonBeforeStyle)
-  }, items.map(function (_ref) {
-    var label = _ref.label,
-        value = _ref.value;
-    return _react["default"].createElement(Option, {
-      key: value,
-      value: value
-    }, label);
-  }));
-
-  var getInputValue = function getInputValue() {
-    return (0, _lodash.get)(inputProps.value, key);
-  };
-
-  (0, _react.useEffect)(function () {
-    setItems(options);
-    setKey(getInitialKey());
-  }, [options, inputProps.value]);
-  return _react["default"].createElement(_input["default"], _extends({}, inputProps, {
-    value: getInputValue(),
-    addonBefore: addonBefore,
-    onChange: onChange
-  }));
+import React, { useState, useEffect } from 'react';
+import { Select, Input } from 'antd';
+import { get } from 'lodash';
+
+const { Option } = Select;
+
+export default props => {
+    const {
+        options = [],
+        addonBeforeStyle,
+        ...inputProps
+    } = props;
+    const [items, setItems] = useState(options);
+    const getInitialKey = () => {
+        let key = get(options, '0.value');
+
+        if (inputProps.value) {
+            key = get(Object.keys(inputProps.value), '0') || key;
+        }
+
+        return key;
+    };
+    const [key, setKey] = useState(getInitialKey());
+    const onKeyChange = key => {
+        setKey(key);
+        props.onChange({
+            [key]: ''
+        });
+    };
+    const onChange = evt => {
+        props.onChange({
+            [key]: evt.target.value
+        });
+    };
+    const addonBefore = (
+        <Select
+            value={key}
+            onChange={onKeyChange}
+            style={{
+                width: '120px',
+                ...addonBeforeStyle
+            }}
+        >
+            {
+                items.map(({ label, value }) => (
+                    <Option key={value} value={value}>
+                        {label}
+                    </Option>
+                ))
+            }
+        </Select>
+    );
+    const getInputValue = () => {
+        return get(inputProps.value, key);
+    };
+
+    useEffect(() => {
+        setItems(options);
+        setKey(getInitialKey());
+    }, [options, inputProps.value]);
+
+    return (
+        <Input
+            {...inputProps}
+            value={getInputValue()}
+            addonBefore={addonBefore}
+            onChange={onChange}
+        />
+    );
 };
-
-exports["default"] = _default;

package/lib/QueryForm/Field/fieldsMap.js

@@ -1,55 +1,33 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = exports.getFieldWidth = exports.defaultFieldWidth = void 0;
-
-require("antd/lib/date-picker/style");
-
-var _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
-
-require("antd/lib/input-number/style");
-
-var _inputNumber = _interopRequireDefault(require("antd/lib/input-number"));
-
-require("antd/lib/input/style");
-
-var _input = _interopRequireDefault(require("antd/lib/input"));
-
-var _Select = _interopRequireDefault(require("./Select"));
-
-var _SelectInput = _interopRequireDefault(require("./SelectInput"));
-
-var _Checkbox = _interopRequireDefault(require("./Checkbox"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var defaultFieldWidth = '200px';
-exports.defaultFieldWidth = defaultFieldWidth;
-
-var getFieldWidth = function getFieldWidth(type) {
-  if (type === 'dateRange') {
-    return '340px';
-  }
-
-  return {
-    dateRange: '340px',
-    selectInput: '320px'
-  }[type] || defaultFieldWidth;
+import {
+    Input,
+    InputNumber,
+    DatePicker
+} from 'antd';
+import SelectField from './Select';
+import SelectInput from './SelectInput';
+import CheckboxField from './Checkbox';
+
+export const defaultFieldWidth = '200px';
+
+export const getFieldWidth = type => {
+    if (type === 'dateRange') {
+        return '340px';
+    }
+    return {
+        dateRange: '340px',
+        selectInput: '320px' 
+    }[type] || defaultFieldWidth; 
 };
 
-exports.getFieldWidth = getFieldWidth;
-var _default = {
-  string: _input["default"],
-  input: _input["default"],
-  search: _input["default"].Search,
-  inputNumber: _inputNumber["default"],
-  number: _inputNumber["default"],
-  select: _Select["default"],
-  checkbox: _Checkbox["default"],
-  date: _datePicker["default"],
-  dateRange: _datePicker["default"].RangePicker,
-  selectInput: _SelectInput["default"]
+export default {
+    string: Input,
+    input: Input,
+    search: Input.Search,
+    inputNumber: InputNumber,
+    number: InputNumber,
+    select: SelectField,
+    checkbox: CheckboxField,
+    date: DatePicker,
+    dateRange: DatePicker.RangePicker,
+    selectInput: SelectInput
 };
-exports["default"] = _default;