@zgfe/modules-settings 2.0.0-zhongyuan.23 → 2.0.0-zhongyuan.25

package/es/constants/api.d.ts

@@ -30,6 +30,8 @@ declare let apis: {
         inviteUserByPhone: string;
         updateCompanyAdmin: string;
         updateUserAuthCEP: string;
+        disableDemand: string;
+        copyDemand: string;
         updateGroupAuth: string;
         deleteGroup: string;
         wxSubscribeUserList: string;

package/es/constants/api.js

@@ -32,6 +32,10 @@ var apis = {
     inviteUserByPhone: '/company/v2invitation.jsp',
     updateCompanyAdmin: '/company/updateCompanyAdmin.jsp',
     updateUserAuthCEP: '/cep-console/api/v1/permission/updateUserAuth',
+    //禁用接口
+    disableDemand: '/zg/web/v2/approve/demand/disableDemand',
+    //复制接口
+    copyDemand: '/zg/web/v2/approve/demand/copyDemand',
     updateGroupAuth: '/auth/updateGroupAuth.jsp',
     deleteGroup: '/auth/deleteGroup.jsp',
     wxSubscribeUserList: '/wx_subscribe/getWxSubscribeUserInfoList.jsp',

package/es/modules/demandManage/index.js

@@ -1,4 +1,8 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -11,7 +15,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { BizGlobalDataContext, BizTable, IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, message, Tooltip } from 'antd';
+import { Input, Button, Select, message, Tooltip, Modal, notification } from 'antd';
 import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import apis from '../../constants/api';
@@ -42,23 +46,66 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     pageData = _useState4[0],
     setPageData = _useState4[1];
-  var _useState5 = useState(route && route.query && route.query.demandKey || ''),
-    _useState6 = _slicedToArray(_useState5, 2),
-    demandName = _useState6[0],
-    setDemandName = _useState6[1];
-  // 状态：1-待处理， 2-处理中，3-已驳回，4-已结束,5-已超时
-  var _useState7 = useState(0),
+  var _useState5 = useState([{
+      label: '设计',
+      value: 1,
+      key: 'nodename1',
+      color: '#fda145'
+    }, {
+      label: '审核1',
+      value: 2,
+      key: 'nodename2',
+      color: '#fb5547'
+    }, {
+      label: '审核2',
+      value: 3,
+      key: 'nodename3',
+      color: '#fb5547'
+    }, {
+      label: '开发',
+      value: 4,
+      key: 'nodename4',
+      color: '#165dff'
+    }, {
+      label: '测试',
+      value: 5,
+      key: 'nodename5',
+      color: '#165dff'
+    }, {
+      label: '已完成',
+      value: 6,
+      key: 'finishedSum',
+      color: '#2cbe54'
+    }, {
+      label: '已关闭',
+      value: 7,
+      key: 'closedSum',
+      color: '#cccfd5'
+    }, {
+      label: '已超时',
+      value: 8,
+      key: 'overTimeSum',
+      color: '#fda145'
+    }]),
+    _useState6 = _slicedToArray(_useState5, 1),
+    labelList = _useState6[0];
+  var _useState7 = useState(route && route.query && route.query.demandKey || ''),
     _useState8 = _slicedToArray(_useState7, 2),
-    demandStatus = _useState8[0],
-    setDemandStatus = _useState8[1];
-  var _useState9 = useState([]),
+    demandName = _useState8[0],
+    setDemandName = _useState8[1];
+  // 状态：1-待处理， 2-处理中，3-已驳回，4-已结束,5-已超时
+  var _useState9 = useState(0),
     _useState10 = _slicedToArray(_useState9, 2),
-    demandList = _useState10[0],
-    setDemandList = _useState10[1];
-  var _useState11 = useState(),
+    demandStatus = _useState10[0],
+    setDemandStatus = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    tableTotal = _useState12[0],
-    setTableTotal = _useState12[1];
+    demandList = _useState12[0],
+    setDemandList = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tableTotal = _useState14[0],
+    setTableTotal = _useState14[1];
   useEffect(function () {
     getDemandStatistics();
   }, []);
@@ -181,18 +228,24 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     dataIndex: 'demandStatus',
     width: 160,
     render: function render(demandStatus) {
-      var status = ['', '待处理', '处理中', '已驳回', '已结束', '已超时'];
+      var data = labelList.filter(function (res) {
+        return res.value == demandStatus;
+      })[0] || {};
       return /*#__PURE__*/React.createElement("div", {
         style: {
           display: 'flex'
         }
       }, /*#__PURE__*/React.createElement("div", {
-        className: "".concat(classPrefix, "-table-status").concat(demandStatus)
-      }, status[demandStatus]));
+        className: "".concat(classPrefix, "-table-status"),
+        style: {
+          backgroundColor: data.color + '20',
+          color: data.color
+        }
+      }, data.label));
     }
   }, {
     title: '操作',
-    width: 160,
+    width: 250,
     fixed: 'right',
     render: function render(record) {
       return /*#__PURE__*/React.createElement(DealDom, {
@@ -202,10 +255,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }];
   var DealDom = function DealDom(props) {
-    var _useState13 = useState(false),
-      _useState14 = _slicedToArray(_useState13, 2),
-      open = _useState14[0],
-      setOpen = _useState14[1];
+    var _useState15 = useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      open = _useState16[0],
+      setOpen = _useState16[1];
     var hide = function hide() {
       setOpen(false);
     };
@@ -241,58 +294,50 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     var handleOpenChange = function handleOpenChange(newOpen) {
       setOpen(newOpen);
     };
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
-      style: {
-        marginRight: 16
-      },
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+      color: "primary",
+      type: "link",
       onClick: function onClick() {
         if (!authority[17228364472]) {
           message.error('无查看权限');
           return;
         }
         props.onDeal && props.onDeal('view', props.record.id);
-        // router &&
-        //   router?.push({
-        //     name: routes.createDemand,
-        //     query: {
-        //       id: props.record.id,
-        //     },
-        //   });
       }
-    }, "\u67E5\u770B"), !isDemo && props.record.isHandle && authority[17228364473] && (
-    /*#__PURE__*/
-    // <Popover
-    //   content={
-    //     <div className={`${classPrefix}-pop`}>
-    //       <div className={`${classPrefix}-pop-header`}>
-    //         需求处理 <IconFont type="qingchu" onClick={hide} />
-    //       </div>
-    //       <div className={`${classPrefix}-pop-footer`}>
-    //         <Button
-    //           danger
-    //           type={'primary'}
-    //           onClick={() => {
-    //             submitDemand(props.record.id, 2);
-    //           }}
-    //         >
-    //           驳回
-    //         </Button>
-    //         <Button
-    //           type={'primary'}
-    //           onClick={() => {
-    //             submitDemand(props.record.id, 1);
-    //           }}
-    //         >
-    //           同意
-    //         </Button>
-    //       </div>
-    //     </div>
-    //   }
-    //   trigger="click"
-    //   open={open}
-    //   onOpenChange={handleOpenChange}
-    // >
-    React.createElement("a", {
+    }, "\u67E5\u770B"), /*#__PURE__*/React.createElement(Button, {
+      color: "primary",
+      type: "link",
+      onClick: function onClick() {
+        Modal.confirm({
+          wrapClassName: "".concat(classPrefix, "-confirm"),
+          title: '提示',
+          icon: null,
+          closable: true,
+          content: '您确定要关闭当前需求？',
+          okText: '确定',
+          cancelText: '取消',
+          onOk: function onOk() {
+            disableDemand(props.record);
+          }
+        });
+      }
+    }, "\u5173\u95ED"), /*#__PURE__*/React.createElement(Button, {
+      color: "primary",
+      type: "link",
+      onClick: function onClick() {
+        props.onDeal && props.onDeal('view', {
+          data: props.record
+        });
+      }
+    }, "\u590D\u5236"), /*#__PURE__*/React.createElement(Button, {
+      color: "primary",
+      type: "link",
+      onClick: function onClick() {
+        props.onDeal && props.onDeal('view', {
+          data: props.record
+        });
+      }
+    }, "\u7F16\u8F91"), !isDemo && props.record.isHandle && authority[17228364473] && (/*#__PURE__*/React.createElement("a", {
       style: {
         marginRight: 16
       },
@@ -307,6 +352,26 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }
     }, "\u64A4\u56DE")));
   };
+  //关闭功能
+  var disableDemand = function disableDemand(data) {
+    request(apis.setting.disableDemand, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        id: data.id,
+        creatorId: data.creatorId
+      }
+    }).then(function (res) {
+      if (res && res.code === '100000') {
+        notification.success({
+          message: '关闭成功'
+        });
+      }
+    }).catch(function (err) {
+      console.log(err);
+    });
+  };
+  //复制功能
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -329,67 +394,27 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }
   }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.demandAllSum) || 0 : '-'))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel-status")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-txt"),
-    onClick: function onClick() {
-      return setDemandStatus(1);
-    }
-  }, "\u5F85\u5904\u7406"), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-num"),
-    onClick: function onClick() {
-      return setDemandStatus(1);
-    }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.pendingSum) || 0 : '-')), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-txt"),
-    onClick: function onClick() {
-      return setDemandStatus(2);
-    }
-  }, "\u5904\u7406\u4E2D"), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-num"),
-    onClick: function onClick() {
-      return setDemandStatus(2);
-    }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.beingProcessedSum) || 0 : '-')), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-txt"),
-    onClick: function onClick() {
-      return setDemandStatus(3);
-    }
-  }, "\u5DF2\u9A73\u56DE"), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-num"),
-    onClick: function onClick() {
-      return setDemandStatus(3);
-    }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.rejectedSum) || 0 : '-')), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-txt"),
-    onClick: function onClick() {
-      return setDemandStatus(5);
-    }
-  }, "\u5DF2\u8D85\u65F6"), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-num"),
-    onClick: function onClick() {
-      return setDemandStatus(5);
-    }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.overTimeSum) || 0 : '-')), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item")
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-txt"),
-    onClick: function onClick() {
-      return setDemandStatus(4);
-    }
-  }, "\u5DF2\u5B8C\u6210"), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-panel-status-item-num"),
-    onClick: function onClick() {
-      return setDemandStatus(4);
-    }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.finishedSum) || 0 : '-')))), /*#__PURE__*/React.createElement("div", {
+  }, labelList.map(function (res) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: res.key,
+      className: "".concat(classPrefix, "-panel-status-item")
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-panel-status-item-txt"),
+      onClick: function onClick() {
+        return setDemandStatus(res.value);
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-panel-status-item-icon"),
+      style: {
+        backgroundColor: res.color
+      }
+    }), res.label), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-panel-status-item-num"),
+      onClick: function onClick() {
+        return setDemandStatus(res.value);
+      }
+    }, demandInfo ? demandInfo[res.key] || 0 : '-'));
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-filter")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-filter-left")
@@ -423,22 +448,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     options: [{
       value: 0,
       label: '全部'
-    }, {
-      value: 1,
-      label: '待处理'
-    }, {
-      value: 2,
-      label: '处理中'
-    }, {
-      value: 3,
-      label: '已驳回'
-    }, {
-      value: 4,
-      label: '已结束'
-    }, {
-      value: 5,
-      label: '已超时'
-    }]
+    }].concat(_toConsumableArray(labelList))
   }), /*#__PURE__*/React.createElement("div", {
     className: "top-total"
   }, "\u5171", /*#__PURE__*/React.createElement("a", null, "\xA0", tableTotal || '-', "\xA0"), "\u6761")), /*#__PURE__*/React.createElement("div", {

package/es/modules/demandManage/styles/index.less

@@ -64,13 +64,13 @@
           gap: 4px;
           align-items: center;
           cursor: pointer;
-          &::before {
-            display: block;
-            width: 8px;
-            height: 8px;
-            border-radius: 4px;
-            content: '';
-          }
+        }
+        &-icon {
+          display: block;
+          width: 8px;
+          height: 8px;
+          border-radius: 4px;
+          content: '';
         }
         &-num {
           margin-top: 4px;
@@ -84,31 +84,6 @@
           cursor: pointer;
         }
       }
-      &-item:nth-child(1) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #fd9f41;
-        }
-      }
-      &-item:nth-child(2) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #165dff;
-        }
-      }
-      &-item:nth-child(3) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #fb5547;
-        }
-      }
-      &-item:nth-child(4) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #e1f703;
-        }
-      }
-      &-item:nth-child(5) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #ccd0d4;
-        }
-      }
     }
   }
   &-filter {
@@ -136,59 +111,13 @@
   }
 
   &-table {
-    &-status2 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #165dff);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #e8efff);
-      border-radius: 2px;
-    }
-    &-status1 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #fd9f41);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffecd9);
-      border-radius: 2px;
-    }
-    &-status3 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #fb5547);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffece8);
-      border-radius: 2px;
-    }
-    &-status4 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #5f6085);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #f2f3f4);
-      border-radius: 2px;
-    }
-    &-status5 {
+    &-status {
       display: flex;
       align-items: center;
       padding: 1px 8px;
-      color: var(--io-i-, #faad14);
       font-weight: 400;
       font-size: 14px;
       line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffe58f);
       border-radius: 2px;
     }
   }

package/es/modules/pointMap/pageInfo.js

@@ -27,10 +27,9 @@ import util from '../../utils/util';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import PicCircleSelect from '../../components/picCircleSelect';
-import constants from '../../utils/constants';
 import { uuid } from '@antv/x6/lib/util/string/uuid';
 var getImgUrl = function getImgUrl(src, pageId) {
-  return constants.regExp.url.test(src) ? src : "".concat(window.location.origin, "/web/img/report/").concat(pageId, "/").concat(src);
+  return src.indexOf('data:image') != -1 ? src : "".concat(window.location.origin, "/web/img/report/").concat(pageId, "/").concat(src);
   // return constants.regExp.url.test(src)
   //   ? src
   //   : `${'https://test01.zhugeapi.com'}/web/img/report/${pageId}/${src}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.23",
+  "version": "2.0.0-zhongyuan.25",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "23978818c1ee80f0a7c9fa1547d5e0e7e7696931",
+  "gitHead": "f3037c51831c77a9d50fc193ed7f31374b55f82f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }