@zgfe/modules-settings 2.0.0-zhongyuan.32 → 2.0.0-zhongyuan.33

package/es/modules/createDemand/index.js

@@ -202,7 +202,7 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   useEffect(function () {
-    if (props.data.demand && (props === null || props === void 0 ? void 0 : props.data.demand.demandName)) {
+    if (props.data && props.data.demand && (props === null || props === void 0 ? void 0 : props.data.demand.demandName)) {
       setDemandName(props === null || props === void 0 ? void 0 : props.data.demand.demandName);
       setDemandDescribe(props === null || props === void 0 ? void 0 : props.data.demand.demandDescribe);
       setCompletionTime(moment(new Date(props === null || props === void 0 ? void 0 : props.data.demand.completionTime)));
@@ -324,6 +324,7 @@ var CreateDemand = function CreateDemand(props) {
   // type on单击事件 save保存 flow
   var onCreate = function onCreate() {
     var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'save';
+    var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     if (!demandName) {
       message.warning('请填写需求名称');
       return;
@@ -349,8 +350,8 @@ var CreateDemand = function CreateDemand(props) {
         }),
         pointEventStatus: type != 'flow' ? pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
           return item.status;
-        }) : [] //走流程不用传状态 状态会自动修改成0
-      })
+        }) : []
+      }, data)
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
         if (type == 'on') {
@@ -1075,7 +1076,6 @@ var CreateDemand = function CreateDemand(props) {
     shape: "round",
     className: "button",
     onClick: function onClick() {
-      setIsEdit(true);
       props.setIsShowSelectList && props.setIsShowSelectList(function (val) {
         setPointEventInfo(val.map(function (val) {
           return _objectSpread(_objectSpread({}, val), {}, {
@@ -1097,10 +1097,20 @@ var CreateDemand = function CreateDemand(props) {
   }, getLableValue(demandStatus, 'buttonName'))), isRead ? null : demandStatus == 2 && (/*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-info-right-button forbiddenColor"),
     onClick: function onClick() {
-      setPointEventInfo(pointEventInfo ? pointEventInfo.filter(function (item) {
-        return selectedRowKeys.indexOf(item.id) == -1;
-      }) : []);
-      onCreate('save');
+      var list = pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
+        if (selectedRowKeys.indexOf(item.id) == -1) {
+          pointEventInfo.slice(selectedRowKeys.indexOf(item.id));
+        }
+      });
+      setPointEventInfo(list);
+      onCreate('save', {
+        pointEventIds: list.map(function (res) {
+          return res.id;
+        }),
+        pointEventStatus: list.map(function (res) {
+          return res.status;
+        })
+      });
     }
   }, "\u79FB\u9664")), isRead ? null : (demandStatus == 3 || demandStatus == 4) && (/*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-info-right-button forbiddenColor"),

package/es/modules/demandManage/index.js

@@ -213,7 +213,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }, {
     title: '操作',
-    width: 260,
+    width: 270,
     fixed: 'right',
     render: function render(record) {
       return /*#__PURE__*/React.createElement(DealDom, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.32",
+  "version": "2.0.0-zhongyuan.33",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b4f7a3ec17a8918fbbefcf4719bacd097747c90d",
+  "gitHead": "4367b3551c9d444da0595648853393ad23f106d1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }