parsec-libs 0.0.62 → 0.0.64

package/dist/index.js

@@ -361,12 +361,13 @@ var QuestionType;
 
 (function (QuestionType) {
   QuestionType["\u586B\u7A7A"] = "FILL";
+  QuestionType["\u7EC4"] = "GROUP";
   QuestionType["\u5355\u9009"] = "SINGLE_CHOOSE";
   QuestionType["\u591A\u9009"] = "MULT_CHOOSE";
   QuestionType["\u6253\u5206"] = "SCORE";
 })(QuestionType || (QuestionType = {}));
 
-var QuestionTypeObj = (_QuestionTypeObj = {}, _defineProperty(_QuestionTypeObj, QuestionType.填空, '填空'), _defineProperty(_QuestionTypeObj, QuestionType.单选, '单选'), _defineProperty(_QuestionTypeObj, QuestionType.多选, '多选'), _defineProperty(_QuestionTypeObj, QuestionType.打分, '打分'), _QuestionTypeObj);
+var QuestionTypeObj = (_QuestionTypeObj = {}, _defineProperty(_QuestionTypeObj, QuestionType.填空, '填空'), _defineProperty(_QuestionTypeObj, QuestionType.单选, '单选'), _defineProperty(_QuestionTypeObj, QuestionType.组, '组'), _defineProperty(_QuestionTypeObj, QuestionType.多选, '多选'), _defineProperty(_QuestionTypeObj, QuestionType.打分, '打分'), _QuestionTypeObj);
 var PersonalInfoObj = {
   name: '姓名',
   gender: '性别',
@@ -1412,6 +1413,14 @@ var LeftPart = (function () {
           return switchQuestionBankModalVisible();
         }
       }, "\u4ECE\u9898\u5E93\u5F15\u7528"), /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
+        icon: /*#__PURE__*/React__default['default'].createElement(icons.PlusOutlined, null),
+        onClick: function onClick() {
+          return handleAdd({
+            questionType: QuestionType.组,
+            groupSize: 1
+          });
+        }
+      }, "\u6DFB\u52A0\u9898\u5206\u7EC4"), /*#__PURE__*/React__default['default'].createElement(_Button__default['default'], {
         icon: /*#__PURE__*/React__default['default'].createElement(icons.PlusOutlined, null),
         onClick: function onClick() {
           return handleAdd(QuestionType.单选);
@@ -1590,7 +1599,7 @@ var LinkTable = (function (_ref) {
       title: '显示/隐藏',
       dataIndex: 'isShow',
       render: function render(v) {
-        return v ? '是' : '否';
+        return v ? '显示' : '隐藏';
       }
     }, {
       title: '操作',
@@ -1832,6 +1841,14 @@ var SettingDrawer = (function () {
               disabled: surveyType === SurveyType.测评
             })
           }
+        }, {
+          label: '是否显示',
+          name: 'isShow',
+          formItemProps: {
+            valuePropName: 'checked',
+            initialValue: true,
+            render: /*#__PURE__*/React__default['default'].createElement(_Switch__default['default'], null)
+          }
         }, {
           label: '多选/单选',
           name: 'questionType',
@@ -2068,6 +2085,7 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
       onChange = _ref4.onChange,
       onMoveDown = _ref4.onMoveDown,
       onMoveUp = _ref4.onMoveUp,
+      list = _ref4.list,
       moveUpDisabled = _ref4.moveUpDisabled,
       moveDownDisabled = _ref4.moveDownDisabled;
 
@@ -2086,11 +2104,11 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
   }, [form, value]);
 
   var _useThrottleFn = ahooks.useThrottleFn(function (values) {
-    return onChange && onChange(_objectSpread2(_objectSpread2({}, values), {}, {
+    return onChange && onChange(_objectSpread2(_objectSpread2(_objectSpread2({}, value), values), {}, {
       sortNo: index
     }));
   }, {
-    wait: 500
+    wait: 1000
   }),
       run = _useThrottleFn.run;
 
@@ -2134,7 +2152,33 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
       var getFieldValue = _ref8.getFieldValue;
       var questionType = getFieldValue('questionType');
       var score = getFieldValue('score');
-      return "".concat(getFieldValue('isMustAnswer') ? '* ' : '', "\u9898\u76EE").concat(index + 1, " \uFF08").concat(questionType ? QuestionTypeObj[questionType] : '', "\u9898\uFF09").concat(score ? "\uFF08".concat(score, "\u5206\uFF09") : '');
+      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'], {
@@ -2180,20 +2224,37 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
       hidden: true
     }, {
       required: true,
-      label: '题目描述',
+      label: questionType === QuestionType.组 ? '分组标题' : '题目描述',
       formItemProps: {
         style: {
           padding: 0
         },
         render: /*#__PURE__*/React__default['default'].createElement(_Input__default['default'], {
           disabled: formItemsDisabled,
-          placeholder: '请输入题目描述'
+          placeholder: "\u8BF7\u8F93\u5165".concat(questionType === QuestionType.组 ? '分组标题' : '题目描述')
         })
       },
       name: 'questionDesc'
+    }, {
+      required: false,
+      label: '包含题目数',
+      hidden: questionType !== QuestionType.组,
+      formItemProps: {
+        style: {
+          padding: 0
+        },
+        render: /*#__PURE__*/React__default['default'].createElement(_InputNumber__default['default'], {
+          disabled: formItemsDisabled,
+          min: 1,
+          precision: 0,
+          placeholder: '输入题目数'
+        })
+      },
+      name: 'groupSize'
     }, {
       required: false,
       label: '题目编码',
+      hidden: questionType === QuestionType.组,
       formItemProps: {
         style: {
           padding: 0
@@ -2224,11 +2285,11 @@ var QuestionFormItem = parsecHooks.ContainerUseWrap(QuestionSettingStore, functi
     disabled: formItemsDisabled
   })));
 });
-var QuestionFormItem$1 = styled__default['default'](parsecAdmin.OldForm)(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  > .", "-card {\n    ", "\n  }\n"])), function (_ref9) {
-  var prefixCls = _ref9.theme.prefixCls;
+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;
   return prefixCls;
-}, function (_ref10) {
-  var selected = _ref10.selected;
+}, function (_ref14) {
+  var selected = _ref14.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      "])));
 });
 
@@ -2268,6 +2329,7 @@ var QuestionList = (function (_ref) {
         noStyle: true
       }), /*#__PURE__*/React__default['default'].createElement(QuestionFormItem, {
         index: index,
+        list: value,
         onRemove: function onRemove() {
           return remove(index);
         },

package/dist/questionnaire/api.d.ts

@@ -21,6 +21,7 @@ export declare enum CityWidgetDetailLevel {
 }
 export declare enum QuestionType {
     填空 = "FILL",
+    组 = "GROUP",
     单选 = "SINGLE_CHOOSE",
     多选 = "MULT_CHOOSE",
     打分 = "SCORE"
@@ -28,10 +29,11 @@ export declare enum QuestionType {
 export declare const QuestionTypeObj: {
     FILL: string;
     SINGLE_CHOOSE: string;
+    GROUP: string;
     MULT_CHOOSE: string;
     SCORE: string;
 };
-export declare type QuestionItem = BaseQuestionItem | SingleChooseQuestionType | ScoreQuestionType;
+export declare type QuestionItem = BaseQuestionItem | SingleChooseQuestionType | GroupQuestionItem | ScoreQuestionType;
 export declare type BaseQuestionItem = {
     id: number;
     widgetType: WidgetType;
@@ -40,6 +42,10 @@ export declare type BaseQuestionItem = {
     questionPicUrl?: string;
     questionDesc: string;
 };
+export declare type GroupQuestionItem = Omit<BaseQuestionItem, 'questionType'> & {
+    groupSize: number;
+    questionType: QuestionType.组;
+};
 export declare type SingleChooseQuestionType = BaseQuestionItem & {
     questionType: QuestionType.单选 | QuestionType.多选;
     options: {

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

@@ -17,6 +17,7 @@ declare const _default: (props: {
     onMoveUp: () => void;
     onMoveDown: () => void;
     moveUpDisabled: boolean;
+    list: QuestionItem[];
     moveDownDisabled: boolean;
 }) => JSX.Element;
 export default _default;

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

@@ -18,7 +18,7 @@ export interface Props {
 }
 declare const Store: import("parsec-hooks/lib/createContainer").Container<{
     form: FormInstance<any>;
-    addQuestion: (questionType?: QuestionType | QuestionData) => void;
+    addQuestion: (questionType?: QuestionType | Partial<QuestionData>) => void;
     delQuestion: (item: BaseQuestionItem) => void;
     surveyType: SurveyType;
     setSurveyType: import("react").Dispatch<import("react").SetStateAction<SurveyType>>;

package/dist/questionnaire/questionBank/api.d.ts

@@ -27,6 +27,7 @@ export interface QuestionData {
     questionPicUrl: string;
     scoreInit: number;
     scoreLimit: number;
+    groupSize?: number;
     cityWidgetDetailLevel: CityWidgetDetailLevel;
     placeholder: string;
     options: QuestionItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parsec-libs",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",