parsec-libs 0.0.76 → 0.0.77

package/dist/index.js

@@ -2092,7 +2092,7 @@ var renderOptionsItem = function renderOptionsItem(_ref) {
     }))));
   }));
 };
-var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, function (_ref4) {
+var QuestionFormItem = /*#__PURE__*/React.memo(parsecHooks.ContainerUseWrap(QuestionSettingStore, function (_ref4) {
   var value = _ref4.value,
       index = _ref4.index,
       onRemove = _ref4.onRemove,
@@ -2102,6 +2102,7 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
       list = _ref4.list,
       moveUpDisabled = _ref4.moveUpDisabled,
       moveDownDisabled = _ref4.moveDownDisabled;
+  console.log('item render');
 
   var _ref5 = value || {},
       questionType = _ref5.questionType;
@@ -2152,73 +2153,22 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
     onValuesChange: function onValuesChange(_, values) {
       return run(values);
     }
-  }, /*#__PURE__*/React__default['default'].createElement(parsecAdmin.Form.Item, {
+  }, questionVisible ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(parsecAdmin.Form.Item, {
     noStyle: true,
     shouldUpdate: true
   }, function (_ref7) {
     var getFieldValue = _ref7.getFieldValue;
     return setFormItemsDisabled(!!getFieldValue('baseQuestionId'));
-  }), /*#__PURE__*/React__default['default'].createElement(SettingDrawer, null), /*#__PURE__*/React__default['default'].createElement(_Card__default['default'], {
-    title: /*#__PURE__*/React__default['default'].createElement(parsecAdmin.Form.Item, {
-      shouldUpdate: true,
-      noStyle: true
-    }, function (_ref8) {
-      var getFieldValue = _ref8.getFieldValue;
-      var questionType = getFieldValue('questionType');
-      var score = getFieldValue('score');
-      var parentGroupsSize = list.filter(function (_, i) {
-        return i <= index;
-      }).map(function (_ref9) {
-        var _ref9$groupSize = _ref9.groupSize,
-            groupSize = _ref9$groupSize === void 0 ? 0 : _ref9$groupSize;
-        return groupSize;
-      }).reduce(function (a, b) {
-        return a + b;
-      }, 0);
-
-      var _ref10 = list.map(function (item, index) {
-        return _objectSpread2({
-          index: index
-        }, item);
-      }).filter(function (_ref11) {
-        var questionType = _ref11.questionType;
-        return questionType === QuestionType.组;
-      }).reverse().find(function (_ref12) {
-        var itemIndex = _ref12.index,
-            groupSize = _ref12.groupSize;
-        return itemIndex < index && itemIndex + groupSize >= index;
-      }) || {},
-          groupIndex = _ref10.index,
-          groupSize = _ref10.groupSize;
-
-      var count = groupSize && questionType !== QuestionType.组 ? "".concat(groupIndex + 1 - parentGroupsSize + groupSize, ".").concat(index - groupIndex) : index + 1 - parentGroupsSize + (value.groupSize || 0);
-      return "".concat(getFieldValue('isMustAnswer') ? '* ' : '', "\u9898\u76EE").concat(count, " \uFF08").concat(questionType === QuestionType.组 ? '题目分组' : questionType ? "".concat(QuestionTypeObj[questionType], "\u9898") : '', "\uFF09").concat(score ? "\uFF08".concat(score, "\u5206\uFF09") : '');
-    }),
-    type: "inner",
-    extra: /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-      title: "\u4E0A\u79FB"
-    }, /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
-      type: "link",
-      icon: /*#__PURE__*/React__default['default'].createElement(icons.ArrowUpOutlined, null),
-      onClick: onMoveUp,
-      disabled: moveUpDisabled
-    })), /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-      title: "\u4E0B\u79FB"
-    }, /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
-      type: "link",
-      icon: /*#__PURE__*/React__default['default'].createElement(icons.ArrowDownOutlined, null),
-      onClick: onMoveDown,
-      disabled: moveDownDisabled
-    })), /*#__PURE__*/React__default['default'].createElement(_Divider__default['default'], {
-      type: "vertical"
-    }), /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
-      title: "\u5220\u9664\u95EE\u9898"
-    }, /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
-      type: "link",
-      icon: /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, null),
-      danger: true,
-      onClick: onRemove
-    })))
+  }), /*#__PURE__*/React__default['default'].createElement(SettingDrawer, null), /*#__PURE__*/React__default['default'].createElement(CardItem, {
+    value: value,
+    index: index,
+    onRemove: onRemove,
+    onChange: onChange,
+    onMoveDown: onMoveDown,
+    onMoveUp: onMoveUp,
+    list: list,
+    moveUpDisabled: moveUpDisabled,
+    moveDownDisabled: moveDownDisabled
   }, /*#__PURE__*/React__default['default'].createElement(parsecAdmin.FormDescriptions, _extends({}, formDescriptionsProps, {
     column: 1,
     items: [{
@@ -2297,13 +2247,103 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
     questionType: questionType,
     form: form,
     disabled: formItemsDisabled
-  })));
+  }))) : /*#__PURE__*/React__default['default'].createElement(CardItem, {
+    value: value,
+    index: index,
+    onRemove: onRemove,
+    onChange: onChange,
+    onMoveDown: onMoveDown,
+    onMoveUp: onMoveUp,
+    list: list,
+    moveUpDisabled: moveUpDisabled,
+    moveDownDisabled: moveDownDisabled
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "to-edit"
+  }, "\u70B9\u51FB\u7F16\u8F91")));
+}), function (oldProps, newProps) {
+  return JSON.stringify(oldProps) !== JSON.stringify(newProps);
 });
-var QuestionFormItem$1 = styled__default['default'](parsecAdmin.OldForm)(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  > .", "-card {\n    ", "\n  }\n"])), function (_ref13) {
-  var prefixCls = _ref13.theme.prefixCls;
+
+var CardItem = function CardItem(_ref8) {
+  var value = _ref8.value,
+      index = _ref8.index,
+      onRemove = _ref8.onRemove,
+      onChange = _ref8.onChange,
+      onMoveDown = _ref8.onMoveDown,
+      onMoveUp = _ref8.onMoveUp,
+      children = _ref8.children,
+      list = _ref8.list,
+      moveUpDisabled = _ref8.moveUpDisabled,
+      moveDownDisabled = _ref8.moveDownDisabled;
+  return /*#__PURE__*/React__default['default'].createElement(_Card__default['default'], {
+    title: /*#__PURE__*/React__default['default'].createElement(parsecAdmin.Form.Item, {
+      shouldUpdate: true,
+      noStyle: true
+    }, function (_ref9) {
+      var getFieldValue = _ref9.getFieldValue;
+      var questionType = getFieldValue('questionType');
+      var score = getFieldValue('score');
+      var parentGroupsSize = list.filter(function (_, i) {
+        return i <= index;
+      }).map(function (_ref10) {
+        var _ref10$groupSize = _ref10.groupSize,
+            groupSize = _ref10$groupSize === void 0 ? 0 : _ref10$groupSize;
+        return groupSize;
+      }).reduce(function (a, b) {
+        return a + b;
+      }, 0);
+
+      var _ref11 = list.map(function (item, index) {
+        return _objectSpread2({
+          index: index
+        }, item);
+      }).filter(function (_ref12) {
+        var questionType = _ref12.questionType;
+        return questionType === QuestionType.组;
+      }).reverse().find(function (_ref13) {
+        var itemIndex = _ref13.index,
+            groupSize = _ref13.groupSize;
+        return itemIndex < index && itemIndex + groupSize >= index;
+      }) || {},
+          groupIndex = _ref11.index,
+          groupSize = _ref11.groupSize;
+
+      var count = groupSize && questionType !== QuestionType.组 ? "".concat(groupIndex + 1 - parentGroupsSize + groupSize, ".").concat(index - groupIndex) : index + 1 - parentGroupsSize + (value.groupSize || 0);
+      return "".concat(getFieldValue('isMustAnswer') ? '* ' : '', "\u9898\u76EE").concat(count, " \uFF08").concat(questionType === QuestionType.组 ? '题目分组' : questionType ? "".concat(QuestionTypeObj[questionType], "\u9898") : '', "\uFF09").concat(score ? "\uFF08".concat(score, "\u5206\uFF09") : '');
+    }),
+    type: "inner",
+    extra: /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
+      title: "\u4E0A\u79FB"
+    }, /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
+      type: "link",
+      icon: /*#__PURE__*/React__default['default'].createElement(icons.ArrowUpOutlined, null),
+      onClick: onMoveUp,
+      disabled: moveUpDisabled
+    })), /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
+      title: "\u4E0B\u79FB"
+    }, /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
+      type: "link",
+      icon: /*#__PURE__*/React__default['default'].createElement(icons.ArrowDownOutlined, null),
+      onClick: onMoveDown,
+      disabled: moveDownDisabled
+    })), /*#__PURE__*/React__default['default'].createElement(_Divider__default['default'], {
+      type: "vertical"
+    }), /*#__PURE__*/React__default['default'].createElement(_Tooltip__default['default'], {
+      title: "\u5220\u9664\u95EE\u9898"
+    }, /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
+      type: "link",
+      icon: /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, null),
+      danger: true,
+      onClick: onRemove
+    })))
+  }, children);
+};
+
+var QuestionFormItem$1 = styled__default['default'](parsecAdmin.OldForm)(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  > .", "-card {\n    ", "\n  }\n  .to-edit {\n    text-align: center;\n  }\n"])), function (_ref14) {
+  var prefixCls = _ref14.theme.prefixCls;
   return prefixCls;
-}, function (_ref14) {
-  var selected = _ref14.selected;
+}, function (_ref15) {
+  var selected = _ref15.selected;
   return selected && styled.css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        border-color: #4e9fe6;\n        box-shadow: 0 0 0 2px rgba(39, 128, 218, 0.2);\n      "])));
 });
 
@@ -2317,9 +2357,13 @@ var QuestionList = (function (_ref) {
       form = _Form$useForm2[0];
 
   React.useEffect(function () {
-    form.setFieldsValue({
-      questionList: value
-    });
+    var formValue = form.getFieldValue('questionList');
+
+    if (JSON.stringify(formValue) !== JSON.stringify(value)) {
+      form.setFieldsValue({
+        questionList: value
+      });
+    }
   }, [form, value]);
   useAddForm(form);
   return /*#__PURE__*/React__default['default'].createElement(_Form__default['default'], {
@@ -2338,7 +2382,7 @@ var QuestionList = (function (_ref) {
         move = _ref2.move;
     return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, fields.map(function (field, index) {
       return /*#__PURE__*/React__default['default'].createElement(React.Fragment, {
-        key: index
+        key: field.key
       }, /*#__PURE__*/React__default['default'].createElement(_Form__default['default'].Item, _extends({}, field, {
         noStyle: true
       }), /*#__PURE__*/React__default['default'].createElement(QuestionFormItem, {

package/dist/questionnaire/edit/QuestionFormItem.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { QuestionItem, QuestionType } from '../api';
 import { FormInstance } from 'antd/lib/form';
 import { ColProps } from 'antd/lib/grid';
@@ -9,7 +10,7 @@ export declare const renderOptionsItem: ({ questionType, form, wrapperCol, label
     labelCol?: ColProps;
     disabled?: boolean;
 }) => JSX.Element;
-declare const _default: (props: {
+declare const _default: React.MemoExoticComponent<(props: {
     index: number;
     value?: QuestionItem;
     onChange?: (value: QuestionItem) => void;
@@ -19,5 +20,5 @@ declare const _default: (props: {
     moveUpDisabled: boolean;
     list: QuestionItem[];
     moveDownDisabled: boolean;
-}) => JSX.Element;
+}) => JSX.Element>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parsec-libs",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.10.4",
+    "@types/react": "^16.0.0",
     "clipboard": "^2.0.8",
     "create-api-hooks": "^0.0.27",
     "file-saver": "^2.0.2",