@zgfe/modules-settings 2.0.0-zhongyuan.9 → 2.1.0-zhongyuan-set.2

package/es/modules/companySetting/operationLog/index.js

@@ -13,9 +13,10 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useEffect, useState, useContext } from 'react';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
-import { DatePicker, Radio, Table } from 'antd';
+import { DatePicker, Radio, Table, Button, Space } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
+import { DownloadOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import './index.less';
 import { setColumnsList } from './util';
@@ -24,7 +25,8 @@ var OperationLog = function OperationLog() {
   var classPrefix = 'operation-log-page';
   var _useContext = useContext(BizGlobalDataContext),
     authority = _useContext.authority,
-    basicConfig = _useContext.basicConfig;
+    basicConfig = _useContext.basicConfig,
+    showProdDownload = _useContext.showProdDownload;
   var _useState = useState({
       page: 1,
       size: 10,
@@ -139,7 +141,7 @@ var OperationLog = function OperationLog() {
       }, condition)
     }).then(function (res) {
       if (parseInt(res === null || res === void 0 ? void 0 : res.code) == 100000) {
-        var maxDate = res.data[res.data.length - 1] || '';
+        var maxDate = res.data[0] || '';
         setDateRange(res.data);
         setCondition(function () {
           return {
@@ -152,6 +154,16 @@ var OperationLog = function OperationLog() {
       }
     });
   }
+  function exportData() {
+    request(apis.log.exportLog, {
+      method: 'post',
+      data: _objectSpread({
+        type: logType
+      }, condition),
+      responseType: 'blob',
+      fileName: "\u65E5\u5FD7\u4E0B\u8F7D_".concat(moment().format('YYYYMMDD'))
+    }).then(function (res) {});
+  }
   function queryLog() {
     setLoading(true);
     if (!condition.year || !condition.month) return;
@@ -209,7 +221,7 @@ var OperationLog = function OperationLog() {
   }, "\u64CD\u4F5C\u65E5\u5FD7"), /*#__PURE__*/React.createElement(Radio.Button, {
     value: "3",
     disabled: !authority[10104]
-  }, "\u6743\u9650\u7BA1\u7406\u65E5\u5FD7")), condition.year && (/*#__PURE__*/React.createElement(DatePicker, {
+  }, "\u6743\u9650\u7BA1\u7406\u65E5\u5FD7")), /*#__PURE__*/React.createElement(Space, null, condition.year && (/*#__PURE__*/React.createElement(DatePicker, {
     value: moment("".concat(condition.year, "-").concat(condition.month), 'YYYY-MM'),
     picker: "month",
     disabledDate: disabledDate,
@@ -217,7 +229,12 @@ var OperationLog = function OperationLog() {
     onChange: onChangeTime,
     inputReadOnly: true,
     allowClear: false
-  }))), /*#__PURE__*/React.createElement("div", {
+  })), showProdDownload && (/*#__PURE__*/React.createElement(Button, {
+    shape: "circle",
+    icon: /*#__PURE__*/React.createElement(DownloadOutlined, null),
+    size: "middle",
+    onClick: exportData
+  })))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table")
   }, /*#__PURE__*/React.createElement(Table, {
     columns: columns,

package/es/modules/companySetting/user/index.js

@@ -360,30 +360,35 @@ var User = function User(props) {
         title: arr === null || arr === void 0 ? void 0 : (_arr$join = arr.join(',')) === null || _arr$join === void 0 ? void 0 : _arr$join.replace(/,/g, '、')
       }, splitString(arr === null || arr === void 0 ? void 0 : (_arr$join2 = arr.join(',')) === null || _arr$join2 === void 0 ? void 0 : _arr$join2.replace(/,/g, '、'), 8)));
     }
-  }, {
-    title: '部门',
-    with: 195,
-    dataIndex: 'aclDeptList',
-    render: function render(aclDeptList) {
-      var _arr$join3, _arr$join4;
-      var arr = aclDeptList === null || aclDeptList === void 0 ? void 0 : aclDeptList.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item.name;
-      });
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
-        overlayStyle: {
-          maxWidth: 396
-        },
-        overlayInnerStyle: {
-          color: '#FFF',
-          fontSize: 14,
-          fontWeight: 400,
-          letterSpacing: 0.56
-        },
-        placement: "top",
-        title: arr === null || arr === void 0 ? void 0 : (_arr$join3 = arr.join(',')) === null || _arr$join3 === void 0 ? void 0 : _arr$join3.replace(/,/g, '、')
-      }, splitString(arr === null || arr === void 0 ? void 0 : (_arr$join4 = arr.join(',')) === null || _arr$join4 === void 0 ? void 0 : _arr$join4.replace(/,/g, '、'), 8)));
-    }
-  }, {
+  },
+  // {
+  //   title: '部门',
+  //   with: 195,
+  //   dataIndex: 'aclDeptList',
+  //   render: (aclDeptList: []) => {
+  //     const arr = aclDeptList?.map((item: { name: string }) => {
+  //       return item?.name;
+  //     });
+  //     return (
+  //       <div>
+  //         <Tooltip
+  //           overlayStyle={{ maxWidth: 396 }}
+  //           overlayInnerStyle={{
+  //             color: '#FFF',
+  //             fontSize: 14,
+  //             fontWeight: 400,
+  //             letterSpacing: 0.56,
+  //           }}
+  //           placement="top"
+  //           title={arr?.join(',')?.replace(/,/g, '、')}
+  //         >
+  //           {splitString(arr?.join(',')?.replace(/,/g, '、'), 8)}
+  //         </Tooltip>
+  //       </div>
+  //     );
+  //   },
+  // },
+  {
     title: '状态',
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", null, !data.isAdmin && (/*#__PURE__*/React.createElement(Switch, {

package/es/modules/companySetting/user/invite.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React, { useEffect, useState, useContext } from 'react';
 import './index.less';
-import { Button, Form, Input, notification, Radio, Select, TreeSelect } from 'antd';
+import { Button, Form, Input, notification, Radio, Select } from 'antd';
 import request from './../../../utils/ajax';
 import apis from './../../../constants/api';
 import { BizDialog, BizSelect, BizGlobalDataContext } from '@zgfe/business-lib';
@@ -33,29 +33,18 @@ var UserGroup = function UserGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     userList = _useState4[0],
     setUserList = _useState4[1];
-  var _useState5 = useState([]),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    departmentList = _useState6[0],
-    setDepartmentList = _useState6[1];
+    isAdmin = _useState6[0],
+    setIsAdmin = _useState6[1];
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    isAdmin = _useState8[0],
-    setIsAdmin = _useState8[1];
-  var _useState9 = useState({
-      rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
-      description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
-    }),
+    createAppLoading = _useState8[0],
+    setCreateAppLoading = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    passwordRule = _useState10[0],
-    setPasswordRule = _useState10[1];
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    createAppLoading = _useState12[0],
-    setCreateAppLoading = _useState12[1];
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    createdAppPanel = _useState14[0],
-    setCreatedAppPanel = _useState14[1];
+    createdAppPanel = _useState10[0],
+    setCreatedAppPanel = _useState10[1];
   useEffect(function () {
     if (userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) {
       setCreatedAppPanel(true);
@@ -63,19 +52,17 @@ var UserGroup = function UserGroup(props) {
       // 角色下拉数据
       queryRoleListByUserIdList(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id);
       // 部门下拉数据
-      queryDeptListByUserIdList(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id);
+      // queryDeptListByUserIdList(userEditAuthData?.id);
     }
   }, [userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id]);
   useEffect(function () {
     queryPanel(_objectSpread({}, queryParams));
   }, [queryParams]);
   useEffect(function () {
-    // 密码正则
-    companyId !== undefined && getPasswordRuleList(companyId);
     // 角色下拉数据
     queryRoleListByUserIdList(null);
     // 部门下拉数据
-    queryDeptListByUserIdList(null);
+    // queryDeptListByUserIdList(null);
   }, [companyId]);
   // 查看详情
   var queryCompanyUserDetailsParamList = function queryCompanyUserDetailsParamList(id) {
@@ -86,7 +73,7 @@ var UserGroup = function UserGroup(props) {
       }
     }).then(function (res) {
       if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
-        var _res$data, _res$data$deptIds, _res$data2, _res$data2$roleIds, _res$data3;
+        var _res$data, _res$data$roleIds, _res$data2;
         var flattenArray = function flattenArray(array) {
           var flatArray = [];
           array.forEach(function (item) {
@@ -98,31 +85,22 @@ var UserGroup = function UserGroup(props) {
           });
           return flatArray;
         };
-        var deptIdsList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$deptIds = _res$data.deptIds) === null || _res$data$deptIds === void 0 ? void 0 : _res$data$deptIds.map(function (item) {
-          var _flattenArray, _app$;
-          var app = (_flattenArray = flattenArray(departmentList)) === null || _flattenArray === void 0 ? void 0 : _flattenArray.filter(function (v) {
-            return v.id === item;
-          });
-          return (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.id;
-        });
-        var roleIdsList = res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$roleIds = _res$data2.roleIds) === null || _res$data2$roleIds === void 0 ? void 0 : _res$data2$roleIds.map(function (item) {
-          var _app$2;
+        var roleIdsList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$roleIds = _res$data.roleIds) === null || _res$data$roleIds === void 0 ? void 0 : _res$data$roleIds.map(function (item) {
+          var _app$;
           var app = userList === null || userList === void 0 ? void 0 : userList.filter(function (v) {
             return v.id === item;
           });
           return {
-            id: (_app$2 = app[0]) === null || _app$2 === void 0 ? void 0 : _app$2.id
+            id: (_app$ = app[0]) === null || _app$ === void 0 ? void 0 : _app$.id
           };
         });
         form.setFieldsValue(_objectSpread(_objectSpread({}, res.data), {}, {
-          deptIds: deptIdsList.filter(function (v) {
-            return v !== undefined;
-          }),
+          // deptIds: deptIdsList.filter((v: undefined) => v !== undefined),
           roleIds: roleIdsList.filter(function (v) {
             return v.id !== undefined;
           })
         }));
-        setIsAdmin(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.isAdmin);
+        setIsAdmin(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.isAdmin);
       }
     }).catch(function (error) {
       console.log(error);
@@ -144,40 +122,15 @@ var UserGroup = function UserGroup(props) {
       console.log(error);
     });
   };
-  var queryDeptListByUserIdList = function queryDeptListByUserIdList(id) {
-    request(apis.setting.queryDeptListByUserId, {
-      method: 'post',
-      data: {
-        id: id
-      }
-    }).then(function (res) {
-      if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
-        setDepartmentList(res === null || res === void 0 ? void 0 : res.data);
-      } else {
-        setDepartmentList([]);
-      }
-    }).catch(function (error) {
-      console.log(error);
-    });
-  };
-  var getPasswordRuleList = function getPasswordRuleList(id) {
-    request(apis.setting.getPasswordRule, {
-      method: 'get',
-      params: {
-        companyId: id
-      }
-    }).then(function (res) {
-      if (res && (res === null || res === void 0 ? void 0 : res.data) && res.code === '101000') {
-        setPasswordRule(res === null || res === void 0 ? void 0 : res.data);
-      } else {
-        setPasswordRule({
-          rule: /^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9~!@#$%^&*]{8,20}$/,
-          description: '请输入8-20个字符,可包括大小写字母和数字 特殊字符(!@#$%^&*)'
-        });
-      }
-    }).catch(function (error) {
-      console.log(error);
-    });
+  //获取当前年月日
+  var getDate = function getDate() {
+    // 创建当前日期对象
+    var now = new Date();
+    // 获取年月日
+    var year = now.getFullYear();
+    var month = now.getMonth() + 1; // 月份从0开始，所以要+1
+    var date = now.getDate();
+    return "".concat(year).concat(month).concat(date);
   };
   // 编辑||创建
   var onFinish = function onFinish(value) {
@@ -185,6 +138,7 @@ var UserGroup = function UserGroup(props) {
     setCreateAppLoading(true);
     var msg = '';
     var params = _objectSpread(_objectSpread({}, value), {}, {
+      password: "Aa111111",
       id: userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id,
       roleIds: value === null || value === void 0 ? void 0 : (_value$roleIds = value.roleIds) === null || _value$roleIds === void 0 ? void 0 : _value$roleIds.map(function (item) {
         return item.id;
@@ -327,9 +281,9 @@ var UserGroup = function UserGroup(props) {
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     onBlur: function onBlur(event) {
-      var _event$target2, _event$target2$value;
+      var _event$target2;
       form.setFieldsValue({
-        telphone: event === null || event === void 0 ? void 0 : (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : (_event$target2$value = _event$target2.value) === null || _event$target2$value === void 0 ? void 0 : _event$target2$value.replace(/^[0-9]{11}$/g, '')
+        telphone: event === null || event === void 0 ? void 0 : (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.value
       });
     },
     maxLength: 11,
@@ -348,19 +302,6 @@ var UserGroup = function UserGroup(props) {
     placeholder: '请选择角色',
     labelField: "roleName",
     keyField: "id"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: 'deptIds',
-    label: "\u90E8\u95E8",
-    className: "no-rules-label"
-  }, /*#__PURE__*/React.createElement(TreeSelect, {
-    treeDefaultExpandAll: true,
-    multiple: true,
-    fieldNames: {
-      label: 'name',
-      value: 'id'
-    },
-    placeholder: "\u8BF7\u9009\u62E9\u4E0A\u7EA7\u90E8\u95E8",
-    treeData: departmentList
   })), !isAdmin && (/*#__PURE__*/React.createElement(Form.Item, {
     name: 'accountStatus',
     label: "\u72B6\u6001",
@@ -375,19 +316,6 @@ var UserGroup = function UserGroup(props) {
     value: 1
   }, "\u6B63\u5E38"), /*#__PURE__*/React.createElement(Radio, {
     value: 2
-  }, "\u505C\u7528")))), !(userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id) && (/*#__PURE__*/React.createElement(Form.Item, {
-    name: 'password',
-    label: "\u5BC6\u7801",
-    rules: [{
-      required: true,
-      message: '请输入密码'
-    }, {
-      pattern: new RegExp(passwordRule === null || passwordRule === void 0 ? void 0 : passwordRule.rule, 'g'),
-      message: passwordRule === null || passwordRule === void 0 ? void 0 : passwordRule.description
-    }]
-  }, /*#__PURE__*/React.createElement(Input.Password, {
-    maxLength: 50,
-    placeholder: '请输入密码'
-  })))))));
+  }, "\u505C\u7528"))))))));
 };
 export default UserGroup;

package/es/modules/createDemand/constants.d.ts

@@ -1,5 +1,18 @@
 import { ColumnsType } from 'antd/es/table/interface';
-declare const columnsEvent: (gotoPage?: Function, isControl?: boolean) => ColumnsType<{
+declare const columnsEvent: (gotoPage?: Function, isControl?: boolean, getPointMap?: Function) => ColumnsType<{
     pageId: number;
 }>;
-export { columnsEvent };
+declare const demandTabList: ({
+    label: string;
+    value: number;
+    key: string;
+    color: string;
+    buttonName: string;
+} | {
+    label: string;
+    value: number;
+    key: string;
+    color: string;
+    buttonName?: undefined;
+})[];
+export { columnsEvent, demandTabList };

package/es/modules/createDemand/constants.js

@@ -8,7 +8,7 @@ import { IconFont } from '@zgfe/business-lib';
 import { Image } from 'antd';
 import React from 'react';
 var classPrefix = 'system-setting-create-demand';
-var columnsEvent = function columnsEvent(gotoPage, isControl) {
+var columnsEvent = function columnsEvent(gotoPage, isControl, getPointMap) {
   return [{
     title: '页面名称',
     dataIndex: 'pageName',
@@ -51,10 +51,10 @@ var columnsEvent = function columnsEvent(gotoPage, isControl) {
     dataIndex: 'eventName',
     width: 153,
     ellipsis: true,
-    render: function render(eventName) {
+    render: function render(eventName, data) {
       return /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
-          return gotoPage && gotoPage('event', eventName);
+          return getPointMap && getPointMap(data);
         }
       }, eventName);
     }
@@ -97,4 +97,57 @@ var columnsEvent = function columnsEvent(gotoPage, isControl) {
     }
   }]);
 };
-export { columnsEvent };
+var demandTabList = [{
+  label: '待设计',
+  value: 1,
+  key: 'nodename1',
+  color: '#fda145',
+  buttonName: '开始设计'
+}, {
+  label: '设计',
+  value: 2,
+  key: 'nodename2',
+  color: '#fda145',
+  buttonName: '设计完成'
+}, {
+  label: '审核1',
+  value: 3,
+  key: 'nodename3',
+  color: '#fb5547',
+  buttonName: '审核通过'
+}, {
+  label: '审核2',
+  value: 4,
+  key: 'nodename4',
+  color: '#fb5547',
+  buttonName: '审核通过'
+}, {
+  label: '开发',
+  value: 5,
+  key: 'nodename5',
+  color: '#165dff',
+  buttonName: '开发完成'
+}, {
+  label: '测试',
+  value: 6,
+  key: 'nodename6',
+  color: '#165dff',
+  buttonName: '测试完成'
+}, {
+  label: '已完成',
+  value: 101,
+  key: 'finishedSum',
+  color: '#2cbe54',
+  buttonName: '批量上线'
+}, {
+  label: '已关闭',
+  value: 102,
+  key: 'closedSum',
+  color: '#cccfd5'
+}, {
+  label: '已超时',
+  value: 103,
+  key: 'overTimeSum',
+  color: '#fda145'
+}];
+export { columnsEvent, demandTabList };

package/es/modules/createDemand/demo/selectPoint.js

@@ -32,7 +32,6 @@ export default (function (props) {
   };
   var initFun = function initFun(callbackFun, data) {
     pointMapCallbackFun = callbackFun;
-    console.log('initFun', data);
     setSelectObj(data && data.eventId ? {
       selectEventList: [{
         event_id: data.eventId,
@@ -73,7 +72,7 @@ export default (function (props) {
     className: "".concat(classPrefix, "-header-back")
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "fanhuiicon"
-  }), "\u8FD4\u56DE"), "\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
+  }), "\u8FD4\u56DE"), "\u81EA\u5B9A\u4E49\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header-right")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {

package/es/modules/createDemand/index.d.ts

@@ -3,7 +3,6 @@ import './styles/index.less';
 declare const CreateDemand: React.FC<{
     demandId?: number;
     data?: any;
-    isRead?: boolean;
     saveObj?: any;
     setSaveObj?: Function;
     setIsShowSelectList?: Function;