升级

乔启韬
1 parent d55b08c9
Showing 9 changed files with 125 additions and 37 deletions
es/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
es/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
es/form-render-core/src/core/RenderChildren/RenderList/index.js
es/form-render-core/src/index.css
lib/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
lib/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
lib/form-render-core/src/core/RenderChildren/RenderList/index.js
lib/form-render-core/src/index.css
package.json
--- a/es/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
View file @a79b7dc
+++ b/es/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
View file @a79b7dc
@@ -73,7 +73,8 @@ var ListForMobile = function ListForMobile(_ref) {
       getFieldsProps = _ref.getFieldsProps;
   var _schema$props = schema.props,
       props = _schema$props === void 0 ? {} : _schema$props,
-      itemProps = schema.itemProps;
+      itemProps = schema.itemProps,
+      handleAddDefault = schema.handleAddDefault;
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -157,7 +158,7 @@ var ListForMobile = function ListForMobile(_ref) {
   }))), /*#__PURE__*/React.createElement("a", {
     className: 'add-button',
     onClick: function onClick() {
-      addItem();
+      addItem(handleAddDefault);
     }
   }, /*#__PURE__*/React.createElement(_PlusCircleFilled, {
     style: {
--- a/es/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
View file @a79b7dc
+++ b/es/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
View file @a79b7dc
@@ -149,7 +149,8 @@ var VirtualList = function VirtualList(_ref) {
       qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
       subformMode = schema.subformMode,
       subReadOnly = schema.subReadOnly,
-      isLoading = schema.isLoading;
+      isLoading = schema.isLoading,
+      handleAddDefault = schema.handleAddDefault;
   var _props$scrollY = props.scrollY,
       scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
@@ -1093,7 +1094,9 @@ var VirtualList = function VirtualList(_ref) {
   }, rest)), !props.hideAdd && props.originWidget === 'subform' && !subReadOnly && /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     icon: /*#__PURE__*/React.createElement(_PlusOutlined, null),
-    onClick: addItem
+    onClick: function onClick() {
+      addItem(handleAddDefault);
+    }
   }, "\u65B0\u589E"));
 };
 /**
--- a/es/form-render-core/src/core/RenderChildren/RenderList/index.js
View file @a79b7dc
+++ b/es/form-render-core/src/core/RenderChildren/RenderList/index.js
View file @a79b7dc
-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; }
-
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,6 +10,12 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+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; }
+
+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; }
+
 /* eslint-disable jsx-a11y/anchor-is-valid */
 import React from 'react';
 import { get } from 'lodash-es';
@@ -68,23 +68,37 @@ var RenderList = function RenderList(_ref) {
     listData = get(formData, dataPath);
   }
-  var displayList = Array.isArray(listData) ? listData : [];
+  var displayList = Array.isArray(listData) && JSON.stringify(listData) !== '[{}]' ? listData : [];
   var changeList = function changeList(newList) {
     onItemChange(dataPath, newList);
   };
-  var addItem = function addItem() {
+  var addItem = function addItem(handleAddDefault) {
     // const newList = [...displayList, {_active: true}];
     var _schema = getSchemaFromFlatten(flatten, parentId);
-    var newItem = generateDataSkeleton(_schema.items) || {};
-    var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
+    var _newItem = generateDataSkeleton(_schema.items) || {};
+
+    var newItem = _objectSpread(_objectSpread({}, _newItem), {}, {
       _active: true
-    })]);
-    var newIndex = newList.length - 1;
-    onItemChange(dataPath, newList);
-    return newIndex;
+    });
+
+    var callback = function callback() {
+      var _new = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : newItem;
+
+      onItemChange(dataPath, [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, _new), {}, {
+        _active: true
+      })]));
+    };
+
+    if (_.isFunction(handleAddDefault)) {
+      handleAddDefault(newItem, callback);
+    } else {
+      callback();
+    }
+
+    return displayList.length;
   };
   var copyItem = function copyItem(idx) {
--- a/es/form-render-core/src/index.css
View file @a79b7dc
+++ b/es/form-render-core/src/index.css
View file @a79b7dc
@@ -295,6 +295,10 @@
   cursor: pointer;
   position: relative;
 }
+.fr-container .fr-tooltip-toggle:hover .fr-tooltip-container {
+  opacity: 1;
+  visibility: visible;
+}
 .fr-container .fr-tooltip-icon {
   height: 14px;
   width: 14px;
@@ -303,6 +307,28 @@
   display: block;
   margin: 4px 0 0 4px;
 }
+.fr-container .fr-tooltip-container {
+  position: absolute;
+  width: 160px;
+  white-space: initial !important;
+  top: -4px;
+  left: 0;
+  bottom: unset;
+  transform: translateY(-100%);
+  text-align: left;
+  background: #2b222a;
+  padding: 4px;
+  margin-left: -69px;
+  border-radius: 4px;
+  color: #efefef;
+  font-size: 13px;
+  cursor: auto;
+  z-index: 99999;
+  transition: all 0.5s ease;
+  opacity: 0;
+  visibility: hidden;
+  word-wrap: break-word;
+}
 .fr-container .fr-slider {
   display: flex;
   width: 100%;
--- a/lib/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
View file @a79b7dc
+++ b/lib/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
View file @a79b7dc
@@ -89,7 +89,8 @@ var ListForMobile = function ListForMobile(_ref) {
       getFieldsProps = _ref.getFieldsProps;
   var _schema$props = schema.props,
       props = _schema$props === void 0 ? {} : _schema$props,
-      itemProps = schema.itemProps;
+      itemProps = schema.itemProps,
+      handleAddDefault = schema.handleAddDefault;
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -173,7 +174,7 @@ var ListForMobile = function ListForMobile(_ref) {
   }))), /*#__PURE__*/_react.default.createElement("a", {
     className: 'add-button',
     onClick: function onClick() {
-      addItem();
+      addItem(handleAddDefault);
     }
   }, /*#__PURE__*/_react.default.createElement(_PlusCircleFilled2.default, {
     style: {
--- a/lib/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
View file @a79b7dc
+++ b/lib/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
View file @a79b7dc
@@ -209,7 +209,8 @@ var VirtualList = function VirtualList(_ref) {
       qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
       subformMode = schema.subformMode,
       subReadOnly = schema.subReadOnly,
-      isLoading = schema.isLoading;
+      isLoading = schema.isLoading,
+      handleAddDefault = schema.handleAddDefault;
   var _props$scrollY = props.scrollY,
       scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
@@ -1155,7 +1156,9 @@ var VirtualList = function VirtualList(_ref) {
   }, rest)), !props.hideAdd && props.originWidget === 'subform' && !subReadOnly && /*#__PURE__*/_react.default.createElement(_button.default, {
     type: "link",
     icon: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
-    onClick: addItem
+    onClick: function onClick() {
+      addItem(handleAddDefault);
+    }
   }, "\u65B0\u589E"));
 };
 /**
--- a/lib/form-render-core/src/core/RenderChildren/RenderList/index.js
View file @a79b7dc
+++ b/lib/form-render-core/src/core/RenderChildren/RenderList/index.js
View file @a79b7dc
@@ -31,12 +31,6 @@ var _ListForMobile = _interopRequireDefault(require("./ListForMobile"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -49,6 +43,12 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+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; }
+
+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 RenderList = function RenderList(_ref) {
   var parentId = _ref.parentId,
       _ref$schema = _ref.schema,
@@ -87,23 +87,37 @@ var RenderList = function RenderList(_ref) {
     listData = (0, _lodashEs.get)(formData, dataPath);
   }
-  var displayList = Array.isArray(listData) ? listData : [];
+  var displayList = Array.isArray(listData) && JSON.stringify(listData) !== '[{}]' ? listData : [];
   var changeList = function changeList(newList) {
     onItemChange(dataPath, newList);
   };
-  var addItem = function addItem() {
+  var addItem = function addItem(handleAddDefault) {
     // const newList = [...displayList, {_active: true}];
     var _schema = (0, _utils.getSchemaFromFlatten)(flatten, parentId);
-    var newItem = (0, _utils.generateDataSkeleton)(_schema.items) || {};
-    var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
+    var _newItem = (0, _utils.generateDataSkeleton)(_schema.items) || {};
+
+    var newItem = _objectSpread(_objectSpread({}, _newItem), {}, {
       _active: true
-    })]);
-    var newIndex = newList.length - 1;
-    onItemChange(dataPath, newList);
-    return newIndex;
+    });
+
+    var callback = function callback() {
+      var _new = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : newItem;
+
+      onItemChange(dataPath, [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, _new), {}, {
+        _active: true
+      })]));
+    };
+
+    if (_.isFunction(handleAddDefault)) {
+      handleAddDefault(newItem, callback);
+    } else {
+      callback();
+    }
+
+    return displayList.length;
   };
   var copyItem = function copyItem(idx) {
--- a/lib/form-render-core/src/index.css
View file @a79b7dc
+++ b/lib/form-render-core/src/index.css
View file @a79b7dc
@@ -295,6 +295,10 @@
   cursor: pointer;
   position: relative;
 }
+.fr-container .fr-tooltip-toggle:hover .fr-tooltip-container {
+  opacity: 1;
+  visibility: visible;
+}
 .fr-container .fr-tooltip-icon {
   height: 14px;
   width: 14px;
@@ -303,6 +307,28 @@
   display: block;
   margin: 4px 0 0 4px;
 }
+.fr-container .fr-tooltip-container {
+  position: absolute;
+  width: 160px;
+  white-space: initial !important;
+  top: -4px;
+  left: 0;
+  bottom: unset;
+  transform: translateY(-100%);
+  text-align: left;
+  background: #2b222a;
+  padding: 4px;
+  margin-left: -69px;
+  border-radius: 4px;
+  color: #efefef;
+  font-size: 13px;
+  cursor: auto;
+  z-index: 99999;
+  transition: all 0.5s ease;
+  opacity: 0;
+  visibility: hidden;
+  word-wrap: break-word;
+}
 .fr-container .fr-slider {
   display: flex;
   width: 100%;
--- a/package.json
View file @a79b7dc
+++ b/package.json
View file @a79b7dc
 {
   "name": "@qx/form-render",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
   "repository": {
     "type": "git",