@zgfe/modules-settings 2.1.0-zhongyuan.2 → 2.1.0-zhongyuan.20

package/es/components/importMetaDialog/index.d.ts

@@ -7,5 +7,7 @@ declare const ImportModal: React.FC<{
     downloadTempleUrl: string;
     uploadFile: string;
     fileName?: string;
+    params?: any;
+    showHistory?: boolean;
 }>;
 export default ImportModal;

package/es/components/importMetaDialog/index.js

@@ -29,7 +29,7 @@ var ImportModal = function ImportModal(props) {
     errorLoc = _useState4[0],
     setErrorLoc = _useState4[1];
   var handleImportResultOk = function handleImportResultOk() {
-    setOpenImportModalResult(false);
+    props.onSuccess && props.onSuccess({});
     setErrorLoc(undefined);
   };
   var _useState5 = useState(),
@@ -92,14 +92,29 @@ var ImportModal = function ImportModal(props) {
     var formData = new FormData();
     formData.append('appId', currentApp.appId);
     formData.append('file', fileData);
+    if (props.params) {
+      for (var key in props.params) {
+        formData.append(key, props.params[key]);
+      }
+    }
     setLoading(true);
     request(props.uploadFile, {
       method: 'post',
       data: formData
     }).then(function (res) {
       if (!res) return;
-      message.success('导入成功');
-      props.onSuccess && props.onSuccess(res.data);
+      //进入历史记录
+      if (props.showHistory && res.data) {
+        setOpenImportModalResult(true);
+        setErrorLoc({
+          successLocCount: res.data['导入成功条数'],
+          failedLocCount: res.data['导入失败条数'],
+          failedLocNames: res.data['导入失败标签名']
+        });
+      } else {
+        message.success('导入成功');
+        props.onSuccess && props.onSuccess(res.data);
+      }
     }).catch(function (e) {
       console.log(e);
     }).finally(function () {

package/es/constants/api.d.ts

@@ -118,18 +118,22 @@ declare let apis: {
     };
     dict: {
         getDictList: string;
+        getDictPage: string;
         dictSave: string;
         dictUpdate: string;
         dictUpload: string;
         dictDelete: string;
         dictTemplate: string;
         getTagList: string;
+        getTagPage: string;
         tagSave: string;
         tagUpdate: string;
         tagUpload: string;
         tagDownload: string;
         tagDelete: string;
         tagTemplate: string;
+        addLabelRelation: string;
+        delLabelRelation: string;
     };
     queryUserByCompanyId: string;
     flowSave: string;

package/es/constants/api.js

@@ -145,20 +145,25 @@ var apis = {
   dict: {
     //字典管理
     getDictList: '/zg/web/v2/systemSettings/attr/dict/list',
+    getDictPage: '/zg/web/v2/systemSettings/attr/dict/listByPage',
     dictSave: '/zg/web/v2/systemSettings/attr/dict/save',
     dictUpdate: '/zg/web/v2/systemSettings/attr/dict/update',
     dictUpload: '/zg/web/v2/systemSettings/attr/dict/upload',
     dictDelete: '/zg/web/v2/systemSettings/attr/dict/delete',
     dictTemplate: '/zg/web/v2/systemSettings/attr/dict/template',
     //位置标签管理
-    getTagList: '/zg/web/v2/label/eventLabel/list',
-    tagSave: '/zg/web/v2/label/eventLabel/save',
-    tagUpdate: '/zg/web/v2/label/eventLabel/update',
-    tagUpload: '/zg/web/v2/label/eventLabel/upload',
-    tagDownload: '/zg/web/v2/label/eventLabel/download',
-    tagDelete: '/zg/web/v2/label/eventLabel/delete',
+    getTagList: '/zg/web/v2/eventLabel/list',
+    getTagPage: '/zg/web/v2/eventLabel/listByPage',
+    tagSave: '/zg/web/v2/eventLabel/save',
+    tagUpdate: '/zg/web/v2/eventLabel/update',
+    tagUpload: '/zg/web/v2/eventLabel/upload',
+    tagDownload: '/zg/web/v2/eventLabel/download',
+    tagDelete: '/zg/web/v2/eventLabel/delete',
     //标签模板
-    tagTemplate: '/zg/web/v2/label/template'
+    tagTemplate: '/zg/web/v2/eventLabel/template',
+    //绑定
+    addLabelRelation: '/zg/web/v2/eventLabel/addLabelRelation',
+    delLabelRelation: '/zg/web/v2/eventLabel/delLabelRelation'
   },
   // 查询公司下所有用户
   queryUserByCompanyId: '/zg/web/v2/user/queryUserByCompanyId',

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

@@ -543,19 +543,18 @@ var Application = function Application(_ref) {
           case 12:
             message.success(res === null || res === void 0 ? void 0 : res.msg);
             setShowSetting(false);
-            console.log(res);
-            _context9.next = 21;
+            _context9.next = 20;
             break;
-          case 17:
-            _context9.prev = 17;
+          case 16:
+            _context9.prev = 16;
             _context9.t0 = _context9["catch"](0);
             console.log(_context9.t0);
             setShowSetting(false);
-          case 21:
+          case 20:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[0, 17]]);
+      }, _callee9, null, [[0, 16]]);
     }));
     return function handleSettingSave() {
       return _ref7.apply(this, arguments);

package/es/modules/companySetting/application/index.less

@@ -1,144 +1,144 @@
-.application {
-  height: 100%;
-  min-height: 400px;
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  &-modal {
-    .ant-modal-body {
-      padding: 24px !important;
-    }
-    .ant-modal-confirm-body .ant-modal-confirm-title {
-      color: #000;
-      font-size: 24px;
-      line-height: 24px;
-    }
-
-    .ant-modal-confirm-body .ant-modal-confirm-content {
-      margin-top: 0;
-      padding-top: 24px;
-    }
-
-    .ant-modal-close {
-      padding-top: 8px;
-      padding-right: 6px;
-
-      &-x {
-        color: #021429;
-        font-size: 24px;
-      }
-    }
-  }
-
-  &-drawer {
-    .ant-drawer-header-title {
-      flex-direction: row-reverse;
-    }
-  }
-
-  .bsicon {
-    color: #9aa1a9;
-    font-size: 16px !important;
-  }
-  .bsicon:hover {
-    color: var(--io-i-, #165dff);
-  }
-
-  .bsicon.shanchu:hover {
-    color: #fb5547;
-  }
-
-  .zhuge.icon-shanchu:hover {
-    color: #fb5547;
-  }
-
-  &-alert-info {
-    background-color: #e6f7ff;
-    border: 1px solid #91d5ff;
-    border-radius: 2px;
-  }
-
-  &-form {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    &-item {
-      display: flex;
-      gap: 8px;
-      align-items: center;
-
-      .bsicon {
-        color: #fd9f41;
-      }
-
-      .bsicon:hover {
-        color: var(--io-i-, #fd9f41);
-      }
-    }
-
-    .ant-btn-sm {
-      height: 32px;
-      padding: 4px 16px;
-    }
-  }
-
-  .ant-divider-horizontal {
-    margin: 14px 0;
-  }
-
-  .biz-loading-container.loading {
-    margin-top: 100px;
-  }
-
-  &-disabled,
-  &-disabled:hover,
-  &-disabled:focus {
-    cursor: not-allowed !important;
-  }
-
-  .ant-btn-primary[disabled],
-  .ant-btn-primary[disabled]:hover,
-  .ant-btn-primary[disabled]:focus,
-  .ant-btn-primary[disabled]:active {
-    color: #fff;
-    background: var(--io-i2-, #d0dfff);
-    border: 1px solid #d0dfff;
-  }
-
-  .settings-card {
-    gap: 6px;
-    height: 120px;
-  }
-  &-rowContent {
-    height: calc(100vh - 302px);
-    overflow: overlay;
-  }
-  &-contentList-label {
-    display: grid;
-    grid-template-columns: 230px repeat(4, minmax(90px, 1fr)) 135px 90px 260px;
-    align-items: center;
-    padding-right: 14px;
-    border-bottom: 1px solid #ecedf0;
-  }
-  &-contentList-item-name {
-    color: #000;
-    font-weight: bold;
-    font-size: 14px;
-  }
-  &-contentList-item-status-icon0,
-  &-contentList-item-status-icon1 {
-    display: inline-block;
-    width: 6px;
-    height: 6px;
-    margin-right: 3px;
-    border-radius: 50%;
-    transform: translateY(-1px);
-  }
-  &-contentList-item-status-icon0 {
-    background: #67727f;
-  }
-  &-contentList-item-status-icon1 {
-    background: #165dff;
-  }
-}
+.application {
+  height: 100%;
+  min-height: 400px;
+  overflow-x: hidden;
+  overflow-y: auto;
+
+  &-modal {
+    .ant-modal-body {
+      padding: 24px !important;
+    }
+    .ant-modal-confirm-body .ant-modal-confirm-title {
+      color: #000;
+      font-size: 24px;
+      line-height: 24px;
+    }
+
+    .ant-modal-confirm-body .ant-modal-confirm-content {
+      margin-top: 0;
+      padding-top: 24px;
+    }
+
+    .ant-modal-close {
+      padding-top: 8px;
+      padding-right: 6px;
+
+      &-x {
+        color: #021429;
+        font-size: 24px;
+      }
+    }
+  }
+
+  &-drawer {
+    .ant-drawer-header-title {
+      flex-direction: row-reverse;
+    }
+  }
+
+  .bsicon {
+    color: #9aa1a9;
+    font-size: 16px !important;
+  }
+  .bsicon:hover {
+    color: var(--io-i-, #165dff);
+  }
+
+  .bsicon.shanchu:hover {
+    color: #fb5547;
+  }
+
+  .zhuge.icon-shanchu:hover {
+    color: #fb5547;
+  }
+
+  &-alert-info {
+    background-color: #e6f7ff;
+    border: 1px solid #91d5ff;
+    border-radius: 2px;
+  }
+
+  &-form {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    &-item {
+      display: flex;
+      gap: 8px;
+      align-items: center;
+
+      .bsicon {
+        color: #fd9f41;
+      }
+
+      .bsicon:hover {
+        color: var(--io-i-, #fd9f41);
+      }
+    }
+
+    .ant-btn-sm {
+      height: 32px;
+      padding: 4px 16px;
+    }
+  }
+
+  .ant-divider-horizontal {
+    margin: 14px 0;
+  }
+
+  .biz-loading-container.loading {
+    margin-top: 100px;
+  }
+
+  &-disabled,
+  &-disabled:hover,
+  &-disabled:focus {
+    cursor: not-allowed !important;
+  }
+
+  .ant-btn-primary[disabled],
+  .ant-btn-primary[disabled]:hover,
+  .ant-btn-primary[disabled]:focus,
+  .ant-btn-primary[disabled]:active {
+    color: #fff;
+    background: var(--io-i2-, #d0dfff);
+    border: 1px solid #d0dfff;
+  }
+
+  .settings-card {
+    gap: 6px;
+    height: 120px;
+  }
+  &-rowContent {
+    height: calc(100vh - 302px);
+    overflow: overlay;
+  }
+  &-contentList-label {
+    display: grid;
+    grid-template-columns: 230px repeat(4, minmax(90px, 1fr)) 135px 90px 260px;
+    align-items: center;
+    padding-right: 14px;
+    border-bottom: 1px solid #ecedf0;
+  }
+  &-contentList-item-name {
+    color: #000;
+    font-weight: bold;
+    font-size: 14px;
+  }
+  &-contentList-item-status-icon0,
+  &-contentList-item-status-icon1 {
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    margin-right: 3px;
+    border-radius: 50%;
+    transform: translateY(-1px);
+  }
+  &-contentList-item-status-icon0 {
+    background: #67727f;
+  }
+  &-contentList-item-status-icon1 {
+    background: #165dff;
+  }
+}

package/es/modules/companySetting/index.js

@@ -18,13 +18,10 @@ import React, { useContext, useEffect, useState } from 'react';
 import './index.less';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { Tabs } from 'antd';
-import Info from './info';
 import User from './user';
 import VirtualApp from './virtualApp';
-import Cost from './cost';
 import WechatBinding from './wechatBinding';
 import OperationLog from './operationLog';
-import DepartmentList from './department';
 import RoleList from './role';
 import Business from './business';
 import Application from './application';
@@ -59,7 +56,7 @@ var CompanySetting = function CompanySetting(props) {
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
     setIsShowCreateApp = _useState8[1];
-  var _useState9 = useState(currentPath ? currentPath : 'info'),
+  var _useState9 = useState(currentPath ? currentPath : 'user'),
     _useState10 = _slicedToArray(_useState9, 2),
     activeKey = _useState10[0],
     setActiveKey = _useState10[1]; // 默认值
@@ -157,17 +154,21 @@ var CompanySetting = function CompanySetting(props) {
       }
     }));
   };
-  var items = [{
-    key: 'info',
-    label: '公司信息',
-    children: (/*#__PURE__*/React.createElement(Info, {
-      ENVIRONMENT: ENVIRONMENT,
-      companyId: currentUser.companyId,
-      companyName: currentUser.companyName,
-      changeCompanyNameCallback: changeCompanyNameCallback
-    })),
-    hidden: !authority[10078]
-  }, {
+  var items = [
+  // {
+  //   key: 'info',
+  //   label: '公司信息',
+  //   children: (
+  //     <Info
+  //       ENVIRONMENT={ENVIRONMENT}
+  //       companyId={currentUser!.companyId as number}
+  //       companyName={currentUser!.companyName}
+  //       changeCompanyNameCallback={changeCompanyNameCallback}
+  //     />
+  //   ),
+  //   hidden: !authority[10078],
+  // },
+  {
     key: 'user',
     label: '成员管理',
     children: (/*#__PURE__*/React.createElement(User, {
@@ -196,15 +197,19 @@ var CompanySetting = function CompanySetting(props) {
       companyId: currentUser.companyId
     }),
     hidden: !authority[10080]
-  }, {
-    key: 'department',
-    label: '部门管理',
-    children: (/*#__PURE__*/React.createElement(DepartmentList, {
-      companyId: currentUser.companyId,
-      closeCreateCallback: closeCreateCallback
-    })),
-    hidden: !authority[10081]
-  }, {
+  },
+  // {
+  //   key: 'department',
+  //   label: '部门管理',
+  //   children: (
+  //     <DepartmentList
+  //       companyId={currentUser!.companyId as number}
+  //       closeCreateCallback={closeCreateCallback}
+  //     />
+  //   ),
+  //   hidden: !authority[10081],
+  // },
+  {
     key: 'business',
     label: '业务',
     children: /*#__PURE__*/React.createElement(Business, {
@@ -233,15 +238,14 @@ var CompanySetting = function CompanySetting(props) {
       editVirtualAppCallback: editVirtualAppCallback
     })),
     hidden: !showVirtualApp
-  }, {
-    key: 'cost',
-    label: '套餐',
-    children: /*#__PURE__*/React.createElement(Cost, {
-      ENVIRONMENT: ENVIRONMENT,
-      companyId: currentUser.companyId
-    }),
-    hidden: !authority[10083]
-  }, {
+  },
+  // {
+  //   key: 'cost',
+  //   label: '套餐',
+  //   children: <Cost ENVIRONMENT={ENVIRONMENT} companyId={currentUser!.companyId as number} />,
+  //   hidden: !authority[10083],
+  // },
+  {
     key: 'weChatBinding',
     label: '微信账号绑定',
     children: /*#__PURE__*/React.createElement(WechatBinding, null),

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';
@@ -63,7 +63,7 @@ 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 () {
@@ -75,7 +75,7 @@ var UserGroup = function UserGroup(props) {
     // 角色下拉数据
     queryRoleListByUserIdList(null);
     // 部门下拉数据
-    queryDeptListByUserIdList(null);
+    // queryDeptListByUserIdList(null);
   }, [companyId]);
   // 查看详情
   var queryCompanyUserDetailsParamList = function queryCompanyUserDetailsParamList(id) {
@@ -348,19 +348,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",

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,