tntd 3.0.44 → 3.0.45

package/lib/query-form/Field/Composition/FieldPopover.js

@@ -13,11 +13,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _find2 = _interopRequireDefault(require("lodash/find"));
-var _filter2 = _interopRequireDefault(require("lodash/filter"));
-var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = require("lodash");
 var _empty = require("../../../empty");
 var _popover = _interopRequireDefault(require("../../../popover"));
 var _ellipsis = _interopRequireDefault(require("../../../ellipsis"));
@@ -26,6 +23,11 @@ var _utils = require("./utils");
 var _fieldsMap = _interopRequireDefault(require("../fieldsMap"));
 var _SelectInput = _interopRequireDefault(require("./SelectInput"));
 require("./FieldPopover.less");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : {
+    "default": e
+  };
+}
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -51,11 +53,6 @@ function _interopRequireWildcard(e, r) {
   }
   return n["default"] = e, t && t.set(e, n), n;
 }
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
 function _defineProperty(e, r, t) {
   return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
     value: t,
@@ -165,7 +162,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
       pName = _ref.pName,
       cName = _ref.cName,
       component = _ref.component;
-    var copyValue = (0, _cloneDeep2["default"])(value);
+    var copyValue = (0, _lodash.cloneDeep)(value);
     if (!pName && !(copyValue === null || copyValue === void 0 ? void 0 : copyValue.find(function (v) {
       return v.key === name;
     }))) {
@@ -179,7 +176,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
       var target;
       if (pName) {
         target = copyValue.find(function (v) {
-          return v.key === pName && !!(0, _get2["default"])(v.value, cName);
+          return v.key === pName && !!(0, _lodash.get)(v.value, cName);
         }) || {
           key: pName,
           value: _defineProperty({}, cName, undefined)
@@ -206,7 +203,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
     var _a, _b, _c, _d;
     var propObj = (v === null || v === void 0 ? void 0 : v.propItem) || propItem || {};
     var fieldProps = propObj.props; // 直接搜索拿v.xx的值
-    var copyValue = (0, _cloneDeep2["default"])(value || []);
+    var copyValue = (0, _lodash.cloneDeep)(value || []);
     var index;
     if (v === null || v === void 0 ? void 0 : v.propItem) {
       // 模糊搜索
@@ -262,7 +259,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
       type = _ref2$type === void 0 ? 'input' : _ref2$type,
       component = _ref2.component,
       fieldProps = _ref2.props;
-    var copyValue = (0, _cloneDeep2["default"])(value);
+    var copyValue = (0, _lodash.cloneDeep)(value);
     var index = copyValue.findIndex(function (v) {
       return v.key === (propItem === null || propItem === void 0 ? void 0 : propItem.name);
     });
@@ -323,7 +320,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
     }
   }, [fieldItems, searchText, propItem]);
   var renderFirstOptions = function renderFirstOptions() {
-    var firstItems = searchText ? (0, _filter2["default"])(fieldItems, function (v) {
+    var firstItems = searchText ? (0, _lodash.filter)(fieldItems, function (v) {
       var _ref4 = v.props || {},
         name = _ref4.name,
         propsTitle = _ref4.propsTitle,
@@ -331,7 +328,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
       var _propsTitle = propsTitle || title || name;
       return (_propsTitle === null || _propsTitle === void 0 ? void 0 : _propsTitle.indexOf(searchText)) > -1;
     }) : fieldItems;
-    var secondItems = searchText ? (0, _filter2["default"])(fieldItems, function (v) {
+    var secondItems = searchText ? (0, _lodash.filter)(fieldItems, function (v) {
       var _ref5 = v.props || {},
         _ref5$type = _ref5.type,
         type = _ref5$type === void 0 ? 'input' : _ref5$type,
@@ -340,7 +337,7 @@ var FieldPopover = function FieldPopover(_a, ref) {
         options = _ref6.options,
         loadData = _ref6.loadData,
         fieldNames = _ref6.fieldNames;
-      return type === 'select' && !loadData && !!(0, _find2["default"])(options, function (item) {
+      return type === 'select' && !loadData && !!(0, _lodash.find)(options, function (item) {
         var labelKey = (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label';
         var label = item instanceof Object ? item[labelKey] : item + '';
         var isReactDom = _react["default"].isValidElement(label);

package/lib/query-form/Field/Composition/Select.js

@@ -13,14 +13,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _find2 = _interopRequireDefault(require("lodash/find"));
-var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _icon = _interopRequireDefault(require("../../../icon"));
 var _ellipsis = _interopRequireDefault(require("../../../ellipsis"));
 var _empty = _interopRequireDefault(require("../../../empty"));
 var _utils = require("./utils");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : {
+    "default": e
+  };
+}
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -46,11 +50,6 @@ function _interopRequireWildcard(e, r) {
   }
   return n["default"] = e, t && t.set(e, n), n;
 }
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
 function _defineProperty(e, r, t) {
   return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
     value: t,
@@ -170,7 +169,7 @@ var _default = exports["default"] = function _default(props) {
     var value = item instanceof Object ? item[valueKey] : item;
     var label = item instanceof Object ? item[labelKey] : item + '';
     var disabled = item instanceof Object ? item['disabled'] : false;
-    var isSelected = (0, _isArray2["default"])(_value) ? (_value === null || _value === void 0 ? void 0 : _value.indexOf(value)) > -1 : value === _value;
+    var isSelected = (0, _lodash.isArray)(_value) ? (_value === null || _value === void 0 ? void 0 : _value.indexOf(value)) > -1 : value === _value;
     if (searchText) {
       var isReactDom = _react["default"].isValidElement(label);
       var _label = isReactDom ? (0, _utils.formatLabel)(label) : label;
@@ -240,7 +239,7 @@ var _default = exports["default"] = function _default(props) {
       className: "ant-select-selected-icon"
     }));
   });
-  if (showEmpty && !(0, _find2["default"])(children, function (it) {
+  if (showEmpty && !(0, _lodash.find)(children, function (it) {
     return !!it;
   })) {
     children = _react["default"].createElement(_empty["default"], {

package/lib/query-form/Field/Composition/ValueTag.js

@@ -13,9 +13,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = ValueTag;
-var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
-var _find2 = _interopRequireDefault(require("lodash/find"));
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = require("lodash");
 var _popover = _interopRequireDefault(require("../../../popover"));
 var _tag = _interopRequireDefault(require("../../../tag"));
 var _fieldsMap = _interopRequireDefault(require("../fieldsMap"));
@@ -23,6 +22,11 @@ var _SelectInput = _interopRequireDefault(require("./SelectInput"));
 var _Select = _interopRequireDefault(require("./Select"));
 var _utils = require("./utils");
 require("./FieldPopover.less");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : {
+    "default": e
+  };
+}
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -48,11 +52,6 @@ function _interopRequireWildcard(e, r) {
   }
   return n["default"] = e, t && t.set(e, n), n;
 }
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
 function _slicedToArray(r, e) {
   return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
@@ -116,7 +115,7 @@ function ValueTag(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var propItem = ((_a = (0, _find2["default"])(fieldItems, function (it) {
+  var propItem = ((_a = (0, _lodash.find)(fieldItems, function (it) {
     var _a;
     return ((_a = it.props) === null || _a === void 0 ? void 0 : _a.name) === item.key;
   })) === null || _a === void 0 ? void 0 : _a.props) || {};
@@ -138,7 +137,7 @@ function ValueTag(_ref) {
   };
   var onFieldChange = function onFieldChange() {
     var _a;
-    var copyValue = (0, _cloneDeep2["default"])(value);
+    var copyValue = (0, _lodash.cloneDeep)(value);
     var index = copyValue.findIndex(function (v) {
       return v.key === name;
     });
@@ -151,7 +150,7 @@ function ValueTag(_ref) {
   };
   var onSelectChange = function onSelectChange(v, isMultiple) {
     var _a, _b, _c;
-    var copyValue = (0, _cloneDeep2["default"])(value || []);
+    var copyValue = (0, _lodash.cloneDeep)(value || []);
     var index = copyValue.findIndex(function (v) {
       return v.key === name;
     });
@@ -226,7 +225,7 @@ function ValueTag(_ref) {
       if (!_isInput) {
         setVisible(true);
       } else {
-        handleTag((0, _cloneDeep2["default"])(item));
+        handleTag((0, _lodash.cloneDeep)(item));
       }
     },
     onClose: function onClose(e) {

package/lib/query-form/Field/Composition/index.js

@@ -13,16 +13,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _find2 = _interopRequireDefault(require("lodash/find"));
 var _react = _interopRequireWildcard(require("react"));
 var _LocaleReceiver = _interopRequireDefault(require("antd/lib/locale-provider/LocaleReceiver"));
+var _lodash = require("lodash");
 var _icon = _interopRequireDefault(require("../../../icon"));
 var _input = _interopRequireDefault(require("../../../input"));
 var _FieldPopover = _interopRequireDefault(require("./FieldPopover"));
 var _ValueTag = _interopRequireDefault(require("./ValueTag"));
 var _utils = require("./utils");
 require("./index.less");
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : {
+    "default": e
+  };
+}
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -48,11 +52,6 @@ function _interopRequireWildcard(e, r) {
   }
   return n["default"] = e, t && t.set(e, n), n;
 }
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
 function _toConsumableArray(r) {
   return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
 }
@@ -181,7 +180,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     fieldItem = _useState10[0],
     setFieldItem = _useState10[1];
   var fieldItemsRef = (0, _react.useRef)(fieldItems);
-  var _fieldItem = fieldItem ? ((_a = (0, _find2["default"])(fieldItems, function (f) {
+  var _fieldItem = fieldItem ? ((_a = (0, _lodash.find)(fieldItems, function (f) {
     var _a;
     return ((_a = f.props) === null || _a === void 0 ? void 0 : _a.name) === fieldItem.name;
   })) === null || _a === void 0 ? void 0 : _a.props) || fieldItem : {};
@@ -249,7 +248,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     e.stopPropagation();
     var inputValue = ((_a = searchText === null || searchText === void 0 ? void 0 : searchText.match(/[^:]+:(.*)/)) === null || _a === void 0 ? void 0 : _a[1]) || null;
     if (tempItem && inputValue) {
-      if ((0, _isObject2["default"])(tempItem.value)) {
+      if ((0, _lodash.isObject)(tempItem.value)) {
         tempItem.value = _defineProperty({}, Object.keys(tempItem.value)[0], inputValue);
       } else {
         tempItem.value = inputValue; // 得到输入值
@@ -286,7 +285,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
       var deleteKeys = [key];
       onChange((0, _utils.parseArrayToObject)(newValue), deleteKeys, true);
       // 删除的时候也触发Field的onChange --  泳建提的需求
-      var fieldProps = (_a = (0, _find2["default"])(fieldItems, function (it) {
+      var fieldProps = (_a = (0, _lodash.find)(fieldItems, function (it) {
         var _a;
         return ((_a = it.props) === null || _a === void 0 ? void 0 : _a.name) === key;
       })) === null || _a === void 0 ? void 0 : _a.props;
@@ -336,7 +335,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     var fieldValue;
     if (tempItem && inputValue) {
       setVisible(false);
-      if ((0, _isObject2["default"])(tempItem.value)) {
+      if ((0, _lodash.isObject)(tempItem.value)) {
         tempItem.value = _defineProperty({}, Object.keys(tempItem.value)[0], inputValue);
       } else {
         tempItem.value = inputValue; // 得到输入值

package/lib/query-form/Field/Composition/utils.js

@@ -10,10 +10,8 @@ exports.highlightSubstring = highlightSubstring;
 exports.isInput = void 0;
 exports.parseArrayToObject = parseArrayToObject;
 exports.parseObjectToArray = parseObjectToArray;
-var _flatten2 = _interopRequireDefault(require("lodash/flatten"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _react = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
@@ -44,17 +42,17 @@ function getLabelByValue(_ref) {
       return value;
     }
   };
-  if ((0, _isArray2["default"])(value)) {
+  if ((0, _lodash.isArray)(value)) {
     return value.map(getLabel).join(' | ');
   } else {
     return getLabel(value);
   }
 }
 function formatLabel(reactDom) {
-  return (0, _flatten2["default"])(_react["default"].Children.map(reactDom.props.children, function (child) {
+  return (0, _lodash.flatten)(_react["default"].Children.map(reactDom.props.children, function (child) {
     if (_react["default"].isValidElement(child)) {
       return formatLabel(child);
-    } else if ((0, _isString2["default"])(child)) {
+    } else if ((0, _lodash.isString)(child)) {
       return child;
     }
     return '';

package/lib/query-form/index.less

@@ -31,9 +31,12 @@
 
   .ant-form {
     display: inline-block;
-    margin-bottom: 12px;
+    margin-bottom: 16px;
     display: flex;
     flex: 1;
+    &.expanded.showMore {
+      margin-bottom: 4px;
+    }
     &.ant-form-inline {
       flex-wrap: unset;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.44",
+    "version": "3.0.45",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",
@@ -113,4 +113,4 @@
     "main": "lib/index.js",
     "module": "es/index.js",
     "typings": "lib/index.d.ts"
-}
+}