{}
diff --git a/admin-web/src/components/Authorized/AuthorizedRoute.js b/admin-web/src/components/Authorized/AuthorizedRoute.js
deleted file mode 100644
index 39c6a665f..000000000
--- a/admin-web/src/components/Authorized/AuthorizedRoute.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { Route, Redirect } from 'react-router-dom';
-import Authorized from './Authorized';
-
-// TODO: umi只会返回render和rest
-const AuthorizedRoute = ({ component: Component, render, authority, redirectPath, ...rest }) => (
- } />}
- >
- (Component ? : render(props))} />
-
-);
-
-export default AuthorizedRoute;
diff --git a/admin-web/src/components/Authorized/CheckPermissions.js b/admin-web/src/components/Authorized/CheckPermissions.js
deleted file mode 100644
index ba83f5b9a..000000000
--- a/admin-web/src/components/Authorized/CheckPermissions.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React from 'react';
-import PromiseRender from './PromiseRender';
-import { CURRENT } from './renderAuthorize';
-
-function isPromise(obj) {
- return (
- !!obj &&
- (typeof obj === 'object' || typeof obj === 'function') &&
- typeof obj.then === 'function'
- );
-}
-
-/**
- * 通用权限检查方法
- * Common check permissions method
- * @param { 权限判定 Permission judgment type string |array | Promise | Function } authority
- * @param { 你的权限 Your permission description type:string} currentAuthority
- * @param { 通过的组件 Passing components } target
- * @param { 未通过的组件 no pass components } Exception
- */
-const checkPermissions = (authority, currentAuthority, target, Exception) => {
- // 没有判定权限.默认查看所有
- // Retirement authority, return target;
- if (!authority) {
- return target;
- }
- // 数组处理
- if (Array.isArray(authority)) {
- if (authority.indexOf(currentAuthority) >= 0) {
- return target;
- }
- if (Array.isArray(currentAuthority)) {
- for (let i = 0; i < currentAuthority.length; i += 1) {
- const element = currentAuthority[i];
- if (authority.indexOf(element) >= 0) {
- return target;
- }
- }
- }
- return Exception;
- }
-
- // string 处理
- if (typeof authority === 'string') {
- if (authority === currentAuthority) {
- return target;
- }
- if (Array.isArray(currentAuthority)) {
- for (let i = 0; i < currentAuthority.length; i += 1) {
- const element = currentAuthority[i];
- if (authority === element) {
- return target;
- }
- }
- }
- return Exception;
- }
-
- // Promise 处理
- if (isPromise(authority)) {
- return ;
- }
-
- // Function 处理
- if (typeof authority === 'function') {
- try {
- const bool = authority(currentAuthority);
- // 函数执行后返回值是 Promise
- if (isPromise(bool)) {
- return ;
- }
- if (bool) {
- return target;
- }
- return Exception;
- } catch (error) {
- throw error;
- }
- }
- throw new Error('unsupported parameters');
-};
-
-export { checkPermissions };
-
-const check = (authority, target, Exception) =>
- checkPermissions(authority, CURRENT, target, Exception);
-
-export default check;
diff --git a/admin-web/src/components/Authorized/CheckPermissions.test.js b/admin-web/src/components/Authorized/CheckPermissions.test.js
deleted file mode 100644
index 3988d85a1..000000000
--- a/admin-web/src/components/Authorized/CheckPermissions.test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { checkPermissions } from './CheckPermissions';
-
-const target = 'ok';
-const error = 'error';
-
-describe('test CheckPermissions', () => {
- it('Correct string permission authentication', () => {
- expect(checkPermissions('user', 'user', target, error)).toEqual('ok');
- });
- it('Correct string permission authentication', () => {
- expect(checkPermissions('user', 'NULL', target, error)).toEqual('error');
- });
- it('authority is undefined , return ok', () => {
- expect(checkPermissions(null, 'NULL', target, error)).toEqual('ok');
- });
- it('currentAuthority is undefined , return error', () => {
- expect(checkPermissions('admin', null, target, error)).toEqual('error');
- });
- it('Wrong string permission authentication', () => {
- expect(checkPermissions('admin', 'user', target, error)).toEqual('error');
- });
- it('Correct Array permission authentication', () => {
- expect(checkPermissions(['user', 'admin'], 'user', target, error)).toEqual('ok');
- });
- it('Wrong Array permission authentication,currentAuthority error', () => {
- expect(checkPermissions(['user', 'admin'], 'user,admin', target, error)).toEqual('error');
- });
- it('Wrong Array permission authentication', () => {
- expect(checkPermissions(['user', 'admin'], 'guest', target, error)).toEqual('error');
- });
- it('Wrong Function permission authentication', () => {
- expect(checkPermissions(() => false, 'guest', target, error)).toEqual('error');
- });
- it('Correct Function permission authentication', () => {
- expect(checkPermissions(() => true, 'guest', target, error)).toEqual('ok');
- });
- it('authority is string, currentAuthority is array, return ok', () => {
- expect(checkPermissions('user', ['user'], target, error)).toEqual('ok');
- });
- it('authority is string, currentAuthority is array, return ok', () => {
- expect(checkPermissions('user', ['user', 'admin'], target, error)).toEqual('ok');
- });
- it('authority is array, currentAuthority is array, return ok', () => {
- expect(checkPermissions(['user', 'admin'], ['user', 'admin'], target, error)).toEqual('ok');
- });
- it('Wrong Function permission authentication', () => {
- expect(checkPermissions(() => false, ['user'], target, error)).toEqual('error');
- });
- it('Correct Function permission authentication', () => {
- expect(checkPermissions(() => true, ['user'], target, error)).toEqual('ok');
- });
- it('authority is undefined , return ok', () => {
- expect(checkPermissions(null, ['user'], target, error)).toEqual('ok');
- });
-});
diff --git a/admin-web/src/components/Authorized/PromiseRender.js b/admin-web/src/components/Authorized/PromiseRender.js
deleted file mode 100644
index 8e2a4059d..000000000
--- a/admin-web/src/components/Authorized/PromiseRender.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import { Spin } from 'antd';
-
-export default class PromiseRender extends React.PureComponent {
- state = {
- component: null,
- };
-
- componentDidMount() {
- this.setRenderComponent(this.props);
- }
-
- componentDidUpdate(nextProps) {
- // new Props enter
- this.setRenderComponent(nextProps);
- }
-
- // set render Component : ok or error
- setRenderComponent(props) {
- const ok = this.checkIsInstantiation(props.ok);
- const error = this.checkIsInstantiation(props.error);
- props.promise
- .then(() => {
- this.setState({
- component: ok,
- });
- })
- .catch(() => {
- this.setState({
- component: error,
- });
- });
- }
-
- // Determine whether the incoming component has been instantiated
- // AuthorizedRoute is already instantiated
- // Authorized render is already instantiated, children is no instantiated
- // Secured is not instantiated
- checkIsInstantiation = target => {
- if (!React.isValidElement(target)) {
- return target;
- }
- return () => target;
- };
-
- render() {
- const { component: Component } = this.state;
- const { ok, error, promise, ...rest } = this.props;
- return Component ? (
-
- ) : (
-
-
-
- );
- }
-}
diff --git a/admin-web/src/components/Authorized/Secured.js b/admin-web/src/components/Authorized/Secured.js
deleted file mode 100644
index c935183da..000000000
--- a/admin-web/src/components/Authorized/Secured.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-import Exception from '../Exception';
-import CheckPermissions from './CheckPermissions';
-/**
- * 默认不能访问任何页面
- * default is "NULL"
- */
-const Exception403 = () => ;
-
-// Determine whether the incoming component has been instantiated
-// AuthorizedRoute is already instantiated
-// Authorized render is already instantiated, children is no instantiated
-// Secured is not instantiated
-const checkIsInstantiation = target => {
- if (!React.isValidElement(target)) {
- return target;
- }
- return () => target;
-};
-
-/**
- * 用于判断是否拥有权限访问此view权限
- * authority 支持传入 string, function:()=>boolean|Promise
- * e.g. 'user' 只有user用户能访问
- * e.g. 'user,admin' user和 admin 都能访问
- * e.g. ()=>boolean 返回true能访问,返回false不能访问
- * e.g. Promise then 能访问 catch不能访问
- * e.g. authority support incoming string, function: () => boolean | Promise
- * e.g. 'user' only user user can access
- * e.g. 'user, admin' user and admin can access
- * e.g. () => boolean true to be able to visit, return false can not be accessed
- * e.g. Promise then can not access the visit to catch
- * @param {string | function | Promise} authority
- * @param {ReactNode} error 非必需参数
- */
-const authorize = (authority, error) => {
- /**
- * conversion into a class
- * 防止传入字符串时找不到staticContext造成报错
- * String parameters can cause staticContext not found error
- */
- let classError = false;
- if (error) {
- classError = () => error;
- }
- if (!authority) {
- throw new Error('authority is required');
- }
- return function decideAuthority(target) {
- const component = CheckPermissions(authority, target, classError || Exception403);
- return checkIsInstantiation(component);
- };
-};
-
-export default authorize;
diff --git a/admin-web/src/components/Authorized/demo/AuthorizedArray.md b/admin-web/src/components/Authorized/demo/AuthorizedArray.md
deleted file mode 100644
index 46eaf761c..000000000
--- a/admin-web/src/components/Authorized/demo/AuthorizedArray.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-order: 1
-title:
- zh-CN: 使用数组作为参数
- en-US: Use Array as a parameter
----
-
-Use Array as a parameter
-
-```jsx
-import RenderAuthorized from 'ant-design-pro/lib/Authorized';
-import { Alert } from 'antd';
-
-const Authorized = RenderAuthorized('user');
-const noMatch = ;
-
-ReactDOM.render(
-
-
- ,
- mountNode,
-);
-```
diff --git a/admin-web/src/components/Authorized/demo/AuthorizedFunction.md b/admin-web/src/components/Authorized/demo/AuthorizedFunction.md
deleted file mode 100644
index 8ad8b91e1..000000000
--- a/admin-web/src/components/Authorized/demo/AuthorizedFunction.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-order: 2
-title:
- zh-CN: 使用方法作为参数
- en-US: Use function as a parameter
----
-
-Use Function as a parameter
-
-```jsx
-import RenderAuthorized from 'ant-design-pro/lib/Authorized';
-import { Alert } from 'antd';
-
-const Authorized = RenderAuthorized('user');
-const noMatch = ;
-
-const havePermission = () => {
- return false;
-};
-
-ReactDOM.render(
-
-
- ,
- mountNode,
-);
-```
diff --git a/admin-web/src/components/Authorized/demo/basic.md b/admin-web/src/components/Authorized/demo/basic.md
deleted file mode 100644
index a5f12f29e..000000000
--- a/admin-web/src/components/Authorized/demo/basic.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-order: 0
-title:
- zh-CN: 基本使用
- en-US: Basic use
----
-
-Basic use
-
-```jsx
-import RenderAuthorized from 'ant-design-pro/lib/Authorized';
-import { Alert } from 'antd';
-
-const Authorized = RenderAuthorized('user');
-const noMatch = ;
-
-ReactDOM.render(
- ,
- mountNode,
-);
-```
diff --git a/admin-web/src/components/Authorized/demo/secured.md b/admin-web/src/components/Authorized/demo/secured.md
deleted file mode 100644
index 1e9537af1..000000000
--- a/admin-web/src/components/Authorized/demo/secured.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-order: 3
-title:
- zh-CN: 注解基本使用
- en-US: Basic use secured
----
-
-secured demo used
-
-```jsx
-import RenderAuthorized from 'ant-design-pro/lib/Authorized';
-import { Alert } from 'antd';
-
-const { Secured } = RenderAuthorized('user');
-
-@Secured('admin')
-class TestSecuredString extends React.Component {
- render() {
- ;
- }
-}
-ReactDOM.render(
-
-
-
,
- mountNode,
-);
-```
diff --git a/admin-web/src/components/Authorized/index.d.ts b/admin-web/src/components/Authorized/index.d.ts
deleted file mode 100644
index b3e2f56c6..000000000
--- a/admin-web/src/components/Authorized/index.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as React from 'react';
-import AuthorizedRoute, { authority } from './AuthorizedRoute';
-export type IReactComponent =
- | React.StatelessComponent
- | React.ComponentClass
- | React.ClassicComponentClass
;
-
-type Secured = (
- authority: authority,
- error?: React.ReactNode
-) => (target: T) => T;
-
-type check = (
- authority: authority,
- target: T,
- Exception: S
-) => T | S;
-
-export interface IAuthorizedProps {
- authority: authority;
- noMatch?: React.ReactNode;
-}
-
-export class Authorized extends React.Component {
- public static Secured: Secured;
- public static AuthorizedRoute: typeof AuthorizedRoute;
- public static check: check;
-}
-
-declare function renderAuthorize(currentAuthority: string): typeof Authorized;
-
-export default renderAuthorize;
diff --git a/admin-web/src/components/Authorized/index.js b/admin-web/src/components/Authorized/index.js
deleted file mode 100644
index 22ac664d0..000000000
--- a/admin-web/src/components/Authorized/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Authorized from './Authorized';
-import AuthorizedRoute from './AuthorizedRoute';
-import Secured from './Secured';
-import check from './CheckPermissions';
-import renderAuthorize from './renderAuthorize';
-
-Authorized.Secured = Secured;
-Authorized.AuthorizedRoute = AuthorizedRoute;
-Authorized.check = check;
-
-export default renderAuthorize(Authorized);
diff --git a/admin-web/src/components/Authorized/index.md b/admin-web/src/components/Authorized/index.md
deleted file mode 100644
index 48c93f8fa..000000000
--- a/admin-web/src/components/Authorized/index.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: Authorized
-subtitle: 权限
-cols: 1
-order: 15
----
-
-权限组件，通过比对现有权限与准入权限，决定相关元素的展示。
-
-## API
-
-### RenderAuthorized
-
-`RenderAuthorized: (currentAuthority: string | () => string) => Authorized`
-
-权限组件默认 export RenderAuthorized 函数，它接收当前权限作为参数，返回一个权限对象，该对象提供以下几种使用方式。
-
-
-### Authorized
-
-最基础的权限控制。
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| children | 正常渲染的元素，权限判断通过时展示 | ReactNode | - |
-| authority | 准入权限/权限判断 | `string | array | Promise | (currentAuthority) => boolean | Promise` | - |
-| noMatch | 权限异常渲染元素，权限判断不通过时展示 | ReactNode | - |
-
-### Authorized.AuthorizedRoute
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| authority | 准入权限/权限判断 | `string | array | Promise | (currentAuthority) => boolean | Promise` | - |
-| redirectPath | 权限异常时重定向的页面路由 | string | - |
-
-其余参数与 `Route` 相同。
-
-### Authorized.Secured
-
-注解方式，`@Authorized.Secured(authority, error)`
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| authority | 准入权限/权限判断 | `string | Promise | (currentAuthority) => boolean | Promise` | - |
-| error | 权限异常时渲染元素 | ReactNode | |
-
-### Authorized.check
-
-函数形式的 Authorized，用于某些不能被 HOC 包裹的组件。 `Authorized.check(authority, target, Exception)`
-注意：传入一个 Promise 时，无论正确还是错误返回的都是一个 ReactClass。
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| authority | 准入权限/权限判断 | `string | Promise | (currentAuthority) => boolean | Promise` | - |
-| target | 权限判断通过时渲染的元素 | ReactNode | - |
-| Exception | 权限异常时渲染元素 | ReactNode | - |
diff --git a/admin-web/src/components/Authorized/renderAuthorize.js b/admin-web/src/components/Authorized/renderAuthorize.js
deleted file mode 100644
index be373d996..000000000
--- a/admin-web/src/components/Authorized/renderAuthorize.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* eslint-disable import/no-mutable-exports */
-let CURRENT = 'NULL';
-/**
- * use authority or getAuthority
- * @param {string|()=>String} currentAuthority
- */
-const renderAuthorize = Authorized => currentAuthority => {
- if (currentAuthority) {
- if (typeof currentAuthority === 'function') {
- CURRENT = currentAuthority();
- }
- if (
- Object.prototype.toString.call(currentAuthority) === '[object String]' ||
- Array.isArray(currentAuthority)
- ) {
- CURRENT = currentAuthority;
- }
- } else {
- CURRENT = 'NULL';
- }
- return Authorized;
-};
-
-export { CURRENT };
-export default Authorized => renderAuthorize(Authorized);
diff --git a/admin-web/src/components/AvatarList/AvatarItem.d.ts b/admin-web/src/components/AvatarList/AvatarItem.d.ts
deleted file mode 100644
index 5681de77c..000000000
--- a/admin-web/src/components/AvatarList/AvatarItem.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import * as React from 'react';
-export interface IAvatarItemProps {
- tips: React.ReactNode;
- src: string;
- style?: React.CSSProperties;
-}
-
-export default class AvatarItem extends React.Component {
- constructor(props: IAvatarItemProps);
-}
diff --git a/admin-web/src/components/AvatarList/demo/maxLength.md b/admin-web/src/components/AvatarList/demo/maxLength.md
deleted file mode 100644
index 76c6b421c..000000000
--- a/admin-web/src/components/AvatarList/demo/maxLength.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-order: 0
-title:
- zh-CN: 要显示的最大项目
- en-US: Max Items to Show
----
-
-`maxLength` attribute specifies the maximum number of items to show while `excessItemsStyle` style the excess
-item component.
-
-````jsx
-import AvatarList from 'ant-design-pro/lib/AvatarList';
-
-ReactDOM.render(
-
-
-
-
-
-
-
-
-, mountNode);
-````
diff --git a/admin-web/src/components/AvatarList/demo/simple.md b/admin-web/src/components/AvatarList/demo/simple.md
deleted file mode 100644
index e941aea9b..000000000
--- a/admin-web/src/components/AvatarList/demo/simple.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-order: 0
-title:
- zh-CN: 基础样例
- en-US: Basic Usage
----
-
-Simplest of usage.
-
-````jsx
-import AvatarList from 'ant-design-pro/lib/AvatarList';
-
-ReactDOM.render(
-
-
-
-
-
-, mountNode);
-````
diff --git a/admin-web/src/components/AvatarList/index.d.ts b/admin-web/src/components/AvatarList/index.d.ts
deleted file mode 100644
index f49ca010d..000000000
--- a/admin-web/src/components/AvatarList/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as React from 'react';
-import AvatarItem from './AvatarItem';
-
-export interface IAvatarListProps {
- size?: 'large' | 'small' | 'mini' | 'default';
- maxLength?: number;
- excessItemsStyle?: React.CSSProperties;
- style?: React.CSSProperties;
- children: React.ReactElement | Array>;
-}
-
-export default class AvatarList extends React.Component {
- public static Item: typeof AvatarItem;
-}
diff --git a/admin-web/src/components/AvatarList/index.en-US.md b/admin-web/src/components/AvatarList/index.en-US.md
deleted file mode 100644
index 7fc39cc2b..000000000
--- a/admin-web/src/components/AvatarList/index.en-US.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: AvatarList
-order: 1
-cols: 1
----
-
-A list of user's avatar for project or group member list frequently. If a large or small AvatarList is desired, set the `size` property to either `large` or `small` and `mini` respectively. Omit the `size` property for a AvatarList with the default size.
-
-## API
-
-### AvatarList
-
-| Property | Description | Type | Default |
-| ---------------- | --------------------- | ---------------------------------- | --------- |
-| size | size of list | `large`、`small` 、`mini`, `default` | `default` |
-| maxLength | max items to show | number | - |
-| excessItemsStyle | the excess item style | CSSProperties | - |
-
-### AvatarList.Item
-
-| Property | Description | Type | Default |
-| -------- | -------------------------------------------- | --------- | ------- |
-| tips | title tips for avatar item | ReactNode | - |
-| src | the address of the image for an image avatar | string | - |
diff --git a/admin-web/src/components/AvatarList/index.js b/admin-web/src/components/AvatarList/index.js
deleted file mode 100644
index 9af32bcfd..000000000
--- a/admin-web/src/components/AvatarList/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { Tooltip, Avatar } from 'antd';
-import classNames from 'classnames';
-
-import styles from './index.less';
-
-const avatarSizeToClassName = size =>
- classNames(styles.avatarItem, {
- [styles.avatarItemLarge]: size === 'large',
- [styles.avatarItemSmall]: size === 'small',
- [styles.avatarItemMini]: size === 'mini',
- });
-
-const AvatarList = ({ children, size, maxLength, excessItemsStyle, ...other }) => {
- const numOfChildren = React.Children.count(children);
- const numToShow = maxLength >= numOfChildren ? numOfChildren : maxLength;
-
- const childrenWithProps = React.Children.toArray(children)
- .slice(0, numToShow)
- .map(child =>
- React.cloneElement(child, {
- size,
- })
- );
-
- if (numToShow < numOfChildren) {
- const cls = avatarSizeToClassName(size);
-
- childrenWithProps.push(
-
- {`+${numOfChildren - maxLength}`}
-
- );
- }
-
- return (
-
- );
-};
-
-const Item = ({ src, size, tips, onClick = () => {} }) => {
- const cls = avatarSizeToClassName(size);
-
- return (
-
- {tips ? (
-
-
-
- ) : (
-
- )}
-
- );
-};
-
-AvatarList.Item = Item;
-
-export default AvatarList;
diff --git a/admin-web/src/components/AvatarList/index.less b/admin-web/src/components/AvatarList/index.less
deleted file mode 100644
index 45904ce6a..000000000
--- a/admin-web/src/components/AvatarList/index.less
+++ /dev/null
@@ -1,50 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.avatarList {
- display: inline-block;
- ul {
- display: inline-block;
- margin-left: 8px;
- font-size: 0;
- }
-}
-
-.avatarItem {
- display: inline-block;
- width: @avatar-size-base;
- height: @avatar-size-base;
- margin-left: -8px;
- font-size: @font-size-base;
- :global {
- .ant-avatar {
- border: 1px solid #fff;
- }
- }
-}
-
-.avatarItemLarge {
- width: @avatar-size-lg;
- height: @avatar-size-lg;
-}
-
-.avatarItemSmall {
- width: @avatar-size-sm;
- height: @avatar-size-sm;
-}
-
-.avatarItemMini {
- width: 20px;
- height: 20px;
- :global {
- .ant-avatar {
- width: 20px;
- height: 20px;
- line-height: 20px;
-
- .ant-avatar-string {
- font-size: 12px;
- line-height: 18px;
- }
- }
- }
-}
diff --git a/admin-web/src/components/AvatarList/index.test.js b/admin-web/src/components/AvatarList/index.test.js
deleted file mode 100644
index 2b5bc438d..000000000
--- a/admin-web/src/components/AvatarList/index.test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import range from 'lodash/range';
-import { mount } from 'enzyme';
-import AvatarList from './index';
-
-const renderItems = numItems =>
- range(numItems).map(i => (
-
- ));
-
-describe('AvatarList', () => {
- it('renders all items', () => {
- const wrapper = mount({renderItems(4)});
- expect(wrapper.find('AvatarList').length).toBe(1);
- expect(wrapper.find('Item').length).toBe(4);
- expect(wrapper.findWhere(node => node.key() === 'exceed').length).toBe(0);
- });
-
- it('renders max of 3 items', () => {
- const wrapper = mount({renderItems(4)});
- expect(wrapper.find('AvatarList').length).toBe(1);
- expect(wrapper.find('Item').length).toBe(3);
- expect(wrapper.findWhere(node => node.key() === 'exceed').length).toBe(1);
- });
-});
diff --git a/admin-web/src/components/AvatarList/index.zh-CN.md b/admin-web/src/components/AvatarList/index.zh-CN.md
deleted file mode 100644
index bdab181ce..000000000
--- a/admin-web/src/components/AvatarList/index.zh-CN.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: AvatarList
-subtitle: 用户头像列表
-order: 1
-cols: 1
----
-
-一组用户头像，常用在项目/团队成员列表。可通过设置 `size` 属性来指定头像大小。
-
-## API
-
-### AvatarList
-
-| 参数 | 说明 | 类型 | 默认值 |
-| ---------------- | -------- | ---------------------------------- | --------- |
-| size | 头像大小 | `large`、`small` 、`mini`, `default` | `default` |
-| maxLength | 要显示的最大项目 | number | - |
-| excessItemsStyle | 多余的项目风格 | CSSProperties | - |
-
-### AvatarList.Item
-
-| 参数 | 说明 | 类型 | 默认值 |
-| ---- | ------ | --------- | --- |
-| tips | 头像展示文案 | ReactNode | - |
-| src | 头像图片连接 | string | - |
diff --git a/admin-web/src/components/Charts/AsyncLoadBizCharts.js b/admin-web/src/components/Charts/AsyncLoadBizCharts.js
deleted file mode 100644
index 8d9a2cd05..000000000
--- a/admin-web/src/components/Charts/AsyncLoadBizCharts.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import PageLoading from '../PageLoading';
-import { importCDN } from '@/utils/utils';
-
-let isLoaderBizChart = false;
-const loadBizCharts = async () => {
- if (isLoaderBizChart) {
- return Promise.resolve(true);
- }
- await Promise.all([
- importCDN('//gw.alipayobjects.com/os/lib/bizcharts/3.4.3/umd/BizCharts.min.js'),
- importCDN('//gw.alipayobjects.com/os/lib/antv/data-set/0.10.1/dist/data-set.min.js'),
- ]);
- // eslint-disable-next-line no-console
- console.log('bizCharts load success');
- isLoaderBizChart = true;
- return Promise.resolve(true);
-};
-
-class AsyncLoadBizCharts extends React.Component {
- state = {
- loading: !isLoaderBizChart,
- };
-
- async componentDidMount() {
- await loadBizCharts();
- requestAnimationFrame(() => {
- this.setState({
- loading: false,
- });
- });
- }
-
- render() {
- const { children } = this.props;
- const { loading } = this.state;
- if (!loading) {
- return children;
- }
- return ;
- }
-}
-
-export { loadBizCharts, AsyncLoadBizCharts };
diff --git a/admin-web/src/components/Charts/Bar/index.d.ts b/admin-web/src/components/Charts/Bar/index.d.ts
deleted file mode 100644
index 489908250..000000000
--- a/admin-web/src/components/Charts/Bar/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react';
-export interface IBarProps {
- title: React.ReactNode;
- color?: string;
- padding?: [number, number, number, number];
- height: number;
- data: Array<{
- x: string;
- y: number;
- }>;
- autoLabel?: boolean;
- style?: React.CSSProperties;
-}
-
-export default class Bar extends React.Component {}
diff --git a/admin-web/src/components/Charts/Bar/index.js b/admin-web/src/components/Charts/Bar/index.js
deleted file mode 100644
index f0cb65ffe..000000000
--- a/admin-web/src/components/Charts/Bar/index.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { Component } from 'react';
-import { Chart, Axis, Tooltip, Geom } from 'bizcharts';
-import Debounce from 'lodash-decorators/debounce';
-import Bind from 'lodash-decorators/bind';
-import autoHeight from '../autoHeight';
-import styles from '../index.less';
-
-@autoHeight()
-class Bar extends Component {
- state = {
- autoHideXLabels: false,
- };
-
- componentDidMount() {
- window.addEventListener('resize', this.resize, { passive: true });
- }
-
- componentWillUnmount() {
- window.removeEventListener('resize', this.resize);
- }
-
- handleRoot = n => {
- this.root = n;
- };
-
- handleRef = n => {
- this.node = n;
- };
-
- @Bind()
- @Debounce(400)
- resize() {
- if (!this.node) {
- return;
- }
- const canvasWidth = this.node.parentNode.clientWidth;
- const { data = [], autoLabel = true } = this.props;
- if (!autoLabel) {
- return;
- }
- const minWidth = data.length * 30;
- const { autoHideXLabels } = this.state;
-
- if (canvasWidth <= minWidth) {
- if (!autoHideXLabels) {
- this.setState({
- autoHideXLabels: true,
- });
- }
- } else if (autoHideXLabels) {
- this.setState({
- autoHideXLabels: false,
- });
- }
- }
-
- render() {
- const {
- height,
- title,
- forceFit = true,
- data,
- color = 'rgba(24, 144, 255, 0.85)',
- padding,
- } = this.props;
-
- const { autoHideXLabels } = this.state;
-
- const scale = {
- x: {
- type: 'cat',
- },
- y: {
- min: 0,
- },
- };
-
- const tooltip = [
- 'x*y',
- (x, y) => ({
- name: x,
- value: y,
- }),
- ];
-
- return (
-
-
- {title &&
{title}
}
-
-
-
-
-
-
-
-
{total()}
;
- break;
- default:
- totalDom = {total}
;
- }
- return totalDom;
-};
-
-class ChartCard extends React.PureComponent {
- renderConnet = () => {
- const { contentHeight, title, avatar, action, total, footer, children, loading } = this.props;
- if (loading) {
- return false;
- }
- return (
-
-
-
{avatar}
-
-
- {title}
- {action}
-
- {renderTotal(total)}
-
-
- {children && (
-
- )}
- {footer && (
-
- {footer}
-
- )}
-
- {label}
- {value}
-
-);
-
-export default Field;
diff --git a/admin-web/src/components/Charts/Field/index.less b/admin-web/src/components/Charts/Field/index.less
deleted file mode 100644
index 4124471cb..000000000
--- a/admin-web/src/components/Charts/Field/index.less
+++ /dev/null
@@ -1,17 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.field {
- margin: 0;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- .label,
- .number {
- font-size: @font-size-base;
- line-height: 22px;
- }
- .number {
- margin-left: 8px;
- color: @heading-color;
- }
-}
diff --git a/admin-web/src/components/Charts/Gauge/index.d.ts b/admin-web/src/components/Charts/Gauge/index.d.ts
deleted file mode 100644
index 66e3c003a..000000000
--- a/admin-web/src/components/Charts/Gauge/index.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as React from 'react';
-export interface IGaugeProps {
- title: React.ReactNode;
- color?: string;
- height: number;
- bgColor?: number;
- percent: number;
- style?: React.CSSProperties;
-}
-
-export default class Gauge extends React.Component {}
diff --git a/admin-web/src/components/Charts/Gauge/index.js b/admin-web/src/components/Charts/Gauge/index.js
deleted file mode 100644
index 2249211ae..000000000
--- a/admin-web/src/components/Charts/Gauge/index.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import React from 'react';
-import { Chart, Geom, Axis, Coord, Guide, Shape } from 'bizcharts';
-import autoHeight from '../autoHeight';
-
-const { Arc, Html, Line } = Guide;
-
-const defaultFormatter = val => {
- switch (val) {
- case '2':
- return '差';
- case '4':
- return '中';
- case '6':
- return '良';
- case '8':
- return '优';
- default:
- return '';
- }
-};
-
-Shape.registerShape('point', 'pointer', {
- drawShape(cfg, group) {
- let point = cfg.points[0];
- point = this.parsePoint(point);
- const center = this.parsePoint({
- x: 0,
- y: 0,
- });
- group.addShape('line', {
- attrs: {
- x1: center.x,
- y1: center.y,
- x2: point.x,
- y2: point.y,
- stroke: cfg.color,
- lineWidth: 2,
- lineCap: 'round',
- },
- });
- return group.addShape('circle', {
- attrs: {
- x: center.x,
- y: center.y,
- r: 6,
- stroke: cfg.color,
- lineWidth: 3,
- fill: '#fff',
- },
- });
- },
-});
-
-@autoHeight()
-class Gauge extends React.Component {
- render() {
- const {
- title,
- height,
- percent,
- forceFit = true,
- formatter = defaultFormatter,
- color = '#2F9CFF',
- bgColor = '#F0F2F5',
- } = this.props;
- const cols = {
- value: {
- type: 'linear',
- min: 0,
- max: 10,
- tickCount: 6,
- nice: true,
- },
- };
- const data = [{ value: percent / 10 }];
- return (
-
-
-
-
-
-
-
-
-
-
- `
-
-
${title}
-
- ${data[0].value * 10}%
-
-
-
- {height > 0 && (
-
-
-
-
-
- {line ? (
-
- ) : (
-
- )}
-
- )}
-
-
-
-
-
- {!!tooltip && }
-
-
-
-
- {(subTitle || total) && (
-
- {subTitle &&
{subTitle}
}
- {/* eslint-disable-next-line */}
- {total && (
-
{typeof total === 'function' ? total() : total}
- )}
-
- )}
-
-
- {hasLegend && (
-
- {legendData.map((item, i) => (
- - this.handleLegendClick(item, i)}>
-
- {item.x}
-
-
- {`${(Number.isNaN(item.percent) ? 0 : item.percent * 100).toFixed(2)}%`}
-
- {valueFormat ? valueFormat(item.y) : item.y}
-
- ))}
-
- )}
-
- {title &&
{title}
}
-
-
-
-
-
-
-
-
- {hasLegend && (
-
- {legendData.map((item, i) => (
- this.handleLegendClick(item, i)}
- >
-
-
-
- {item.name}
-
-
{item.value}
-
- )}
-
- {dv && (
-
-
-
-
-
- )}
-
- );
- }
-}
-
-export default TagCloud;
diff --git a/admin-web/src/components/Charts/TagCloud/index.less b/admin-web/src/components/Charts/TagCloud/index.less
deleted file mode 100644
index db8e4dabf..000000000
--- a/admin-web/src/components/Charts/TagCloud/index.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.tagCloud {
- overflow: hidden;
- canvas {
- transform-origin: 0 0;
- }
-}
diff --git a/admin-web/src/components/Charts/TimelineChart/index.d.ts b/admin-web/src/components/Charts/TimelineChart/index.d.ts
deleted file mode 100644
index 40b94325a..000000000
--- a/admin-web/src/components/Charts/TimelineChart/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as React from 'react';
-export interface ITimelineChartProps {
- data: Array<{
- x: number;
- y1: number;
- y2?: number;
- }>;
- titleMap: { y1: string; y2?: string };
- padding?: [number, number, number, number];
- height?: number;
- style?: React.CSSProperties;
-}
-
-export default class TimelineChart extends React.Component {}
diff --git a/admin-web/src/components/Charts/TimelineChart/index.js b/admin-web/src/components/Charts/TimelineChart/index.js
deleted file mode 100644
index d82623c58..000000000
--- a/admin-web/src/components/Charts/TimelineChart/index.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import React from 'react';
-import { Chart, Tooltip, Geom, Legend, Axis } from 'bizcharts';
-import DataSet from '@antv/data-set';
-import Slider from 'bizcharts-plugin-slider';
-import autoHeight from '../autoHeight';
-import styles from './index.less';
-
-@autoHeight()
-class TimelineChart extends React.Component {
- render() {
- const {
- title,
- height = 400,
- padding = [60, 20, 40, 40],
- titleMap = {
- y1: 'y1',
- y2: 'y2',
- },
- borderWidth = 2,
- data: sourceData,
- } = this.props;
-
- const data = Array.isArray(sourceData) ? sourceData : [{ x: 0, y1: 0, y2: 0 }];
-
- data.sort((a, b) => a.x - b.x);
-
- let max;
- if (data[0] && data[0].y1 && data[0].y2) {
- max = Math.max(
- [...data].sort((a, b) => b.y1 - a.y1)[0].y1,
- [...data].sort((a, b) => b.y2 - a.y2)[0].y2
- );
- }
-
- const ds = new DataSet({
- state: {
- start: data[0].x,
- end: data[data.length - 1].x,
- },
- });
-
- const dv = ds.createView();
- dv.source(data)
- .transform({
- type: 'filter',
- callback: obj => {
- const date = obj.x;
- return date <= ds.state.end && date >= ds.state.start;
- },
- })
- .transform({
- type: 'map',
- callback(row) {
- const newRow = { ...row };
- newRow[titleMap.y1] = row.y1;
- newRow[titleMap.y2] = row.y2;
- return newRow;
- },
- })
- .transform({
- type: 'fold',
- fields: [titleMap.y1, titleMap.y2], // 展开字段集
- key: 'key', // key字段
- value: 'value', // value字段
- });
-
- const timeScale = {
- type: 'time',
- tickInterval: 60 * 60 * 1000,
- mask: 'HH:mm',
- range: [0, 1],
- };
-
- const cols = {
- x: timeScale,
- value: {
- max,
- min: 0,
- },
- };
-
- const SliderGen = () => (
- {
- ds.setState('start', startValue);
- ds.setState('end', endValue);
- }}
- />
- );
-
- return (
-
-
- {title &&
{title}
}
-
-
-
-
-
-
-
-
-
-
-
(this.root = n)}
- style={{ transform: `scale(${radio})` }}
- >
-
-
-
- {title && {title}}
-
{percent}%
-
-
{h > 0 && }
- );
- }
- };
-
-export default autoHeight;
diff --git a/admin-web/src/components/Charts/bizcharts.d.ts b/admin-web/src/components/Charts/bizcharts.d.ts
deleted file mode 100644
index 0815ffeef..000000000
--- a/admin-web/src/components/Charts/bizcharts.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as BizChart from 'bizcharts';
-
-export = BizChart;
diff --git a/admin-web/src/components/Charts/bizcharts.js b/admin-web/src/components/Charts/bizcharts.js
deleted file mode 100644
index e08db8d6d..000000000
--- a/admin-web/src/components/Charts/bizcharts.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import * as BizChart from 'bizcharts';
-
-export default BizChart;
diff --git a/admin-web/src/components/Charts/demo/bar.md b/admin-web/src/components/Charts/demo/bar.md
deleted file mode 100644
index 955f44e07..000000000
--- a/admin-web/src/components/Charts/demo/bar.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-order: 4
-title: 柱状图
----
-
-通过设置 `x`，`y` 属性，可以快速的构建出一个漂亮的柱状图，各种纬度的关系则是通过自定义的数据展现。
-
-````jsx
-import { Bar } from 'ant-design-pro/lib/Charts';
-
-const salesData = [];
-for (let i = 0; i < 12; i += 1) {
- salesData.push({
- x: `${i + 1}月`,
- y: Math.floor(Math.random() * 1000) + 200,
- });
-}
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/chart-card.md b/admin-web/src/components/Charts/demo/chart-card.md
deleted file mode 100644
index 4da852b71..000000000
--- a/admin-web/src/components/Charts/demo/chart-card.md
+++ /dev/null
@@ -1,95 +0,0 @@
----
-order: 1
-title: 图表卡片
----
-
-用于展示图表的卡片容器，可以方便的配合其它图表套件展示丰富信息。
-
-```jsx
-import { ChartCard, yuan, Field } from 'ant-design-pro/lib/Charts';
-import Trend from 'ant-design-pro/lib/Trend';
-import { Row, Col, Icon, Tooltip } from 'antd';
-import numeral from 'numeral';
-
-ReactDOM.render(
-
-
-
-
-
- }
- total={() => (
-
- )}
- footer={
-
- }
- contentHeight={46}
- >
-
- 周同比
-
- 12%
-
-
-
- 日环比
-
- 11%
-
-
-
-
-
-
- }
- action={
-
-
-
- }
- total={() => (
-
- )}
- footer={
-
- }
- />
-
-
-
- }
- action={
-
-
-
- }
- total={() => (
-
- )}
- />
-
-
,
- mountNode,
-);
-```
diff --git a/admin-web/src/components/Charts/demo/gauge.md b/admin-web/src/components/Charts/demo/gauge.md
deleted file mode 100644
index f53465d88..000000000
--- a/admin-web/src/components/Charts/demo/gauge.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-order: 7
-title: 仪表盘
----
-
-仪表盘是一种进度展示方式，可以更直观的展示当前的进展情况，通常也可表示占比。
-
-````jsx
-import { Gauge } from 'ant-design-pro/lib/Charts';
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/mini-area.md b/admin-web/src/components/Charts/demo/mini-area.md
deleted file mode 100644
index 2b9bfb477..000000000
--- a/admin-web/src/components/Charts/demo/mini-area.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-order: 2
-col: 2
-title: 迷你区域图
----
-
-````jsx
-import { MiniArea } from 'ant-design-pro/lib/Charts';
-import moment from 'moment';
-
-const visitData = [];
-const beginDay = new Date().getTime();
-for (let i = 0; i < 20; i += 1) {
- visitData.push({
- x: moment(new Date(beginDay + (1000 * 60 * 60 * 24 * i))).format('YYYY-MM-DD'),
- y: Math.floor(Math.random() * 100) + 10,
- });
-}
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/mini-bar.md b/admin-web/src/components/Charts/demo/mini-bar.md
deleted file mode 100644
index fef301bca..000000000
--- a/admin-web/src/components/Charts/demo/mini-bar.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-order: 2
-col: 2
-title: 迷你柱状图
----
-
-迷你柱状图更适合展示简单的区间数据，简洁的表现方式可以很好的减少大数据量的视觉展现压力。
-
-````jsx
-import { MiniBar } from 'ant-design-pro/lib/Charts';
-import moment from 'moment';
-
-const visitData = [];
-const beginDay = new Date().getTime();
-for (let i = 0; i < 20; i += 1) {
- visitData.push({
- x: moment(new Date(beginDay + (1000 * 60 * 60 * 24 * i))).format('YYYY-MM-DD'),
- y: Math.floor(Math.random() * 100) + 10,
- });
-}
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/mini-pie.md b/admin-web/src/components/Charts/demo/mini-pie.md
deleted file mode 100644
index 9b1abf059..000000000
--- a/admin-web/src/components/Charts/demo/mini-pie.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-order: 6
-title: 迷你饼状图
----
-
-通过简化 `Pie` 属性的设置，可以快速的实现极简的饼状图，可配合 `ChartCard` 组合展
-现更多业务场景。
-
-```jsx
-import { Pie } from 'ant-design-pro/lib/Charts';
-
-ReactDOM.render(
- ,
- mountNode
-);
-```
diff --git a/admin-web/src/components/Charts/demo/mini-progress.md b/admin-web/src/components/Charts/demo/mini-progress.md
deleted file mode 100644
index 6308a8fae..000000000
--- a/admin-web/src/components/Charts/demo/mini-progress.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-order: 3
-title: 迷你进度条
----
-
-````jsx
-import { MiniProgress } from 'ant-design-pro/lib/Charts';
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/mix.md b/admin-web/src/components/Charts/demo/mix.md
deleted file mode 100644
index fc64110ae..000000000
--- a/admin-web/src/components/Charts/demo/mix.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-order: 0
-title: 图表套件组合展示
----
-
-利用 Ant Design Pro 提供的图表套件，可以灵活组合符合设计规范的图表来满足复杂的业务需求。
-
-````jsx
-import { ChartCard, Field, MiniArea, MiniBar, MiniProgress } from 'ant-design-pro/lib/Charts';
-import Trend from 'ant-design-pro/lib/Trend';
-import NumberInfo from 'ant-design-pro/lib/NumberInfo';
-import { Row, Col, Icon, Tooltip } from 'antd';
-import numeral from 'numeral';
-import moment from 'moment';
-
-const visitData = [];
-const beginDay = new Date().getTime();
-for (let i = 0; i < 20; i += 1) {
- visitData.push({
- x: moment(new Date(beginDay + (1000 * 60 * 60 * 24 * i))).format('YYYY-MM-DD'),
- y: Math.floor(Math.random() * 100) + 10,
- });
-}
-
-ReactDOM.render(
-
-
-
- 本周访问}
- total={numeral(12321).format('0,0')}
- status="up"
- subTotal={17.1}
- />
-
-
-
-
- }
- total={numeral(8846).format('0,0')}
- footer={}
- contentHeight={46}
- >
-
-
-
-
- }
- total="78%"
- footer={
-
-
- 周同比
- 12%
-
-
- 日环比
- 11%
-
-
- }
- contentHeight={46}
- >
-
-
-
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/pie.md b/admin-web/src/components/Charts/demo/pie.md
deleted file mode 100644
index 9c87161a2..000000000
--- a/admin-web/src/components/Charts/demo/pie.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-order: 5
-title: 饼状图
----
-
-```jsx
-import { Pie, yuan } from 'ant-design-pro/lib/Charts';
-
-const salesPieData = [
- {
- x: '家用电器',
- y: 4544,
- },
- {
- x: '食用酒水',
- y: 3321,
- },
- {
- x: '个护健康',
- y: 3113,
- },
- {
- x: '服饰箱包',
- y: 2341,
- },
- {
- x: '母婴产品',
- y: 1231,
- },
- {
- x: '其他',
- y: 1231,
- },
-];
-
-ReactDOM.render(
- (
- now.y + pre, 0))
- }}
- />
- )}
- data={salesPieData}
- valueFormat={val => }
- height={294}
- />,
- mountNode,
-);
-```
diff --git a/admin-web/src/components/Charts/demo/radar.md b/admin-web/src/components/Charts/demo/radar.md
deleted file mode 100644
index 584344aa3..000000000
--- a/admin-web/src/components/Charts/demo/radar.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-order: 7
-title: 雷达图
----
-
-````jsx
-import { Radar, ChartCard } from 'ant-design-pro/lib/Charts';
-
-const radarOriginData = [
- {
- name: '个人',
- ref: 10,
- koubei: 8,
- output: 4,
- contribute: 5,
- hot: 7,
- },
- {
- name: '团队',
- ref: 3,
- koubei: 9,
- output: 6,
- contribute: 3,
- hot: 1,
- },
- {
- name: '部门',
- ref: 4,
- koubei: 1,
- output: 6,
- contribute: 5,
- hot: 7,
- },
-];
-const radarData = [];
-const radarTitleMap = {
- ref: '引用',
- koubei: '口碑',
- output: '产量',
- contribute: '贡献',
- hot: '热度',
-};
-radarOriginData.forEach((item) => {
- Object.keys(item).forEach((key) => {
- if (key !== 'name') {
- radarData.push({
- name: item.name,
- label: radarTitleMap[key],
- value: item[key],
- });
- }
- });
-});
-
-ReactDOM.render(
-
-
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/tag-cloud.md b/admin-web/src/components/Charts/demo/tag-cloud.md
deleted file mode 100644
index c66f6fe6b..000000000
--- a/admin-web/src/components/Charts/demo/tag-cloud.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-order: 9
-title: 标签云
----
-
-标签云是一套相关的标签以及与此相应的权重展示方式，一般典型的标签云有 30 至 150 个标签，而权重影响使用的字体大小或其他视觉效果。
-
-````jsx
-import { TagCloud } from 'ant-design-pro/lib/Charts';
-
-const tags = [];
-for (let i = 0; i < 50; i += 1) {
- tags.push({
- name: `TagClout-Title-${i}`,
- value: Math.floor((Math.random() * 50)) + 20,
- });
-}
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/timeline-chart.md b/admin-web/src/components/Charts/demo/timeline-chart.md
deleted file mode 100644
index 60773b575..000000000
--- a/admin-web/src/components/Charts/demo/timeline-chart.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-order: 9
-title: 带有时间轴的图表
----
-
-使用 `TimelineChart` 组件可以实现带有时间轴的柱状图展现，而其中的 `x` 属性，则是时间值的指向，默认最多支持同时展现两个指标，分别是 `y1` 和 `y2`。
-
-````jsx
-import { TimelineChart } from 'ant-design-pro/lib/Charts';
-
-const chartData = [];
-for (let i = 0; i < 20; i += 1) {
- chartData.push({
- x: (new Date().getTime()) + (1000 * 60 * 30 * i),
- y1: Math.floor(Math.random() * 100) + 1000,
- y2: Math.floor(Math.random() * 100) + 10,
- });
-}
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/demo/waterwave.md b/admin-web/src/components/Charts/demo/waterwave.md
deleted file mode 100644
index 74d290f54..000000000
--- a/admin-web/src/components/Charts/demo/waterwave.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-order: 8
-title: 水波图
----
-
-水波图是一种比例的展示方式，可以更直观的展示关键值的占比。
-
-````jsx
-import { WaterWave } from 'ant-design-pro/lib/Charts';
-
-ReactDOM.render(
-
-
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Charts/index.d.ts b/admin-web/src/components/Charts/index.d.ts
deleted file mode 100644
index 57f1d5272..000000000
--- a/admin-web/src/components/Charts/index.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as numeral from 'numeral';
-import { default as Bar } from './Bar';
-import { default as ChartCard } from './ChartCard';
-import { default as Field } from './Field';
-import { default as Gauge } from './Gauge';
-import { default as MiniArea } from './MiniArea';
-import { default as MiniBar } from './MiniBar';
-import { default as MiniProgress } from './MiniProgress';
-import { default as Pie } from './Pie';
-import { default as Radar } from './Radar';
-import { default as TagCloud } from './TagCloud';
-import { default as TimelineChart } from './TimelineChart';
-import { default as WaterWave } from './WaterWave';
-
-declare const yuan: (value: number | string) => string;
-
-declare const Charts: {
- yuan: (value: number | string) => string;
- Bar: Bar;
- Pie: Pie;
- Gauge: Gauge;
- Radar: Radar;
- MiniBar: MiniBar;
- MiniArea: MiniArea;
- MiniProgress: MiniProgress;
- ChartCard: ChartCard;
- Field: Field;
- WaterWave: WaterWave;
- TagCloud: TagCloud;
- TimelineChart: TimelineChart;
-};
-
-export {
- Charts as default,
- yuan,
- Bar,
- Pie,
- Gauge,
- Radar,
- MiniBar,
- MiniArea,
- MiniProgress,
- ChartCard,
- Field,
- WaterWave,
- TagCloud,
- TimelineChart,
-};
diff --git a/admin-web/src/components/Charts/index.js b/admin-web/src/components/Charts/index.js
deleted file mode 100644
index 56a1c565f..000000000
--- a/admin-web/src/components/Charts/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { Suspense } from 'react';
-import numeral from 'numeral';
-import ChartCard from './ChartCard';
-import Field from './Field';
-
-const getComponent = Component => {
- return props => {
- return (
-
-
-
- );
- };
-};
-
-const Bar = getComponent(React.lazy(() => import('./Bar')));
-const Pie = getComponent(React.lazy(() => import('./Pie')));
-const Radar = getComponent(React.lazy(() => import('./Radar')));
-const Gauge = getComponent(React.lazy(() => import('./Gauge')));
-const MiniArea = getComponent(React.lazy(() => import('./MiniArea')));
-const MiniBar = getComponent(React.lazy(() => import('./MiniBar')));
-const MiniProgress = getComponent(React.lazy(() => import('./MiniProgress')));
-const WaterWave = getComponent(React.lazy(() => import('./WaterWave')));
-const TagCloud = getComponent(React.lazy(() => import('./TagCloud')));
-const TimelineChart = getComponent(React.lazy(() => import('./TimelineChart')));
-
-const yuan = val => `¥ ${numeral(val).format('0,0')}`;
-
-const Charts = {
- yuan,
- Bar,
- Pie,
- Gauge,
- Radar,
- MiniBar,
- MiniArea,
- MiniProgress,
- ChartCard,
- Field,
- WaterWave,
- TagCloud,
- TimelineChart,
-};
-
-export {
- Charts as default,
- yuan,
- Bar,
- Pie,
- Gauge,
- Radar,
- MiniBar,
- MiniArea,
- MiniProgress,
- ChartCard,
- Field,
- WaterWave,
- TagCloud,
- TimelineChart,
-};
diff --git a/admin-web/src/components/Charts/index.less b/admin-web/src/components/Charts/index.less
deleted file mode 100644
index 190428bc8..000000000
--- a/admin-web/src/components/Charts/index.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.miniChart {
- position: relative;
- width: 100%;
- .chartContent {
- position: absolute;
- bottom: -28px;
- width: 100%;
- > div {
- margin: 0 -5px;
- overflow: hidden;
- }
- }
- .chartLoading {
- position: absolute;
- top: 16px;
- left: 50%;
- margin-left: -7px;
- }
-}
diff --git a/admin-web/src/components/Charts/index.md b/admin-web/src/components/Charts/index.md
deleted file mode 100644
index e5f41c873..000000000
--- a/admin-web/src/components/Charts/index.md
+++ /dev/null
@@ -1,130 +0,0 @@
----
-title: Charts
-subtitle: 图表
-order: 2
-cols: 2
----
-
-Ant Design Pro 提供的业务中常用的图表类型，都是基于 [G2](https://antv.alipay.com/g2/doc/index.html) 按照 Ant Design 图表规范封装，需要注意的是 Ant Design Pro 的图表组件以套件形式提供，可以任意组合实现复杂的业务需求。
-
-因为结合了 Ant Design 的标准设计，本着极简的设计思想以及开箱即用的理念，简化了大量 API 配置，所以如果需要灵活定制图表，可以参考 Ant Design Pro 图表实现，自行基于 [G2](https://antv.alipay.com/g2/doc/index.html) 封装图表组件使用。
-
-## API
-
-### ChartCard
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| title | 卡片标题 | ReactNode\|string | - |
-| action | 卡片操作 | ReactNode | - |
-| total | 数据总量 | ReactNode \| number \| function | - |
-| footer | 卡片底部 | ReactNode | - |
-| contentHeight | 内容区域高度 | number | - |
-| avatar | 右侧图标 | React.ReactNode | - |
-### MiniBar
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| color | 图表颜色 | string | `#1890FF` |
-| height | 图表高度 | number | - |
-| data | 数据 | array<{x, y}> | - |
-
-### MiniArea
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| color | 图表颜色 | string | `rgba(24, 144, 255, 0.2)` |
-| borderColor | 图表边颜色 | string | `#1890FF` |
-| height | 图表高度 | number | - |
-| line | 是否显示描边 | boolean | false |
-| animate | 是否显示动画 | boolean | true |
-| xAxis | [x 轴配置](http://antvis.github.io/g2/doc/tutorial/start/axis.html) | object | - |
-| yAxis | [y 轴配置](http://antvis.github.io/g2/doc/tutorial/start/axis.html) | object | - |
-| data | 数据 | array<{x, y}> | - |
-
-### MiniProgress
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| target | 目标比例 | number | - |
-| color | 进度条颜色 | string | - |
-| strokeWidth | 进度条高度 | number | - |
-| percent | 进度比例 | number | - |
-
-### Bar
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| title | 图表标题 | ReactNode\|string | - |
-| color | 图表颜色 | string | `rgba(24, 144, 255, 0.85)` |
-| padding | 图表内部间距 | [array](https://github.com/alibaba/BizCharts/blob/master/doc/api/chart.md#7padding-object--number--array-) | `'auto'` |
-| height | 图表高度 | number | - |
-| data | 数据 | array<{x, y}> | - |
-| autoLabel | 在宽度不足时，自动隐藏 x 轴的 label | boolean | `true` |
-
-### Pie
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| animate | 是否显示动画 | boolean | true |
-| color | 图表颜色 | string | `rgba(24, 144, 255, 0.85)` |
-| height | 图表高度 | number | - |
-| hasLegend | 是否显示 legend | boolean | `false` |
-| padding | 图表内部间距 | [array](https://github.com/alibaba/BizCharts/blob/master/doc/api/chart.md#7padding-object--number--array-) | `'auto'` |
-| percent | 占比 | number | - |
-| tooltip | 是否显示 tooltip | boolean | true |
-| valueFormat | 显示值的格式化函数 | function | - |
-| title | 图表标题 | ReactNode\|string | - |
-| subTitle | 图表子标题 | ReactNode\|string | - |
-| total | 图标中央的总数 | string | function | - |
-
-### Radar
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| title | 图表标题 | ReactNode\|string | - |
-| height | 图表高度 | number | - |
-| hasLegend | 是否显示 legend | boolean | `false` |
-| padding | 图表内部间距 | [array](https://github.com/alibaba/BizCharts/blob/master/doc/api/chart.md#7padding-object--number--array-) | `'auto'` |
-| data | 图标数据 | array<{name,label,value}> | - |
-
-### Gauge
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| title | 图表标题 | ReactNode\|string | - |
-| height | 图表高度 | number | - |
-| color | 图表颜色 | string | `#2F9CFF` |
-| bgColor | 图表背景颜色 | string | `#F0F2F5` |
-| percent | 进度比例 | number | - |
-
-### WaterWave
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| title | 图表标题 | ReactNode\|string | - |
-| height | 图表高度 | number | - |
-| color | 图表颜色 | string | `#1890FF` |
-| percent | 进度比例 | number | - |
-
-### TagCloud
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| data | 标题 | Array | - |
-| height | 高度值 | number | - |
-
-### TimelineChart
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| data | 标题 | Array | - |
-| titleMap | 指标别名 | Object{y1: '客流量', y2: '支付笔数'} | - |
-| height | 高度值 | number | 400 |
-
-### Field
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| label | 标题 | ReactNode\|string | - |
-| value | 值 | ReactNode\|string | - |
diff --git a/admin-web/src/components/CountDown/demo/simple.md b/admin-web/src/components/CountDown/demo/simple.md
deleted file mode 100644
index e42cbf1d9..000000000
--- a/admin-web/src/components/CountDown/demo/simple.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-order: 0
-title:
- zh-CN: 基本
- en-US: Basic
----
-
-## zh-CN
-
-简单的倒计时组件使用。
-
-## en-US
-
-The simplest usage.
-
-````jsx
-import CountDown from 'ant-design-pro/lib/CountDown';
-
-const targetTime = new Date().getTime() + 3900000;
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/CountDown/index.d.ts b/admin-web/src/components/CountDown/index.d.ts
deleted file mode 100644
index d39a2e951..000000000
--- a/admin-web/src/components/CountDown/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as React from 'react';
-export interface ICountDownProps {
- format?: (time: number) => void;
- target: Date | number;
- onEnd?: () => void;
- style?: React.CSSProperties;
-}
-
-export default class CountDown extends React.Component {}
diff --git a/admin-web/src/components/CountDown/index.en-US.md b/admin-web/src/components/CountDown/index.en-US.md
deleted file mode 100644
index 7b452406b..000000000
--- a/admin-web/src/components/CountDown/index.en-US.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: CountDown
-cols: 1
-order: 3
----
-
-Simple CountDown Component.
-
-## API
-
-| Property | Description | Type | Default |
-|----------|------------------------------------------|-------------|-------|
-| format | Formatter of time | Function(time) | |
-| target | Target time | Date | - |
-| onEnd | Countdown to the end callback | funtion | -|
diff --git a/admin-web/src/components/CountDown/index.js b/admin-web/src/components/CountDown/index.js
deleted file mode 100644
index 7565bd82d..000000000
--- a/admin-web/src/components/CountDown/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React, { Component } from 'react';
-
-function fixedZero(val) {
- return val * 1 < 10 ? `0${val}` : val;
-}
-const initTime = props => {
- let lastTime = 0;
- let targetTime = 0;
- try {
- if (Object.prototype.toString.call(props.target) === '[object Date]') {
- targetTime = props.target.getTime();
- } else {
- targetTime = new Date(props.target).getTime();
- }
- } catch (e) {
- throw new Error('invalid target prop', e);
- }
-
- lastTime = targetTime - new Date().getTime();
- return {
- lastTime: lastTime < 0 ? 0 : lastTime,
- };
-};
-
-class CountDown extends Component {
- timer = 0;
-
- interval = 1000;
-
- constructor(props) {
- super(props);
- const { lastTime } = initTime(props);
- this.state = {
- lastTime,
- };
- }
-
- static getDerivedStateFromProps(nextProps, preState) {
- const { lastTime } = initTime(nextProps);
- if (preState.lastTime !== lastTime) {
- return {
- lastTime,
- };
- }
- return null;
- }
-
- componentDidMount() {
- this.tick();
- }
-
- componentDidUpdate(prevProps) {
- const { target } = this.props;
- if (target !== prevProps.target) {
- clearTimeout(this.timer);
- this.tick();
- }
- }
-
- componentWillUnmount() {
- clearTimeout(this.timer);
- }
-
- // defaultFormat = time => (
- // {moment(time).format('hh:mm:ss')}
- // );
- defaultFormat = time => {
- const hours = 60 * 60 * 1000;
- const minutes = 60 * 1000;
-
- const h = Math.floor(time / hours);
- const m = Math.floor((time - h * hours) / minutes);
- const s = Math.floor((time - h * hours - m * minutes) / 1000);
- return (
-
- {fixedZero(h)}:{fixedZero(m)}:{fixedZero(s)}
-
- );
- };
-
- tick = () => {
- const { onEnd } = this.props;
- let { lastTime } = this.state;
-
- this.timer = setTimeout(() => {
- if (lastTime < this.interval) {
- clearTimeout(this.timer);
- this.setState(
- {
- lastTime: 0,
- },
- () => {
- if (onEnd) {
- onEnd();
- }
- }
- );
- } else {
- lastTime -= this.interval;
- this.setState(
- {
- lastTime,
- },
- () => {
- this.tick();
- }
- );
- }
- }, this.interval);
- };
-
- render() {
- const { format = this.defaultFormat, onEnd, ...rest } = this.props;
- const { lastTime } = this.state;
- const result = format(lastTime);
-
- return {result};
- }
-}
-
-export default CountDown;
diff --git a/admin-web/src/components/CountDown/index.zh-CN.md b/admin-web/src/components/CountDown/index.zh-CN.md
deleted file mode 100644
index 7e00ba1da..000000000
--- a/admin-web/src/components/CountDown/index.zh-CN.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: CountDown
-subtitle: 倒计时
-cols: 1
-order: 3
----
-
-倒计时组件。
-
-## API
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| format | 时间格式化显示 | Function(time) | |
-| target | 目标时间 | Date | - |
-| onEnd | 倒计时结束回调 | funtion | -|
diff --git a/admin-web/src/components/DescriptionList/Description.d.ts b/admin-web/src/components/DescriptionList/Description.d.ts
deleted file mode 100644
index 2a17be374..000000000
--- a/admin-web/src/components/DescriptionList/Description.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as React from 'react';
-
-export default class Description extends React.Component<
- {
- term: React.ReactNode;
- style?: React.CSSProperties;
- },
- any
-> {}
diff --git a/admin-web/src/components/DescriptionList/Description.js b/admin-web/src/components/DescriptionList/Description.js
deleted file mode 100644
index fce9fd3cb..000000000
--- a/admin-web/src/components/DescriptionList/Description.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Col } from 'antd';
-import styles from './index.less';
-import responsive from './responsive';
-
-const Description = ({ term, column, children, ...restProps }) => (
-
- {term && {term}
}
- {children !== null && children !== undefined && {children}
}
-
-);
-
-Description.defaultProps = {
- term: '',
-};
-
-Description.propTypes = {
- term: PropTypes.node,
-};
-
-export default Description;
diff --git a/admin-web/src/components/DescriptionList/DescriptionList.js b/admin-web/src/components/DescriptionList/DescriptionList.js
deleted file mode 100644
index 84bdbd79d..000000000
--- a/admin-web/src/components/DescriptionList/DescriptionList.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Row } from 'antd';
-import styles from './index.less';
-
-const DescriptionList = ({
- className,
- title,
- col = 3,
- layout = 'horizontal',
- gutter = 32,
- children,
- size,
- ...restProps
-}) => {
- const clsString = classNames(styles.descriptionList, styles[layout], className, {
- [styles.small]: size === 'small',
- [styles.large]: size === 'large',
- });
- const column = col > 4 ? 4 : col;
- return (
-
- {title ?
{title}
: null}
-
- {React.Children.map(children, child =>
- child ? React.cloneElement(child, { column }) : child
- )}
-
-
- {editable ? (
-
-
-
-
- ) : (
-
- {value || ' '}
-
-
- )}
-
- {links.map(link =>
- createElement(
- linkElement,
- {
- key: `linkGroup-item-${link.id || link.title}`,
- to: link.href,
- href: link.href,
- },
- link.title
- )
- )}
- {
-
- }
-
- );
- }
-}
-
-export default EditableLinkGroup;
diff --git a/admin-web/src/components/EditableLinkGroup/index.less b/admin-web/src/components/EditableLinkGroup/index.less
deleted file mode 100644
index ba53315d9..000000000
--- a/admin-web/src/components/EditableLinkGroup/index.less
+++ /dev/null
@@ -1,16 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.linkGroup {
- padding: 20px 0 8px 24px;
- font-size: 0;
- & > a {
- display: inline-block;
- width: 25%;
- margin-bottom: 13px;
- color: @text-color;
- font-size: @font-size-base;
- &:hover {
- color: @primary-color;
- }
- }
-}
diff --git a/admin-web/src/components/Editor/HtmlEditor.js b/admin-web/src/components/Editor/HtmlEditor.js
deleted file mode 100644
index 7cd8d1611..000000000
--- a/admin-web/src/components/Editor/HtmlEditor.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from "react";
-
-import 'braft-editor/dist/index.css'
-import BraftEditor from 'braft-editor'
-import { ContentUtils } from 'braft-utils'
-import { ImageUtils } from 'braft-finder'
-
-import {fileGetQiniuToken} from "../../services/admin";
-import uuid from "js-uuid";
-import * as qiniu from "qiniu-js";
-import {Icon, Upload} from "antd";
-
-class HtmlEditor extends React.Component {
-
- state = {
- editorState: BraftEditor.createEditorState(null),
- };
-
- handleChange = (editorState) => {
- this.setState({editorState})
- };
-
- uploadHandler = async (param) => {
- if (!param.file) {
- return false
- }
- debugger;
- const tokenResult = await fileGetQiniuToken();
- if (tokenResult.code !== 0) {
- alert('获得七牛上传 Token 失败');
- return false;
- }
- let token = tokenResult.data;
- let that = this;
- const reader = new FileReader();
- const file = param.file;
- reader.readAsArrayBuffer(file);
- let fileData = null;
- reader.onload = (e) => {
- let key = uuid.v4(); // TODO 芋艿，可能后面要优化。MD5？
- let observable = qiniu.upload(file, key, token); // TODO 芋艿，最后后面去掉 qiniu 的库依赖，直接 http 请求，这样更轻量
- observable.subscribe(function () {
- // next
- }, function (e) {
- // error
- // TODO 芋艿，后续补充
- // debugger;
- }, function (response) {
- // complete
- that.setState({
- editorState: ContentUtils.insertMedias(that.state.editorState, [{
- type: 'IMAGE',
- url: 'http://static.shop.iocoder.cn/' + response.key,
- }])
- })
- });
- }
- };
-
- getHtml() {
- return this.state.editorState.toHTML();
- }
-
- setHtml = (html) => {
- this.setState({
- editorState: BraftEditor.createEditorState(html),
- })
- };
-
- isEmpty = () => {
- return this.state.editorState.isEmpty();
- };
-
- render() {
- // const controls = ['bold', 'italic', 'underline', 'text-color', 'separator', 'link', 'separator'];
- const extendControls = [
- {
- key: 'antd-uploader',
- type: 'component',
- component: (
-
- {/* 这里的按钮最好加上type="button"，以避免在表单容器中触发表单提交，用Antd的Button组件则无需如此 */}
-
-
- )
- }
- ];
-
- return (
-
-
-
- )
- }
-
-}
-
-
-{/**/}
-
-//
-
-export default HtmlEditor;
diff --git a/admin-web/src/components/Ellipsis/demo/line.md b/admin-web/src/components/Ellipsis/demo/line.md
deleted file mode 100644
index bc31170dc..000000000
--- a/admin-web/src/components/Ellipsis/demo/line.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-order: 1
-title:
- zh-CN: 按照行数省略
- en-US: Truncate according to the number of rows
----
-
-## zh-CN
-
-通过设置 `lines` 属性指定最大行数，如果超过这个行数的文本会自动截取。但是在这种模式下所有 `children` 将会被转换成纯文本。
-
-并且注意在这种模式下，外容器需要有指定的宽度（或设置自身宽度）。
-
-## en-US
-
-`lines` attribute specifies the maximum number of rows where the text will automatically be truncated when exceeded. In this mode, all children will be converted to plain text.
-
-Also note that, in this mode, the outer container needs to have a specified width (or set its own width).
-
-
-````jsx
-import Ellipsis from 'ant-design-pro/lib/Ellipsis';
-
-const article = There were injuries alleged in three cases in 2015, and a fourth incident in September, according to the safety recall report. After meeting with US regulators in October, the firm decided to issue a voluntary recall.
;
-
-ReactDOM.render(
-
- {article}
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Ellipsis/demo/number.md b/admin-web/src/components/Ellipsis/demo/number.md
deleted file mode 100644
index 0bc1a0ff7..000000000
--- a/admin-web/src/components/Ellipsis/demo/number.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-order: 0
-title:
- zh-CN: 按照字符数省略
- en-US: Truncate according to the number of character
----
-
-## zh-CN
-
-通过设置 `length` 属性指定文本最长长度，如果超过这个长度会自动截取。
-
-## en-US
-
-`length` attribute specifies the maximum length where the text will automatically be truncated when exceeded.
-
-````jsx
-import Ellipsis from 'ant-design-pro/lib/Ellipsis';
-
-const article = 'There were injuries alleged in three cases in 2015, and a fourth incident in September, according to the safety recall report. After meeting with US regulators in October, the firm decided to issue a voluntary recall.';
-
-ReactDOM.render(
-
- {article}
-
Show Tooltip
- {article}
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Ellipsis/index.d.ts b/admin-web/src/components/Ellipsis/index.d.ts
deleted file mode 100644
index 37d508d77..000000000
--- a/admin-web/src/components/Ellipsis/index.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from 'react';
-import { TooltipProps } from 'antd/lib/tooltip';
-
-export interface IEllipsisTooltipProps extends TooltipProps {
- title?: undefined;
- overlayStyle?: undefined;
-}
-
-export interface IEllipsisProps {
- tooltip?: boolean | IEllipsisTooltipProps;
- length?: number;
- lines?: number;
- style?: React.CSSProperties;
- className?: string;
- fullWidthRecognition?: boolean;
-}
-
-export function getStrFullLength(str: string): number;
-export function cutStrByFullLength(str: string, maxLength: number): string;
-
-export default class Ellipsis extends React.Component {}
diff --git a/admin-web/src/components/Ellipsis/index.en-US.md b/admin-web/src/components/Ellipsis/index.en-US.md
deleted file mode 100644
index 15139cc9d..000000000
--- a/admin-web/src/components/Ellipsis/index.en-US.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Ellipsis
-cols: 1
-order: 10
----
-
-When the text is too long, the Ellipsis automatically shortens it according to its length or the maximum number of lines.
-
-## API
-
-Property | Description | Type | Default
-----|------|-----|------
-tooltip | tooltip for showing the full text content when hovering over | boolean | -
-length | maximum number of characters in the text before being truncated | number | -
-lines | maximum number of rows in the text before being truncated | number | `1`
-fullWidthRecognition | whether consider full-width character length as 2 when calculate string length | boolean | -
diff --git a/admin-web/src/components/Ellipsis/index.js b/admin-web/src/components/Ellipsis/index.js
deleted file mode 100644
index de700b74b..000000000
--- a/admin-web/src/components/Ellipsis/index.js
+++ /dev/null
@@ -1,270 +0,0 @@
-import React, { Component } from 'react';
-import { Tooltip } from 'antd';
-import classNames from 'classnames';
-import styles from './index.less';
-
-/* eslint react/no-did-mount-set-state: 0 */
-/* eslint no-param-reassign: 0 */
-
-const isSupportLineClamp = document.body.style.webkitLineClamp !== undefined;
-
-const TooltipOverlayStyle = {
- overflowWrap: 'break-word',
- wordWrap: 'break-word',
-};
-
-export const getStrFullLength = (str = '') =>
- str.split('').reduce((pre, cur) => {
- const charCode = cur.charCodeAt(0);
- if (charCode >= 0 && charCode <= 128) {
- return pre + 1;
- }
- return pre + 2;
- }, 0);
-
-export const cutStrByFullLength = (str = '', maxLength) => {
- let showLength = 0;
- return str.split('').reduce((pre, cur) => {
- const charCode = cur.charCodeAt(0);
- if (charCode >= 0 && charCode <= 128) {
- showLength += 1;
- } else {
- showLength += 2;
- }
- if (showLength <= maxLength) {
- return pre + cur;
- }
- return pre;
- }, '');
-};
-
-const getTooltip = ({ tooltip, overlayStyle, title, children }) => {
- if (tooltip) {
- const props = tooltip === true ? { overlayStyle, title } : { ...tooltip, overlayStyle, title };
- return {children};
- }
- return children;
-};
-
-const EllipsisText = ({ text, length, tooltip, fullWidthRecognition, ...other }) => {
- if (typeof text !== 'string') {
- throw new Error('Ellipsis children must be string.');
- }
- const textLength = fullWidthRecognition ? getStrFullLength(text) : text.length;
- if (textLength <= length || length < 0) {
- return {text};
- }
- const tail = '...';
- let displayText;
- if (length - tail.length <= 0) {
- displayText = '';
- } else {
- displayText = fullWidthRecognition ? cutStrByFullLength(text, length) : text.slice(0, length);
- }
-
- const spanAttrs = tooltip ? {} : { ...other };
- return getTooltip({
- tooltip,
- overlayStyle: TooltipOverlayStyle,
- title: text,
- children: (
-
- {displayText}
- {tail}
-
- ),
- });
-};
-
-export default class Ellipsis extends Component {
- state = {
- text: '',
- targetCount: 0,
- };
-
- componentDidMount() {
- if (this.node) {
- this.computeLine();
- }
- }
-
- componentDidUpdate(perProps) {
- const { lines } = this.props;
- if (lines !== perProps.lines) {
- this.computeLine();
- }
- }
-
- computeLine = () => {
- const { lines } = this.props;
- if (lines && !isSupportLineClamp) {
- const text = this.shadowChildren.innerText || this.shadowChildren.textContent;
- const lineHeight = parseInt(getComputedStyle(this.root).lineHeight, 10);
- const targetHeight = lines * lineHeight;
- this.content.style.height = `${targetHeight}px`;
- const totalHeight = this.shadowChildren.offsetHeight;
- const shadowNode = this.shadow.firstChild;
-
- if (totalHeight <= targetHeight) {
- this.setState({
- text,
- targetCount: text.length,
- });
- return;
- }
-
- // bisection
- const len = text.length;
- const mid = Math.ceil(len / 2);
-
- const count = this.bisection(targetHeight, mid, 0, len, text, shadowNode);
-
- this.setState({
- text,
- targetCount: count,
- });
- }
- };
-
- bisection = (th, m, b, e, text, shadowNode) => {
- const suffix = '...';
- let mid = m;
- let end = e;
- let begin = b;
- shadowNode.innerHTML = text.substring(0, mid) + suffix;
- let sh = shadowNode.offsetHeight;
-
- if (sh <= th) {
- shadowNode.innerHTML = text.substring(0, mid + 1) + suffix;
- sh = shadowNode.offsetHeight;
- if (sh > th || mid === begin) {
- return mid;
- }
- begin = mid;
- if (end - begin === 1) {
- mid = 1 + begin;
- } else {
- mid = Math.floor((end - begin) / 2) + begin;
- }
- return this.bisection(th, mid, begin, end, text, shadowNode);
- }
- if (mid - 1 < 0) {
- return mid;
- }
- shadowNode.innerHTML = text.substring(0, mid - 1) + suffix;
- sh = shadowNode.offsetHeight;
- if (sh <= th) {
- return mid - 1;
- }
- end = mid;
- mid = Math.floor((end - begin) / 2) + begin;
- return this.bisection(th, mid, begin, end, text, shadowNode);
- };
-
- handleRoot = n => {
- this.root = n;
- };
-
- handleContent = n => {
- this.content = n;
- };
-
- handleNode = n => {
- this.node = n;
- };
-
- handleShadow = n => {
- this.shadow = n;
- };
-
- handleShadowChildren = n => {
- this.shadowChildren = n;
- };
-
- render() {
- const { text, targetCount } = this.state;
- const {
- children,
- lines,
- length,
- className,
- tooltip,
- fullWidthRecognition,
- ...restProps
- } = this.props;
-
- const cls = classNames(styles.ellipsis, className, {
- [styles.lines]: lines && !isSupportLineClamp,
- [styles.lineClamp]: lines && isSupportLineClamp,
- });
-
- if (!lines && !length) {
- return (
-
- {children}
-
- );
- }
-
- // length
- if (!lines) {
- return (
-
- );
- }
-
- const id = `antd-pro-ellipsis-${`${new Date().getTime()}${Math.floor(Math.random() * 100)}`}`;
-
- // support document.body.style.webkitLineClamp
- if (isSupportLineClamp) {
- const style = `#${id}{-webkit-line-clamp:${lines};-webkit-box-orient: vertical;}`;
-
- const node = (
-
-
- {children}
-
- );
-
- return getTooltip({
- tooltip,
- overlayStyle: TooltipOverlayStyle,
- title: children,
- children: node,
- });
- }
-
- const childNode = (
-
- {targetCount > 0 && text.substring(0, targetCount)}
- {targetCount > 0 && targetCount < text.length && '...'}
-
- );
-
- return (
-
-
- {getTooltip({
- tooltip,
- overlayStyle: TooltipOverlayStyle,
- title: text,
- children: childNode,
- })}
-
- {children}
-
-
- {text}
-
-
-
-
-
-
-);
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Exception/demo/404.md b/admin-web/src/components/Exception/demo/404.md
deleted file mode 100644
index c54e99d47..000000000
--- a/admin-web/src/components/Exception/demo/404.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-order: 0
-title:
- zh-CN: 404 页面
- en-US: 404 Page
----
-
-## zh-CN
-
-404 页面。
-
-## en-US
-
-404 page.
-
-````jsx
-import Exception from 'ant-design-pro/lib/Exception';
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Exception/demo/500.md b/admin-web/src/components/Exception/demo/500.md
deleted file mode 100644
index 2336e41ed..000000000
--- a/admin-web/src/components/Exception/demo/500.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-order: 1
-title:
- zh-CN: 500 页面
- en-US: 500 Page
----
-
-## zh-CN
-
-500 页面。
-
-## en-US
-
-500 page.
-
-````jsx
-import Exception from 'ant-design-pro/lib/Exception';
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Exception/index.d.ts b/admin-web/src/components/Exception/index.d.ts
deleted file mode 100644
index a74abb1fa..000000000
--- a/admin-web/src/components/Exception/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react';
-export interface IExceptionProps {
- type?: '403' | '404' | '500';
- title?: React.ReactNode;
- desc?: React.ReactNode;
- img?: string;
- actions?: React.ReactNode;
- linkElement?: string | React.ComponentType;
- style?: React.CSSProperties;
- className?: string;
- backText?: React.ReactNode;
- redirect?: string;
-}
-
-export default class Exception extends React.Component {}
diff --git a/admin-web/src/components/Exception/index.en-US.md b/admin-web/src/components/Exception/index.en-US.md
deleted file mode 100644
index 37e7e8075..000000000
--- a/admin-web/src/components/Exception/index.en-US.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: Exception
-cols: 1
-order: 5
----
-
-Exceptions page is used to provide feedback on specific abnormal state. Usually, it contains an explanation of the error status, and provides users with suggestions or operations, to prevent users from feeling lost and confused.
-
-## API
-
-Property | Description | Type | Default
----------|-------------|------|--------
-| backText | default return button text | ReactNode | back to home |
-type | type of exception, the corresponding default `title`, `desc`, `img` will be given if set, which can be overridden by explicit setting of `title`, `desc`, `img` | Enum {'403', '404', '500'} | -
-title | title | ReactNode | -
-desc | supplementary description | ReactNode | -
-img | the url of background image | string | -
-actions | suggested operations, a default 'Home' link will show if not set | ReactNode | -
-linkElement | to specify the element of link | string\|ReactElement | 'a'
-redirect | redirect path | string | '/'
\ No newline at end of file
diff --git a/admin-web/src/components/Exception/index.js b/admin-web/src/components/Exception/index.js
deleted file mode 100644
index 2c7223cc7..000000000
--- a/admin-web/src/components/Exception/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, { createElement } from 'react';
-import classNames from 'classnames';
-import { Button } from 'antd';
-import config from './typeConfig';
-import styles from './index.less';
-
-class Exception extends React.PureComponent {
- static defaultProps = {
- backText: 'back to home',
- redirect: '/',
- };
-
- constructor(props) {
- super(props);
- this.state = {};
- }
-
- render() {
- const {
- className,
- backText,
- linkElement = 'a',
- type,
- title,
- desc,
- img,
- actions,
- redirect,
- ...rest
- } = this.props;
- const pageType = type in config ? type : '404';
- const clsString = classNames(styles.exception, className);
- return (
-
-
-
-
{title || config[pageType].title}
-
{desc || config[pageType].desc}
-
- {actions ||
- createElement(
- linkElement,
- {
- to: redirect,
- href: redirect,
- },
-
- )}
-
-
-
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
Content Content Content Content
-
-
-
-
-
Copyright 2017 蚂蚁金服体验技术部出品
;
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/GlobalFooter/index.d.ts b/admin-web/src/components/GlobalFooter/index.d.ts
deleted file mode 100644
index 3fa5c423e..000000000
--- a/admin-web/src/components/GlobalFooter/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from 'react';
-export interface IGlobalFooterProps {
- links?: Array<{
- key?: string;
- title: React.ReactNode;
- href: string;
- blankTarget?: boolean;
- }>;
- copyright?: React.ReactNode;
- style?: React.CSSProperties;
-}
-
-export default class GlobalFooter extends React.Component {}
diff --git a/admin-web/src/components/GlobalFooter/index.js b/admin-web/src/components/GlobalFooter/index.js
deleted file mode 100644
index f98f51d9e..000000000
--- a/admin-web/src/components/GlobalFooter/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import styles from './index.less';
-
-const GlobalFooter = ({ className, links, copyright }) => {
- const clsString = classNames(styles.globalFooter, className);
- return (
-
- );
-};
-
-export default GlobalFooter;
diff --git a/admin-web/src/components/GlobalFooter/index.less b/admin-web/src/components/GlobalFooter/index.less
deleted file mode 100644
index e4b3dfd47..000000000
--- a/admin-web/src/components/GlobalFooter/index.less
+++ /dev/null
@@ -1,29 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.globalFooter {
- margin: 48px 0 24px 0;
- padding: 0 16px;
- text-align: center;
-
- .links {
- margin-bottom: 8px;
-
- a {
- color: @text-color-secondary;
- transition: all 0.3s;
-
- &:not(:last-child) {
- margin-right: 40px;
- }
-
- &:hover {
- color: @text-color;
- }
- }
- }
-
- .copyright {
- color: @text-color-secondary;
- font-size: @font-size-base;
- }
-}
diff --git a/admin-web/src/components/GlobalFooter/index.md b/admin-web/src/components/GlobalFooter/index.md
deleted file mode 100644
index 96e04fee2..000000000
--- a/admin-web/src/components/GlobalFooter/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: GlobalFooter
-subtitle: 全局页脚
-cols: 1
-order: 7
----
-
-页脚属于全局导航的一部分，作为对顶部导航的补充，通过传递数据控制展示内容。
-
-## API
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-links | 链接数据 | array<{ title: ReactNode, href: string, blankTarget?: boolean }> | -
-copyright | 版权信息 | ReactNode | -
diff --git a/admin-web/src/components/GlobalHeader/RightContent.js b/admin-web/src/components/GlobalHeader/RightContent.js
deleted file mode 100644
index dad360ff0..000000000
--- a/admin-web/src/components/GlobalHeader/RightContent.js
+++ /dev/null
@@ -1,217 +0,0 @@
-import React, { PureComponent } from 'react';
-import { FormattedMessage, formatMessage } from 'umi/locale';
-import { Spin, Tag, Menu, Icon, Avatar, Tooltip } from 'antd';
-import moment from 'moment';
-import groupBy from 'lodash/groupBy';
-import NoticeIcon from '../NoticeIcon';
-import HeaderSearch from '../HeaderSearch';
-import HeaderDropdown from '../HeaderDropdown';
-import SelectLang from '../SelectLang';
-import styles from './index.less';
-
-export default class GlobalHeaderRight extends PureComponent {
- getNoticeData() {
- const { notices = [] } = this.props;
- if (notices.length === 0) {
- return {};
- }
- const newNotices = notices.map(notice => {
- const newNotice = { ...notice };
- if (newNotice.datetime) {
- newNotice.datetime = moment(notice.datetime).fromNow();
- }
- if (newNotice.id) {
- newNotice.key = newNotice.id;
- }
- if (newNotice.extra && newNotice.status) {
- const color = {
- todo: '',
- processing: 'blue',
- urgent: 'red',
- doing: 'gold',
- }[newNotice.status];
- newNotice.extra = (
-
- {newNotice.extra}
-
- );
- }
- return newNotice;
- });
- return groupBy(newNotices, 'type');
- }
-
- getUnreadData = noticeData => {
- const unreadMsg = {};
- Object.entries(noticeData).forEach(([key, value]) => {
- if (!unreadMsg[key]) {
- unreadMsg[key] = 0;
- }
- if (Array.isArray(value)) {
- unreadMsg[key] = value.filter(item => !item.read).length;
- }
- });
- return unreadMsg;
- };
-
- changeReadState = clickedItem => {
- const { id } = clickedItem;
- const { dispatch } = this.props;
- dispatch({
- type: 'global/changeNoticeReadState',
- payload: id,
- });
- };
-
- fetchMoreNotices = tabProps => {
- const { list, name } = tabProps;
- const { dispatch, notices = [] } = this.props;
- const lastItemId = notices[notices.length - 1].id;
- dispatch({
- type: 'global/fetchMoreNotices',
- payload: {
- lastItemId,
- type: name,
- offset: list.length,
- },
- });
- };
-
- render() {
- const {
- currentUser,
- fetchingMoreNotices,
- fetchingNotices,
- loadedAllNotices,
- onNoticeVisibleChange,
- onMenuClick,
- onNoticeClear,
- skeletonCount,
- theme,
- } = this.props;
- const menu = (
-
- );
- const loadMoreProps = {
- skeletonCount,
- loadedAll: loadedAllNotices,
- loading: fetchingMoreNotices,
- };
- const noticeData = this.getNoticeData();
- const unreadMsg = this.getUnreadData(noticeData);
- let className = styles.right;
- if (theme === 'dark') {
- className = `${styles.right} ${styles.dark}`;
- }
- return (
-
-
{
- console.log('input', value); // eslint-disable-line
- }}
- onPressEnter={value => {
- console.log('enter', value); // eslint-disable-line
- }}
- />
-
-
-
-
-
- {
- console.log(item, tabProps); // eslint-disable-line
- this.changeReadState(item, tabProps);
- }}
- locale={{
- emptyText: formatMessage({ id: 'component.noticeIcon.empty' }),
- clear: formatMessage({ id: 'component.noticeIcon.clear' }),
- loadedAll: formatMessage({ id: 'component.noticeIcon.loaded' }),
- loadMore: formatMessage({ id: 'component.noticeIcon.loading-more' }),
- }}
- onClear={onNoticeClear}
- onLoadMore={this.fetchMoreNotices}
- onPopupVisibleChange={onNoticeVisibleChange}
- loading={fetchingNotices}
- clearClose
- >
-
-
-
-
- {currentUser.name ? (
-
-
-
- {currentUser.name}
-
-
- ) : (
-
- )}
-
-
- {isMobile && (
-
-
-
- )}
-
-
-
-
-
- {
- console.log('input', value); // eslint-disable-line
- }}
- onPressEnter={(value) => {
- console.log('enter', value); // eslint-disable-line
- }}
- />
-
-, mountNode);
-````
diff --git a/admin-web/src/components/HeaderSearch/index.d.ts b/admin-web/src/components/HeaderSearch/index.d.ts
deleted file mode 100644
index d78fde471..000000000
--- a/admin-web/src/components/HeaderSearch/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react';
-export interface IHeaderSearchProps {
- placeholder?: string;
- dataSource?: string[];
- defaultOpen?: boolean;
- open?: boolean;
- onSearch?: (value: string) => void;
- onChange?: (value: string) => void;
- onVisibleChange?: (visible: boolean) => void;
- onPressEnter?: (value: string) => void;
- style?: React.CSSProperties;
- className?: string;
-}
-
-export default class HeaderSearch extends React.Component {}
diff --git a/admin-web/src/components/HeaderSearch/index.en-US.md b/admin-web/src/components/HeaderSearch/index.en-US.md
deleted file mode 100644
index 9f2b5e8a4..000000000
--- a/admin-web/src/components/HeaderSearch/index.en-US.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: HeaderSearch
-subtitle:
-cols: 1
-order: 8
----
-
-Usually placed as an entry to the global search, placed on the right side of the navigation toolbar.
-
-## API
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-placeholder | placeholder text | string | -
-dataSource | current list of prompts | string[] | -
-onSearch | Called when searching items. | function(value) | -
-onChange | Called when select an option or input value change, or value of input is changed | function(value) | -
-onSelect | Called when a option is selected. param is option's value and option instance. | function(value) | -
-onPressEnter | Callback when pressing Enter | function(value) | -
-onVisibleChange | Show or hide the callback of the text box | function(value) |-
-defaultOpen | The input box is displayed for the first time. | boolean | false
-open | The input box is displayed | boolean |false
\ No newline at end of file
diff --git a/admin-web/src/components/HeaderSearch/index.js b/admin-web/src/components/HeaderSearch/index.js
deleted file mode 100644
index 04f8b38ec..000000000
--- a/admin-web/src/components/HeaderSearch/index.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Input, Icon, AutoComplete } from 'antd';
-import classNames from 'classnames';
-import Debounce from 'lodash-decorators/debounce';
-import Bind from 'lodash-decorators/bind';
-import styles from './index.less';
-
-export default class HeaderSearch extends PureComponent {
- static propTypes = {
- className: PropTypes.string,
- placeholder: PropTypes.string,
- onSearch: PropTypes.func,
- onChange: PropTypes.func,
- onPressEnter: PropTypes.func,
- defaultActiveFirstOption: PropTypes.bool,
- dataSource: PropTypes.array,
- defaultOpen: PropTypes.bool,
- onVisibleChange: PropTypes.func,
- };
-
- static defaultProps = {
- defaultActiveFirstOption: false,
- onPressEnter: () => {},
- onSearch: () => {},
- onChange: () => {},
- className: '',
- placeholder: '',
- dataSource: [],
- defaultOpen: false,
- onVisibleChange: () => {},
- };
-
- static getDerivedStateFromProps(props) {
- if ('open' in props) {
- return {
- searchMode: props.open,
- };
- }
- return null;
- }
-
- constructor(props) {
- super(props);
- this.state = {
- searchMode: props.defaultOpen,
- value: '',
- };
- }
-
- componentWillUnmount() {
- clearTimeout(this.timeout);
- }
-
- onKeyDown = e => {
- if (e.key === 'Enter') {
- const { onPressEnter } = this.props;
- const { value } = this.state;
- this.timeout = setTimeout(() => {
- onPressEnter(value); // Fix duplicate onPressEnter
- }, 0);
- }
- };
-
- onChange = value => {
- const { onSearch, onChange } = this.props;
- this.setState({ value });
- if (onSearch) {
- onSearch(value);
- }
- if (onChange) {
- onChange(value);
- }
- };
-
- enterSearchMode = () => {
- const { onVisibleChange } = this.props;
- onVisibleChange(true);
- this.setState({ searchMode: true }, () => {
- const { searchMode } = this.state;
- if (searchMode) {
- this.input.focus();
- }
- });
- };
-
- leaveSearchMode = () => {
- this.setState({
- searchMode: false,
- value: '',
- });
- };
-
- // NOTE: 不能小于500，如果长按某键，第一次触发auto repeat的间隔是500ms，小于500会导致触发2次
- @Bind()
- @Debounce(500, {
- leading: true,
- trailing: false,
- })
- debouncePressEnter() {
- const { onPressEnter } = this.props;
- const { value } = this.state;
- onPressEnter(value);
- }
-
- render() {
- const { className, placeholder, open, ...restProps } = this.props;
- const { searchMode, value } = this.state;
- delete restProps.defaultOpen; // for rc-select not affected
- const inputClass = classNames(styles.input, {
- [styles.show]: searchMode,
- });
- return (
- {
- if (propertyName === 'width' && !searchMode) {
- const { onVisibleChange } = this.props;
- onVisibleChange(searchMode);
- }
- }}
- >
-
-
- {
- this.input = node;
- }}
- aria-label={placeholder}
- placeholder={placeholder}
- onKeyDown={this.onKeyDown}
- onBlur={this.leaveSearchMode}
- />
-
-
- );
- }
-}
diff --git a/admin-web/src/components/HeaderSearch/index.less b/admin-web/src/components/HeaderSearch/index.less
deleted file mode 100644
index 88fadecdc..000000000
--- a/admin-web/src/components/HeaderSearch/index.less
+++ /dev/null
@@ -1,32 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.headerSearch {
- :global(.anticon-search) {
- font-size: 16px;
- cursor: pointer;
- }
- .input {
- width: 0;
- background: transparent;
- border-radius: 0;
- transition: width 0.3s, margin-left 0.3s;
- :global(.ant-select-selection) {
- background: transparent;
- }
- input {
- padding-right: 0;
- padding-left: 0;
- border: 0;
- box-shadow: none !important;
- }
- &,
- &:hover,
- &:focus {
- border-bottom: 1px solid @border-color-base;
- }
- &.show {
- width: 210px;
- margin-left: 8px;
- }
- }
-}
diff --git a/admin-web/src/components/HeaderSearch/index.zh-CN.md b/admin-web/src/components/HeaderSearch/index.zh-CN.md
deleted file mode 100644
index 83e74887f..000000000
--- a/admin-web/src/components/HeaderSearch/index.zh-CN.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: HeaderSearch
-subtitle: 顶部搜索框
-cols: 1
-order: 8
----
-
-通常作为全局搜索的入口，放置在导航工具条右侧。
-
-## API
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-placeholder | 占位文字 | string | -
-dataSource | 当前提示内容列表 | string[] | -
-onSearch | 搜索补全项的时候调用 | function(value) | -
-onChange | 选中 option，或 input 的 value 变化时，调用此函数 | function(value) | -
-onSelect | 被选中时调用，参数为选中项的 value 值 | function(value) | -
-onPressEnter | 按下回车时的回调 | function(value) | -
-onVisibleChange | 显示或隐藏文本框的回调 | function(value) |-
-defaultOpen | 输入框首次显示是否显示 | boolean | false
-open | 控制输入框是否显示 | boolean |false
\ No newline at end of file
diff --git a/admin-web/src/components/IconFont/index.js b/admin-web/src/components/IconFont/index.js
deleted file mode 100644
index 0b99dec3a..000000000
--- a/admin-web/src/components/IconFont/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Icon } from 'antd';
-import { iconfontUrl as scriptUrl } from '../../defaultSettings';
-
-// 使用：
-// import IconFont from '@/components/IconFont';
-//
-export default Icon.createFromIconfontCN({ scriptUrl });
diff --git a/admin-web/src/components/Image/PicturesWall.js b/admin-web/src/components/Image/PicturesWall.js
deleted file mode 100644
index 2e27ec07f..000000000
--- a/admin-web/src/components/Image/PicturesWall.js
+++ /dev/null
@@ -1,209 +0,0 @@
-import React from "react";
-import {fileGetQiniuToken} from "../../services/admin";
-import uuid from "js-uuid";
-import * as qiniu from "qiniu-js";
-import {Icon, Modal, Upload} from "antd";
-
-import styles from './PicturesWall.less';
-
-/**
- * 照片墙，带有上传图片到七牛。
- */
-class PicturesWall extends React.Component {
- state = {
- token: undefined, // 七牛 token
-
-
- previewVisible: false,
- previewImage: '',
-
- fileList: [
- // { // 目前图片
- // uid: -1,
- // name: 'xxx.png',
- // status: 'done',
- // url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
- // }
- ],
- };
-
- componentDidMount() {
- if (this.props.urls) {
- this.setUrls(this.props.urls);
- }
- }
-
- handleCancel = () => this.setState({ previewVisible: false })
-
- handlePreview = (file) => {
- this.setState({
- previewImage: file.url || file.thumbUrl,
- previewVisible: true,
- });
- }
-
- beforeUpload = async () => {
- const tokenResult = await fileGetQiniuToken();
- if (tokenResult.code !== 0) {
- alert('获得七牛上传 Token 失败');
- return false;
- }
- this.setState({
- token: tokenResult.data,
- });
- return true;
- };
-
- customRequest = ({action,
- file,
- headers,
- onError,
- onProgress,
- onSuccess,
- withCredentials,}) => {
- // fs.readFile(path, function(err, data) {
- // if (err) return;
- // let md5Value= crypto.createHash('md5').update(data, 'utf8').digest('hex');
- // let observable = qiniu.upload(file, md5Value, this.state.token);
- // observable.subscribe(function () {
- // // next
- // }, function () {
- // // error
- // }, function (response) {
- // // complete
- // debugger;
- // onSuccess(response, file);
- // });
- // });
-
- // 使用 FileReader 将上传的文件转换成二进制流，满足 'application/octet-stream' 格式的要求
- const reader = new FileReader();
- reader.readAsArrayBuffer(file);
- let fileData = null;
- reader.onload = (e) => {
- // 在文件读取结束后执行的操作
- fileData = e.target.result;
- // debugger;
- // let md5Value= crypto.createHash('md5').update(fileData, 'utf8').digest('hex');
- // 上传文件
- // fileUploadQiniu(fileData);
- // debugger;
- // 使用 axios 进行文件上传的请求
- // axios.put(action, fileData, {
- // withCredentials,
- // headers,
- // onUploadProgress: ({ total, loaded }) => {
- // // 进行上传进度输出，更加直观
- // onProgress({ percent: Math.round(loaded / total * 100).toFixed(2) }, file);
- // },
- // }).then(response => {
- // onSuccess(response, file);
- // })
- // .catch(onError);
- let key = uuid.v4(); // TODO 芋艿，可能后面要优化。MD5？
- let observable = qiniu.upload(file, key, this.state.token); // TODO 芋艿，最后后面去掉 qiniu 的库依赖，直接 http 请求，这样更轻量
- observable.subscribe(function () {
- // next
- }, function () {
- // error
- // TODO 芋艿，后续补充
- debugger;
- }, function (response) {
- debugger;
- // complete
- // debugger;
- response.url = 'http://static.shop.iocoder.cn/' + response.key; // 需要设置，用于后续 onSuccess ，合并到 file 中，从而设置到 fileList
- onSuccess(response, file);
- });
- };
- return {
- abort() {
- console.log('upload progress is aborted.');
- },
- };
- };
-
- handleChange = ({ file, fileList }) => {
- if (file.response && file.response.url) {
- // debugger
- // file.url =
- for (let i in fileList) {
- if (fileList[i].uid === file.uid) {
- fileList[i].url = file.response.url;
- }
- }
- }
- this.setState({ fileList });
- }
-
- getUrls = () => {
- let urls = [];
- for (let i in this.state.fileList) {
- urls.push(this.state.fileList[i].url);
- }
- return urls;
- };
-
- getUrl = () => {
- let urls = this.getUrls();
- if (urls && urls.length > 0) {
- return urls[0];
- }
- return undefined;
- };
-
- setUrls = (urls) => {
- // let urls = this.props.urls;
- if (urls) {
- let fileList = [];
- for (let i in urls) {
- let url = urls[i];
- fileList.push({
- uid: -i,
- name: url,
- status: 'done',
- url,
- });
- }
- this.setState({
- fileList: fileList,
- })
- }
- };
-
- render() {
- const { previewVisible, previewImage, fileList } = this.state;
- const uploadButton = (
-
- );
- return (
-
-
- {fileList.length >= this.props.maxLength ? null : uploadButton}
-
-
- 
-
-
-
- {getFieldDecorator(name, options)()}
-
-
-
-
-
-
- );
- }
- return (
-
- {getFieldDecorator(name, options)()}
-
- );
- }
-}
-
-const LoginItem = {};
-Object.keys(ItemMap).forEach(key => {
- const item = ItemMap[key];
- LoginItem[key] = props => (
-
- {context => (
-
- )}
-
- );
-});
-
-export default LoginItem;
diff --git a/admin-web/src/components/Login/LoginSubmit.js b/admin-web/src/components/Login/LoginSubmit.js
deleted file mode 100644
index 4aebabf89..000000000
--- a/admin-web/src/components/Login/LoginSubmit.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Button, Form } from 'antd';
-import styles from './index.less';
-
-const FormItem = Form.Item;
-
-const LoginSubmit = ({ className, ...rest }) => {
- const clsString = classNames(styles.submit, className);
- return (
-
-
-
- );
-};
-
-export default LoginSubmit;
diff --git a/admin-web/src/components/Login/LoginTab.d.ts b/admin-web/src/components/Login/LoginTab.d.ts
deleted file mode 100644
index db651f7b4..000000000
--- a/admin-web/src/components/Login/LoginTab.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import * as React from 'react';
-
-export interface ILoginTabProps {
- key?: string;
- tab?: React.ReactNode;
-}
-export default class LoginTab extends React.Component {}
diff --git a/admin-web/src/components/Login/LoginTab.js b/admin-web/src/components/Login/LoginTab.js
deleted file mode 100644
index 7c46db532..000000000
--- a/admin-web/src/components/Login/LoginTab.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { Component } from 'react';
-import { Tabs } from 'antd';
-import LoginContext from './loginContext';
-
-const { TabPane } = Tabs;
-
-const generateId = (() => {
- let i = 0;
- return (prefix = '') => {
- i += 1;
- return `${prefix}${i}`;
- };
-})();
-
-class LoginTab extends Component {
- constructor(props) {
- super(props);
- this.uniqueId = generateId('login-tab-');
- }
-
- componentDidMount() {
- const { tabUtil } = this.props;
- tabUtil.addTab(this.uniqueId);
- }
-
- render() {
- const { children } = this.props;
- return {children};
- }
-}
-
-const wrapContext = props => (
-
- {value => }
-
-);
-
-// 标志位 用来判断是不是自定义组件
-wrapContext.typeName = 'LoginTab';
-
-export default wrapContext;
diff --git a/admin-web/src/components/Login/demo/basic.md b/admin-web/src/components/Login/demo/basic.md
deleted file mode 100644
index 5fbd0ca25..000000000
--- a/admin-web/src/components/Login/demo/basic.md
+++ /dev/null
@@ -1,115 +0,0 @@
----
-order: 0
-title:
- zh-CN: 标准登录
- en-US: Standard Login
----
-
-Support login with account and mobile number.
-
-````jsx
-import Login from 'ant-design-pro/lib/Login';
-import { Alert, Checkbox } from 'antd';
-
-const { Tab, UserName, Password, Mobile, Captcha, Submit } = Login;
-
-class LoginDemo extends React.Component {
- state = {
- notice: '',
- type: 'tab2',
- autoLogin: true,
- }
- onSubmit = (err, values) => {
- console.log('value collected ->', { ...values, autoLogin: this.state.autoLogin });
- if (this.state.type === 'tab1') {
- this.setState({
- notice: '',
- }, () => {
- if (!err && (values.username !== 'admin' || values.password !== '888888')) {
- setTimeout(() => {
- this.setState({
- notice: 'The combination of username and password is incorrect!',
- });
- }, 500);
- }
- });
- }
- }
- onTabChange = (key) => {
- this.setState({
- type: key,
- });
- }
- changeAutoLogin = (e) => {
- this.setState({
- autoLogin: e.target.checked,
- });
- }
- render() {
- return (
-
-
- {
- this.state.notice &&
-
- }
-
-
-
-
-
- console.log('Get captcha!')} name="captcha" />
-
-
- Login
-
- Other login methods
-
-
-
-
Register
-
-
-
-
- );
- }
-}
-
-Login.Tab = LoginTab;
-Login.Submit = LoginSubmit;
-Object.keys(LoginItem).forEach(item => {
- Login[item] = LoginItem[item];
-});
-
-export default Form.create()(Login);
diff --git a/admin-web/src/components/Login/index.less b/admin-web/src/components/Login/index.less
deleted file mode 100644
index 242e06756..000000000
--- a/admin-web/src/components/Login/index.less
+++ /dev/null
@@ -1,53 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.login {
- :global {
- .ant-tabs .ant-tabs-bar {
- margin-bottom: 24px;
- text-align: center;
- border-bottom: 0;
- }
-
- .ant-form-item {
- margin: 0 2px 24px;
- }
- }
-
- .getCaptcha {
- display: block;
- width: 100%;
- }
-
- .icon {
- margin-left: 16px;
- color: rgba(0, 0, 0, 0.2);
- font-size: 24px;
- vertical-align: middle;
- cursor: pointer;
- transition: color 0.3s;
-
- &:hover {
- color: @primary-color;
- }
- }
-
- .other {
- margin-top: 24px;
- line-height: 22px;
- text-align: left;
-
- .register {
- float: right;
- }
- }
-
- .prefixIcon {
- color: @disabled-color;
- font-size: @font-size-base;
- }
-
- .submit {
- width: 100%;
- margin-top: 24px;
- }
-}
diff --git a/admin-web/src/components/Login/index.zh-CN.md b/admin-web/src/components/Login/index.zh-CN.md
deleted file mode 100644
index a869e96c3..000000000
--- a/admin-web/src/components/Login/index.zh-CN.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: Login
-subtitle: 登录
-cols: 1
-order: 15
----
-
-支持多种登录方式切换，内置了几种常见的登录控件，可以灵活组合，也支持和自定义控件配合使用。
-
-## API
-
-### Login
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-defaultActiveKey | 默认激活 tab 面板的 key | String | -
-onTabChange | 切换页签时的回调 | (key) => void | -
-onSubmit | 点击提交时的回调 | (err, values) => void | -
-
-### Login.Tab
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-key | 对应选项卡的 key | String | -
-tab | 选项卡头显示文字 | ReactNode | -
-
-### Login.UserName
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-name | 控件标记，提交数据中同样以此为 key | String | -
-rules | 校验规则，同 Form getFieldDecorator(id, options) 中 [option.rules 的规则](getFieldDecorator(id, options)) | object[] | -
-
-除上述属性以外，Login.UserName 还支持 antd.Input 的所有属性，并且自带默认的基础配置，包括 `placeholder` `size` `prefix` 等，这些基础配置均可被覆盖。
-## Login.Password、Login.Mobile 同 Login.UserName
-
-### Login.Captcha
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-onGetCaptcha | 点击获取校验码的回调 | () => (void \| false \| Promise) | -
-countDown | 倒计时 | number |-
-buttonText | 点击获取校验码的说明文字 | ReactNode | '获取验证码'
-
-除上述属性以外，Login.Captcha 支持的属性与 Login.UserName 相同。
-
-### Login.Submit
-
-支持 antd.Button 的所有属性。
diff --git a/admin-web/src/components/Login/loginContext.js b/admin-web/src/components/Login/loginContext.js
deleted file mode 100644
index a13e6599c..000000000
--- a/admin-web/src/components/Login/loginContext.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { createContext } from 'react';
-
-const LoginContext = createContext();
-export default LoginContext;
diff --git a/admin-web/src/components/Login/map.js b/admin-web/src/components/Login/map.js
deleted file mode 100644
index dfa881998..000000000
--- a/admin-web/src/components/Login/map.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import { Icon } from 'antd';
-import styles from './index.less';
-
-export default {
- UserName: {
- props: {
- size: 'large',
- id: 'userName',
- prefix: ,
- placeholder: 'admin',
- },
- rules: [
- {
- required: true,
- message: 'Please enter username!',
- },
- ],
- },
- Password: {
- props: {
- size: 'large',
- prefix: ,
- type: 'password',
- id: 'password',
- placeholder: '888888',
- },
- rules: [
- {
- required: true,
- message: 'Please enter password!',
- },
- ],
- },
- Mobile: {
- props: {
- size: 'large',
- prefix: ,
- placeholder: 'mobile number',
- },
- rules: [
- {
- required: true,
- message: 'Please enter mobile number!',
- },
- {
- pattern: /^1\d{10}$/,
- message: 'Wrong mobile number format!',
- },
- ],
- },
- Captcha: {
- props: {
- size: 'large',
- prefix: ,
- placeholder: 'captcha',
- },
- rules: [
- {
- required: true,
- message: 'Please enter Captcha!',
- },
- ],
- },
-};
diff --git a/admin-web/src/components/NoticeIcon/NoticeIconTab.d.ts b/admin-web/src/components/NoticeIcon/NoticeIconTab.d.ts
deleted file mode 100644
index 6ffaf0321..000000000
--- a/admin-web/src/components/NoticeIcon/NoticeIconTab.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { SkeletonProps } from 'antd/lib/skeleton';
-import * as React from 'react';
-
-export interface INoticeIconData {
- avatar?: string | React.ReactNode;
- title?: React.ReactNode;
- description?: React.ReactNode;
- datetime?: React.ReactNode;
- extra?: React.ReactNode;
- style?: React.CSSProperties;
-}
-
-export interface INoticeIconTabProps {
- count?: number;
- emptyText?: React.ReactNode;
- emptyImage?: string;
- list?: INoticeIconData[];
- loadedAll?: boolean;
- loading?: boolean;
- name?: string;
- showClear?: boolean;
- skeletonCount?: number;
- skeletonProps?: SkeletonProps;
- style?: React.CSSProperties;
- title?: string;
-}
-
-export default class NoticeIconTab extends React.Component {}
diff --git a/admin-web/src/components/NoticeIcon/NoticeList.js b/admin-web/src/components/NoticeIcon/NoticeList.js
deleted file mode 100644
index 6b73e6e0d..000000000
--- a/admin-web/src/components/NoticeIcon/NoticeList.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import React from 'react';
-import { Avatar, List, Skeleton } from 'antd';
-import classNames from 'classnames';
-import styles from './NoticeList.less';
-
-let ListElement = null;
-
-export default function NoticeList({
- data = [],
- onClick,
- onClear,
- title,
- locale,
- emptyText,
- emptyImage,
- loading,
- onLoadMore,
- visible,
- loadedAll = true,
- scrollToLoad = true,
- showClear = true,
- skeletonCount = 5,
- skeletonProps = {},
-}) {
- if (data.length === 0) {
- return (
-
- {emptyImage ?
: null}
-
{emptyText || locale.emptyText}
-
- {locale.loadedAll}
-
- ) : (
-
- {locale.loadMore}
-
- );
- const onScroll = event => {
- if (!scrollToLoad || loading || loadedAll) return;
- if (typeof onLoadMore !== 'function') return;
- const { currentTarget: t } = event;
- if (t.scrollHeight - t.scrollTop - t.clientHeight <= 40) {
- onLoadMore(event);
- ListElement = t;
- }
- };
- if (!visible && ListElement) {
- try {
- ListElement.scrollTo(null, 0);
- } catch (err) {
- ListElement = null;
- }
- }
- return (
-
-
- {[...data, ...loadingList].map((item, i) => {
- const itemCls = classNames(styles.item, {
- [styles.read]: item.read,
- });
- // eslint-disable-next-line no-nested-ternary
- const leftIcon = item.avatar ? (
- typeof item.avatar === 'string' ? (
-
- ) : (
- {item.avatar}
- )
- ) : null;
-
- return (
- onClick(item)}>
-
-
- {item.title}
- {item.extra}
-
-
- {item.description}
-
-
{item.datetime}
-
- {locale.clear} {title}
-
- ) : null}
-
- );
-}
diff --git a/admin-web/src/components/NoticeIcon/NoticeList.less b/admin-web/src/components/NoticeIcon/NoticeList.less
deleted file mode 100644
index fc566ad06..000000000
--- a/admin-web/src/components/NoticeIcon/NoticeList.less
+++ /dev/null
@@ -1,94 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.list {
- max-height: 400px;
- overflow: auto;
- &::-webkit-scrollbar {
- display: none;
- }
- .item {
- padding-right: 24px;
- padding-left: 24px;
- overflow: hidden;
- cursor: pointer;
- transition: all 0.3s;
-
- .meta {
- width: 100%;
- }
-
- .avatar {
- margin-top: 4px;
- background: #fff;
- }
- .iconElement {
- font-size: 32px;
- }
-
- &.read {
- opacity: 0.4;
- }
- &:last-child {
- border-bottom: 0;
- }
- &:hover {
- background: @primary-1;
- }
- .title {
- margin-bottom: 8px;
- font-weight: normal;
- }
- .description {
- font-size: 12px;
- line-height: @line-height-base;
- }
- .datetime {
- margin-top: 4px;
- font-size: 12px;
- line-height: @line-height-base;
- }
- .extra {
- float: right;
- margin-top: -1.5px;
- margin-right: 0;
- color: @text-color-secondary;
- font-weight: normal;
- }
- }
- .loadMore {
- padding: 8px 0;
- color: @primary-6;
- text-align: center;
- cursor: pointer;
- &.loadedAll {
- color: rgba(0, 0, 0, 0.25);
- cursor: unset;
- }
- }
-}
-
-.notFound {
- padding: 73px 0 88px 0;
- color: @text-color-secondary;
- text-align: center;
- img {
- display: inline-block;
- height: 76px;
- margin-bottom: 16px;
- }
-}
-
-.clear {
- height: 46px;
- color: @text-color;
- line-height: 46px;
- text-align: center;
- border-top: 1px solid @border-color-split;
- border-radius: 0 0 @border-radius-base @border-radius-base;
- cursor: pointer;
- transition: all 0.3s;
-
- &:hover {
- color: @heading-color;
- }
-}
diff --git a/admin-web/src/components/NoticeIcon/demo/basic.md b/admin-web/src/components/NoticeIcon/demo/basic.md
deleted file mode 100644
index dc9afeaa8..000000000
--- a/admin-web/src/components/NoticeIcon/demo/basic.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-order: 1
-title: 通知图标
----
-
-通常用在导航工具栏上。
-
-````jsx
-import NoticeIcon from 'ant-design-pro/lib/NoticeIcon';
-
-ReactDOM.render(, mountNode);
-````
diff --git a/admin-web/src/components/NoticeIcon/demo/popover.md b/admin-web/src/components/NoticeIcon/demo/popover.md
deleted file mode 100644
index 9515c5187..000000000
--- a/admin-web/src/components/NoticeIcon/demo/popover.md
+++ /dev/null
@@ -1,191 +0,0 @@
----
-order: 2
-title: 带浮层卡片
----
-
-点击展开通知卡片，展现多种类型的通知，通常放在导航工具栏。
-
-```jsx
-import NoticeIcon from 'ant-design-pro/lib/NoticeIcon';
-import { Tag } from 'antd';
-
-const data = [
- {
- id: '000000001',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
- title: '你收到了 14 份新周报',
- datetime: '2017-08-09',
- type: '通知',
- },
- {
- id: '000000002',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png',
- title: '你推荐的 曲妮妮 已通过第三轮面试',
- datetime: '2017-08-08',
- type: '通知',
- },
- {
- id: '000000003',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png',
- title: '这种模板可以区分多种通知类型',
- datetime: '2017-08-07',
- read: true,
- type: '通知',
- },
- {
- id: '000000004',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png',
- title: '左侧图标用于区分不同的类型',
- datetime: '2017-08-07',
- type: '通知',
- },
- {
- id: '000000005',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
- title: '内容不要超过两行字，超出时自动截断',
- datetime: '2017-08-07',
- type: '通知',
- },
- {
- id: '000000006',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
- title: '曲丽丽 评论了你',
- description: '描述信息描述信息描述信息',
- datetime: '2017-08-07',
- type: '消息',
- clickClose: true,
- },
- {
- id: '000000007',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
- title: '朱偏右 回复了你',
- description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
- datetime: '2017-08-07',
- type: '消息',
- clickClose: true,
- },
- {
- id: '000000008',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
- title: '标题',
- description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
- datetime: '2017-08-07',
- type: '消息',
- clickClose: true,
- },
- {
- id: '000000009',
- title: '任务名称',
- description: '任务需要在 2017-01-12 20:00 前启动',
- extra: '未开始',
- status: 'todo',
- type: '待办',
- },
- {
- id: '000000010',
- title: '第三方紧急代码变更',
- description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
- extra: '马上到期',
- status: 'urgent',
- type: '待办',
- },
- {
- id: '000000011',
- title: '信息安全考试',
- description: '指派竹尔于 2017-01-09 前完成更新并发布',
- extra: '已耗时 8 天',
- status: 'doing',
- type: '待办',
- },
- {
- id: '000000012',
- title: 'ABCD 版本发布',
- description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
- extra: '进行中',
- status: 'processing',
- type: '待办',
- },
-];
-
-function onItemClick(item, tabProps) {
- console.log(item, tabProps);
-}
-
-function onClear(tabTitle) {
- console.log(tabTitle);
-}
-
-function getNoticeData(notices) {
- if (notices.length === 0) {
- return {};
- }
- const newNotices = notices.map(notice => {
- const newNotice = { ...notice };
- // transform id to item key
- if (newNotice.id) {
- newNotice.key = newNotice.id;
- }
- if (newNotice.extra && newNotice.status) {
- const color = {
- todo: '',
- processing: 'blue',
- urgent: 'red',
- doing: 'gold',
- }[newNotice.status];
- newNotice.extra = (
-
- {newNotice.extra}
-
- );
- }
- return newNotice;
- });
- return newNotices.reduce((pre, data) => {
- if (!pre[data.type]) {
- pre[data.type] = [];
- }
- pre[data.type].push(data);
- return pre;
- }, {});
-}
-
-const noticeData = getNoticeData(data);
-const Demo = () => (
-
-
-
-
-
-
-
-);
-
-ReactDOM.render(, mountNode);
-```
diff --git a/admin-web/src/components/NoticeIcon/index.d.ts b/admin-web/src/components/NoticeIcon/index.d.ts
deleted file mode 100644
index f7d6479aa..000000000
--- a/admin-web/src/components/NoticeIcon/index.d.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as React from 'react';
-import NoticeIconTab, { INoticeIconData } from './NoticeIconTab';
-
-export interface INoticeIconProps {
- count?: number;
- bell?: React.ReactNode;
- className?: string;
- loading?: boolean;
- onClear?: (tabName: string) => void;
- onItemClick?: (item: INoticeIconData, tabProps: INoticeIconProps) => void;
- onLoadMore?: (tabProps: INoticeIconProps) => void;
- onTabChange?: (tabTile: string) => void;
- style?: React.CSSProperties;
- onPopupVisibleChange?: (visible: boolean) => void;
- popupVisible?: boolean;
- locale?: {
- emptyText: string;
- clear: string;
- loadedAll: string;
- loadMore: string;
- };
- clearClose?: boolean;
-}
-
-export default class NoticeIcon extends React.Component {
- public static Tab: typeof NoticeIconTab;
-}
diff --git a/admin-web/src/components/NoticeIcon/index.en-US.md b/admin-web/src/components/NoticeIcon/index.en-US.md
deleted file mode 100644
index c64727806..000000000
--- a/admin-web/src/components/NoticeIcon/index.en-US.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: NoticeIcon
-subtitle:
-cols: 1
-order: 9
----
-
-用在导航工具栏上，作为整个产品统一的通知中心。
-
-## API
-
-Property | Description | Type | Default
-----|------|-----|------
-count | Total number of messages | number | -
-bell | Change the bell Icon | ReactNode | ``
-loading | Popup card loading status | boolean | `false`
-onClear | Click to clear button the callback | function(tabName) | -
-onItemClick | Click on the list item's callback | function(item, tabProps) | -
-onLoadMore | Callback of click for loading more | function(tabProps, event) | -
-onPopupVisibleChange | Popup Card Showing or Hiding Callbacks | function(visible) | -
-onTabChange | Switching callbacks for tabs | function(tabTitle) | -
-popupVisible | Popup card display state | boolean | -
-locale | Default message text | Object | `{ emptyText: 'No notifications', clear: 'Clear', loadedAll: 'Loaded', loadMore: 'Loading more' }`
-clearClose | Close menu after clear | boolean | `false`
-
-### NoticeIcon.Tab
-
-Property | Description | Type | Default
-----|------|-----|------
-count | Unread messages count of this tab | number | list.length
-emptyText | Message text when list is empty | ReactNode | -
-emptyImage | Image when list is empty | string | -
-list | List data, format refer to the following table | Array | `[]`
-loadedAll | All messages have been loaded | boolean | `true`
-loading | Loading status of this tab | boolean | `false`
-name | identifier for message Tab | string | -
-scrollToLoad | Scroll to load | boolean | `true`
-skeletonCount | Number of skeleton when tab is loading | number | `5`
-skeletonProps | Props of skeleton | SkeletonProps | `{}`
-showClear | Clear button display status | boolean | `true`
-title | header for message Tab | string | -
-
-### Tab data
-
-Property | Description | Type | Default
-----|------|-----|------
-avatar | avatar img url | string \| ReactNode | -
-title | title | ReactNode | -
-description | description info | ReactNode | -
-datetime | Timestamps | ReactNode | -
-extra | Additional information in the upper right corner of the list item | ReactNode | -
-clickClose | Close menu after clicking list item | boolean | `false`
diff --git a/admin-web/src/components/NoticeIcon/index.js b/admin-web/src/components/NoticeIcon/index.js
deleted file mode 100644
index 133819bb1..000000000
--- a/admin-web/src/components/NoticeIcon/index.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { PureComponent, Fragment } from 'react';
-import ReactDOM from 'react-dom';
-import { Icon, Tabs, Badge, Spin } from 'antd';
-import classNames from 'classnames';
-import HeaderDropdown from '../HeaderDropdown';
-import List from './NoticeList';
-import styles from './index.less';
-
-const { TabPane } = Tabs;
-
-export default class NoticeIcon extends PureComponent {
- static Tab = TabPane;
-
- static defaultProps = {
- onItemClick: () => {},
- onPopupVisibleChange: () => {},
- onTabChange: () => {},
- onClear: () => {},
- loading: false,
- clearClose: false,
- locale: {
- emptyText: 'No notifications',
- clear: 'Clear',
- loadedAll: 'Loaded',
- loadMore: 'Loading more',
- },
- emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg',
- };
-
- state = {
- visible: false,
- };
-
- onItemClick = (item, tabProps) => {
- const { onItemClick } = this.props;
- const { clickClose } = item;
- onItemClick(item, tabProps);
- if (clickClose) {
- this.popover.click();
- }
- };
-
- onClear = name => {
- const { onClear, clearClose } = this.props;
- onClear(name);
- if (clearClose) {
- this.popover.click();
- }
- };
-
- onTabChange = tabType => {
- const { onTabChange } = this.props;
- onTabChange(tabType);
- };
-
- onLoadMore = (tabProps, event) => {
- const { onLoadMore } = this.props;
- onLoadMore(tabProps, event);
- };
-
- getNotificationBox() {
- const { visible } = this.state;
- const { children, loading, locale } = this.props;
- if (!children) {
- return null;
- }
- const panes = React.Children.map(children, child => {
- const {
- list,
- title,
- name,
- count,
- emptyText,
- emptyImage,
- showClear,
- loadedAll,
- scrollToLoad,
- skeletonCount,
- skeletonProps,
- loading: tabLoading,
- } = child.props;
- const len = list && list.length ? list.length : 0;
- const msgCount = count || count === 0 ? count : len;
- const tabTitle = msgCount > 0 ? `${title} (${msgCount})` : title;
- return (
-
- this.onClear(name)}
- onClick={item => this.onItemClick(item, child.props)}
- onLoadMore={event => this.onLoadMore(child.props, event)}
- scrollToLoad={scrollToLoad}
- showClear={showClear}
- skeletonCount={skeletonCount}
- skeletonProps={skeletonProps}
- title={title}
- visible={visible}
- />
-
- );
- });
- return (
-
-
-
- {panes}
-
-
-
- );
- }
-
- handleVisibleChange = visible => {
- const { onPopupVisibleChange } = this.props;
- this.setState({ visible });
- onPopupVisibleChange(visible);
- };
-
- render() {
- const { className, count, popupVisible, bell } = this.props;
- const { visible } = this.state;
- const noticeButtonClass = classNames(className, styles.noticeButton);
- const notificationBox = this.getNotificationBox();
- const NoticeBellIcon = bell || ;
- const trigger = (
-
-
- {NoticeBellIcon}
-
-
- );
- if (!notificationBox) {
- return trigger;
- }
- const popoverProps = {};
- if ('popupVisible' in this.props) {
- popoverProps.visible = popupVisible;
- }
- return (
- (this.popover = ReactDOM.findDOMNode(node))} // eslint-disable-line
- >
- {trigger}
-
- );
- }
-}
diff --git a/admin-web/src/components/NoticeIcon/index.less b/admin-web/src/components/NoticeIcon/index.less
deleted file mode 100644
index 1c0593eea..000000000
--- a/admin-web/src/components/NoticeIcon/index.less
+++ /dev/null
@@ -1,31 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.popover {
- position: relative;
- width: 336px;
-}
-
-.noticeButton {
- display: inline-block;
- cursor: pointer;
- transition: all 0.3s;
-}
-.icon {
- padding: 4px;
- vertical-align: middle;
-}
-
-.badge {
- font-size: 16px;
-}
-
-.tabs {
- :global {
- .ant-tabs-nav-scroll {
- text-align: center;
- }
- .ant-tabs-bar {
- margin-bottom: 0;
- }
- }
-}
diff --git a/admin-web/src/components/NoticeIcon/index.zh-CN.md b/admin-web/src/components/NoticeIcon/index.zh-CN.md
deleted file mode 100644
index 23dab2203..000000000
--- a/admin-web/src/components/NoticeIcon/index.zh-CN.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: NoticeIcon
-subtitle: 通知菜单
-cols: 1
-order: 9
----
-
-用在导航工具栏上，作为整个产品统一的通知中心。
-
-## API
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-count | 图标上的消息总数 | number | -
-bell | translate this please -> Change the bell Icon | ReactNode | ``
-loading | 弹出卡片加载状态 | boolean | `false`
-onClear | 点击清空按钮的回调 | function(tabName) | -
-onItemClick | 点击列表项的回调 | function(item, tabProps) | -
-onLoadMore | 加载更多的回调 | function(tabProps, event) | -
-onPopupVisibleChange | 弹出卡片显隐的回调 | function(visible) | -
-onTabChange | 切换页签的回调 | function(tabTitle) | -
-popupVisible | 控制弹层显隐 | boolean | -
-locale | 默认文案 | Object | `{ emptyText: 'No notifications', clear: 'Clear', loadedAll: 'Loaded', loadMore: 'Loading more' }`
-clearClose | 点击清空按钮后关闭通知菜单 | boolean | `false`
-
-### NoticeIcon.Tab
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-count | 当前 Tab 未读消息数量 | number | list.length
-emptyText | 针对每个 Tab 定制空数据文案 | ReactNode | -
-emptyImage | 针对每个 Tab 定制空数据图片 | string | -
-list | 列表数据，格式参照下表 | Array | `[]`
-loadedAll | 已加载完所有消息 | boolean | `true`
-loading | 当前 Tab 的加载状态 | boolean | `false`
-name | 消息分类的标识符 | string | -
-scrollToLoad | 允许滚动自加载 | boolean | `true`
-skeletonCount | 加载时占位骨架的数量 | number | `5`
-skeletonProps | 加载时占位骨架的属性 | SkeletonProps | `{}`
-showClear | 是否显示清空按钮 | boolean | `true`
-title | 消息分类的页签标题 | string | -
-
-### Tab data
-
-参数 | 说明 | 类型 | 默认值
-----|------|-----|------
-avatar | 头像图片链接 | string \| ReactNode | -
-title | 标题 | ReactNode | -
-description | 描述信息 | ReactNode | -
-datetime | 时间戳 | ReactNode | -
-extra | 额外信息，在列表项右上角 | ReactNode | -
-clickClose | 点击列表项关闭通知菜单 | boolean | `false`
diff --git a/admin-web/src/components/NumberInfo/demo/basic.md b/admin-web/src/components/NumberInfo/demo/basic.md
deleted file mode 100644
index b399655ee..000000000
--- a/admin-web/src/components/NumberInfo/demo/basic.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-order: 0
-title:
- zh-CN: 演示
- en-US: Demo
----
-
-## zh-CN
-
-各种数据文案的展现方式。
-
-## en-US
-
-Used for presenting various numerical data.
-
-````jsx
-import NumberInfo from 'ant-design-pro/lib/NumberInfo';
-import numeral from 'numeral';
-
-ReactDOM.render(
-
- Visits this week}
- total={numeral(12321).format('0,0')}
- status="up"
- subTotal={17.1}
- />
-
-, mountNode);
-````
diff --git a/admin-web/src/components/NumberInfo/index.d.ts b/admin-web/src/components/NumberInfo/index.d.ts
deleted file mode 100644
index ca93ba5d3..000000000
--- a/admin-web/src/components/NumberInfo/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as React from 'react';
-export interface INumberInfoProps {
- title?: React.ReactNode | string;
- subTitle?: React.ReactNode | string;
- total?: React.ReactNode | string;
- status?: 'up' | 'down';
- theme?: string;
- gap?: number;
- subTotal?: number;
- style?: React.CSSProperties;
-}
-
-export default class NumberInfo extends React.Component {}
diff --git a/admin-web/src/components/NumberInfo/index.en-US.md b/admin-web/src/components/NumberInfo/index.en-US.md
deleted file mode 100644
index b82afbe4f..000000000
--- a/admin-web/src/components/NumberInfo/index.en-US.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: NumberInfo
-cols: 1
-order: 10
----
-
-Often used in data cards for highlighting the business data.
-
-## API
-
-Property | Description | Type | Default
-----|------|-----|------
-title | title | ReactNode\|string | -
-subTitle | subtitle | ReactNode\|string | -
-total | total amount | ReactNode\|string | -
-subTotal | total amount of additional information | ReactNode\|string | -
-status | increase state | 'up \| down' | -
-theme | state style | string | 'light'
-gap | set the spacing (pixels) between numbers and descriptions | number | 8
diff --git a/admin-web/src/components/NumberInfo/index.js b/admin-web/src/components/NumberInfo/index.js
deleted file mode 100644
index 717aee9dd..000000000
--- a/admin-web/src/components/NumberInfo/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { Icon } from 'antd';
-import classNames from 'classnames';
-import styles from './index.less';
-
-const NumberInfo = ({ theme, title, subTitle, total, subTotal, status, suffix, gap, ...rest }) => (
-
- {title && (
-
- {title}
-
- )}
- {subTitle && (
-
- {subTitle}
-
- )}
-
-
- {total}
- {suffix && {suffix}}
-
- {(status || subTotal) && (
-
- {subTotal}
- {status && }
-
- )}
-
-
cc
;
-// }
-// }
diff --git a/admin-web/src/components/PageHeader/breadcrumb.d.ts b/admin-web/src/components/PageHeader/breadcrumb.d.ts
deleted file mode 100644
index cfed40211..000000000
--- a/admin-web/src/components/PageHeader/breadcrumb.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import * as React from 'react';
-import { IPageHeaderProps } from './index';
-
-export default class BreadcrumbView extends React.Component {}
-
-export function getBreadcrumb(breadcrumbNameMap: object, url: string): object;
diff --git a/admin-web/src/components/PageHeader/breadcrumb.js b/admin-web/src/components/PageHeader/breadcrumb.js
deleted file mode 100644
index e6afcb54c..000000000
--- a/admin-web/src/components/PageHeader/breadcrumb.js
+++ /dev/null
@@ -1,178 +0,0 @@
-import React, { PureComponent, createElement } from 'react';
-import pathToRegexp from 'path-to-regexp';
-import { Breadcrumb } from 'antd';
-import styles from './index.less';
-import { urlToList } from '../_utils/pathTools';
-
-export const getBreadcrumb = (breadcrumbNameMap, url) => {
- let breadcrumb = breadcrumbNameMap[url];
- if (!breadcrumb) {
- Object.keys(breadcrumbNameMap).forEach(item => {
- if (pathToRegexp(item).test(url)) {
- breadcrumb = breadcrumbNameMap[item];
- }
- });
- }
- return breadcrumb || {};
-};
-
-export default class BreadcrumbView extends PureComponent {
- state = {
- breadcrumb: null,
- };
-
- componentDidMount() {
- this.getBreadcrumbDom();
- }
-
- componentDidUpdate(preProps) {
- const { location } = this.props;
- if (!location || !preProps.location) {
- return;
- }
- const prePathname = preProps.location.pathname;
- if (prePathname !== location.pathname) {
- this.getBreadcrumbDom();
- }
- }
-
- getBreadcrumbDom = () => {
- const breadcrumb = this.conversionBreadcrumbList();
- this.setState({
- breadcrumb,
- });
- };
-
- getBreadcrumbProps = () => {
- const { routes, params, location, breadcrumbNameMap } = this.props;
- return {
- routes,
- params,
- routerLocation: location,
- breadcrumbNameMap,
- };
- };
-
- // Generated according to props
- conversionFromProps = () => {
- const { breadcrumbList, breadcrumbSeparator, itemRender, linkElement = 'a' } = this.props;
- return (
-
- {breadcrumbList.map(item => {
- const title = itemRender ? itemRender(item) : item.title;
- return (
-
- {item.href
- ? createElement(
- linkElement,
- {
- [linkElement === 'a' ? 'href' : 'to']: item.href,
- },
- title
- )
- : title}
-
- );
- })}
-
- );
- };
-
- conversionFromLocation = (routerLocation, breadcrumbNameMap) => {
- const { breadcrumbSeparator, home, itemRender, linkElement = 'a' } = this.props;
- // Convert the url to an array
- const pathSnippets = urlToList(routerLocation.pathname);
- // Loop data mosaic routing
- const extraBreadcrumbItems = pathSnippets.map((url, index) => {
- const currentBreadcrumb = getBreadcrumb(breadcrumbNameMap, url);
- if (currentBreadcrumb.inherited) {
- return null;
- }
- const isLinkable = index !== pathSnippets.length - 1 && currentBreadcrumb.component;
- const name = itemRender ? itemRender(currentBreadcrumb) : currentBreadcrumb.name;
- return currentBreadcrumb.name && !currentBreadcrumb.hideInBreadcrumb ? (
-
- {createElement(
- isLinkable ? linkElement : 'span',
- { [linkElement === 'a' ? 'href' : 'to']: url },
- name
- )}
-
- ) : null;
- });
- // Add home breadcrumbs to your head if defined
- if (home) {
- extraBreadcrumbItems.unshift(
-
- {createElement(
- linkElement,
- {
- [linkElement === 'a' ? 'href' : 'to']: '/',
- },
- home
- )}
-
- );
- }
- return (
-
- {extraBreadcrumbItems}
-
- );
- };
-
- /**
- * 将参数转化为面包屑
- * Convert parameters into breadcrumbs
- */
- conversionBreadcrumbList = () => {
- const { breadcrumbList, breadcrumbSeparator } = this.props;
- const { routes, params, routerLocation, breadcrumbNameMap } = this.getBreadcrumbProps();
- if (breadcrumbList && breadcrumbList.length) {
- return this.conversionFromProps();
- }
- // 如果传入 routes 和 params 属性
- // If pass routes and params attributes
- if (routes && params) {
- return (
- route.breadcrumbName)}
- params={params}
- itemRender={this.itemRender}
- separator={breadcrumbSeparator}
- />
- );
- }
- // 根据 location 生成 面包屑
- // Generate breadcrumbs based on location
- if (routerLocation && routerLocation.pathname) {
- return this.conversionFromLocation(routerLocation, breadcrumbNameMap);
- }
- return null;
- };
-
- // 渲染Breadcrumb 子节点
- // Render the Breadcrumb child node
- itemRender = (route, params, routes, paths) => {
- const { linkElement = 'a' } = this.props;
- const last = routes.indexOf(route) === routes.length - 1;
- return last || !route.component ? (
- {route.breadcrumbName}
- ) : (
- createElement(
- linkElement,
- {
- href: paths.join('/') || '/',
- to: paths.join('/') || '/',
- },
- route.breadcrumbName
- )
- );
- };
-
- render() {
- const { breadcrumb } = this.state;
- return breadcrumb;
- }
-}
diff --git a/admin-web/src/components/PageHeader/demo/image.md b/admin-web/src/components/PageHeader/demo/image.md
deleted file mode 100644
index 511bac5d0..000000000
--- a/admin-web/src/components/PageHeader/demo/image.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-order: 2
-title: With Image
----
-
-带图片的页头。
-
-````jsx
-import PageHeader from 'ant-design-pro/lib/PageHeader';
-
-const content = (
-
-
段落示意：蚂蚁金服务设计平台 ant.design，用最小的工作量，无缝接入蚂蚁金服生态，提供跨越设计与开发的体验解决方案。
-
-
-
-
-
-
-
-
-
-
-
-
-
-);
-
-const extra = (
-
-
- 状态
- 待审批
-
-
- 订单金额
- ¥ 568.08
-
-
-);
-
-const breadcrumbList = [{
- title: '一级菜单',
- href: '/',
-}, {
- title: '二级菜单',
- href: '/',
-}, {
- title: '三级菜单',
-}];
-
-const tabList = [{
- key: 'detail',
- tab: '详情',
-}, {
- key: 'rule',
- tab: '规则',
-}];
-
-function onTabChange(key) {
- console.log(key);
-}
-
-ReactDOM.render(
-
-
}
- action={action}
- content={description}
- extraContent={extra}
- breadcrumbList={breadcrumbList}
- tabList={tabList}
- tabActiveKey="detail"
- onTabChange={onTabChange}
- />
-
logo
}
- action={action
}
- content={content
}
- extraContent={extraContent
}
- breadcrumbList={breadcrumbList}
- tabList={tabList}
- tabActiveKey="1"
- />
-
-, mountNode);
-````
-
-
diff --git a/admin-web/src/components/PageHeader/index.d.ts b/admin-web/src/components/PageHeader/index.d.ts
deleted file mode 100644
index eacbb2de9..000000000
--- a/admin-web/src/components/PageHeader/index.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from 'react';
-export interface IPageHeaderProps {
- title?: React.ReactNode | string;
- logo?: React.ReactNode | string;
- action?: React.ReactNode | string;
- content?: React.ReactNode;
- extraContent?: React.ReactNode;
- routes?: any[];
- params?: any;
- breadcrumbList?: Array<{ title: React.ReactNode; href?: string }>;
- tabList?: Array<{ key: string; tab: React.ReactNode }>;
- tabActiveKey?: string;
- tabDefaultActiveKey?: string;
- onTabChange?: (key: string) => void;
- tabBarExtraContent?: React.ReactNode;
- linkElement?: React.ReactNode;
- style?: React.CSSProperties;
- home?: React.ReactNode;
- wide?: boolean;
- hiddenBreadcrumb?: boolean;
-}
-
-export default class PageHeader extends React.Component {}
diff --git a/admin-web/src/components/PageHeader/index.js b/admin-web/src/components/PageHeader/index.js
deleted file mode 100644
index 17c1a7e28..000000000
--- a/admin-web/src/components/PageHeader/index.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { PureComponent } from 'react';
-import { Tabs, Skeleton } from 'antd';
-import classNames from 'classnames';
-import styles from './index.less';
-import BreadcrumbView from './breadcrumb';
-
-const { TabPane } = Tabs;
-export default class PageHeader extends PureComponent {
- onChange = key => {
- const { onTabChange } = this.props;
- if (onTabChange) {
- onTabChange(key);
- }
- };
-
- render() {
- const {
- title = '',
- logo,
- action,
- content,
- extraContent,
- tabList,
- className,
- tabActiveKey,
- tabDefaultActiveKey,
- tabBarExtraContent,
- loading = false,
- wide = false,
- hiddenBreadcrumb = false,
- } = this.props;
-
- const clsString = classNames(styles.pageHeader, className);
- const activeKeyProps = {};
- if (tabDefaultActiveKey !== undefined) {
- activeKeyProps.defaultActiveKey = tabDefaultActiveKey;
- }
- if (tabActiveKey !== undefined) {
- activeKeyProps.activeKey = tabActiveKey;
- }
- return (
-
-
-
- {hiddenBreadcrumb ? null : }
-
- {logo &&
{logo}
}
-
-
-
{title}
- {action &&
{action}
}
-
-
- {content &&
{content}
}
- {extraContent &&
{extraContent}
}
-
-
-
-
-
{children}
;
- }
-}
-
-export default connect(({ setting }) => ({
- contentWidth: setting.contentWidth,
-}))(GridContent);
diff --git a/admin-web/src/components/PageHeaderWrapper/GridContent.less b/admin-web/src/components/PageHeaderWrapper/GridContent.less
deleted file mode 100644
index d5496e9ec..000000000
--- a/admin-web/src/components/PageHeaderWrapper/GridContent.less
+++ /dev/null
@@ -1,10 +0,0 @@
-.main {
- width: 100%;
- height: 100%;
- min-height: 100%;
- transition: 0.3s;
- &.wide {
- max-width: 1200px;
- margin: 0 auto;
- }
-}
diff --git a/admin-web/src/components/PageHeaderWrapper/index.js b/admin-web/src/components/PageHeaderWrapper/index.js
deleted file mode 100644
index cd745f66e..000000000
--- a/admin-web/src/components/PageHeaderWrapper/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from 'umi/locale';
-import Link from 'umi/link';
-import PageHeader from '@/components/PageHeader';
-import { connect } from 'dva';
-import GridContent from './GridContent';
-import styles from './index.less';
-import MenuContext from '@/layouts/MenuContext';
-
-const PageHeaderWrapper = ({ children, contentWidth, wrapperClassName, top, ...restProps }) => (
-
- {top}
-
- {value => (
- }
- {...value}
- key="pageheader"
- {...restProps}
- linkElement={Link}
- itemRender={item => {
- if (item.locale) {
- return ;
- }
- return item.title;
- }}
- />
- )}
-
- {children ? (
-
- {children}
-
- ) : null}
-
-
-
-);
diff --git a/admin-web/src/components/Product/ProductAttrSelectFormItem.js b/admin-web/src/components/Product/ProductAttrSelectFormItem.js
deleted file mode 100644
index aa01fcfc1..000000000
--- a/admin-web/src/components/Product/ProductAttrSelectFormItem.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import React, {PureComponent} from "react";
-import {Select} from "antd";
-
-const Option = Select.Option;
-
-class AttrValueSelect extends Select {
-
- handleSelectAttrValue = (value, option) => {
-
- };
-
- render() {
- const {index, attrValues, attrValueOptions, attr} = this.props;
-
- const handleChangeAttrValue = async (values, options) => {
- let attrValues = [];
- const {dispatch, index} = this.props;
- // debugger;
- // console.log('x' + this.children[0]);
- // let firstOption = this.children[0];
- // let attrIndex = firstOption.key.substring(firstOption.key.indexOf('option-attr-value-') + 'option-attr-value-'.length, firstOption.key.lastIndexOf('-'));
- for (let i in options) {
- let option = options[i];
- // TODO 芋艿，这个做法很不优雅，后面看俺。需要问下 answer 。
- let attrValueId = undefined;
- if (option.key.indexOf('option-attr-value-') === -1) {
- await dispatch({
- type: 'productAttrList/addValue',
- payload: {
- attrId: attr.id,
- name: option.props.children,
- },
- callback: function (data) {
- attrValueId = data.id;
- }
- });
- } else {
- attrValueId = parseInt(option.props.value);
- }
- // 添加到 attrValues 中。
- // debugger;
- attrValues.push({
- id: attrValueId,
- name: option.props.children,
- });
- }
- dispatch({
- type: 'productSpuAddOrUpdate/selectAttrValues',
- payload: {
- attrIndex: index,
- attrValues: attrValues,
- },
- });
- // debugger;
-
- // console.log(value);
- };
-
- return ;
- }
-
-}
-
-export default class ProductAttrSelectFormItem extends PureComponent {
-
- handleSelectAttr = (value, option) => {
- // debugger;
- // console.log(value);
- // console.log(option);
- // debugger;
- const { dispatch, index } = this.props;
- // let attrIndex = option.key.substring(option.key.indexOf('option-attr-') + 'option-attr-'.length, option.key.lastIndexOf('-'));
- // console.log('attrIndex: ' + attrIndex);
- // debugger;
- dispatch({
- type: 'productSpuAddOrUpdate/selectAttr',
- payload: {
- attrIndex: index,
- attr: {
- id: option.props.value,
- name: option.props.children,
- values: []
- }
- },
- });
- };
-
- render() {
- const {attr, allAttrTree, selectedAttrIds, index, dispatch} = this.props;
- // console.log('i: ' + i);
- // 1. 规格
- let attrOptions = [];
- // allAttrTree.unshift(attr);
- // debugger;
- for (let j in allAttrTree) {
- let allAttr = allAttrTree[j];
- if (selectedAttrIds.has(allAttr.id) && allAttr.id !== attr.id) {
- continue;
- }
- attrOptions.push();
- }
- // 2. 规格值
- let attrValueOptions = [];
- // debugger;
- if (attr.id) {
- // 2.1 先找到规格值的数组
- let attrValues = [];
- for (let j in allAttrTree) {
- let allAttr = allAttrTree[j];
- if (attr.id === allAttr.id) {
- attrValues = allAttr.values;
- break;
- }
- }
- // 2.2 生成规格值的 HTML
- for (let j in attrValues) {
- let attrValue = attrValues[j];
- attrValueOptions.push(); // + '' 的原因是，多选必须是字符串
- }
- }
- // 3. 拼装最终，添加到 attrTreeHTML 中
- // debugger;
- let attrValues = []; // 选中的规格值集合
- for (let i in attr.values) {
- attrValues.push(attr.values[i].id + ''); // Select 传入数组时，如果不 + '' ，选不中。
- }
- let attrValueSelectProps = {
- index: index,
- attrValues: attrValues,
- dispatch: dispatch,
- attrValueOptions: attrValueOptions,
- attr: attr,
- };
- // TODO BUG ，规格不能搜索添加
- return ;
- }
-
-}
diff --git a/admin-web/src/components/Product/ProductSkuAddOrUpdateTable.js b/admin-web/src/components/Product/ProductSkuAddOrUpdateTable.js
deleted file mode 100644
index c4659ebb0..000000000
--- a/admin-web/src/components/Product/ProductSkuAddOrUpdateTable.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, {PureComponent} from "react";
-import {InputNumber, Select, Table} from "antd";
-import Input from "antd/es/input";
-
-const Option = Select.Option;
-
-class SkuInputNumber extends PureComponent {
-
- handleChange = value => {
- // debugger;
- const { dispatch, index, dataIndex } = this.props;
- if (dataIndex === 'price') {
- dispatch({
- type: 'productSpuAddOrUpdate/inputSkuPrice',
- payload: {
- index: index,
- price: value
- },
- });
- } else if (dataIndex === 'quantity') {
- dispatch({
- type: 'productSpuAddOrUpdate/inputSkuQuantity',
- payload: {
- index: index,
- quantity: value
- },
- });
- }
- }
-
- render() {
- const { value } = this.props;
- return
- }
-
-}
-
-export default class ProductSkuAddOrUpdateTable extends PureComponent {
-
- render() {
- let that = this;
- // debugger;
- // console.log('ProductSkuAddOrUpdateTable');
- const {attrTree, skus, dispatch} = this.props;
- // 排除空选项的规格
- let newAttrTree = [];
- for (let i in attrTree) {
- let attr = attrTree[i];
- if (attr && attr.values && attr.values.length > 0) {
- newAttrTree.push(attr);
- }
- }
- let columns = [];
- for (let i in newAttrTree) {
- let attr = newAttrTree[i];
- columns.push({
- title: attr.name,
- dataIndex: 'attrs[i]',
- render(value, record) {
- return record.attrs[i].name;
- }
- })
- }
- columns.push({
- title: '价格',
- dataIndex: 'price',
- render(value, record, index) {
- let props = {
- record: record,
- index: index,
- dispatch: dispatch,
- dataIndex: 'price',
- value: record.price,
- };
- return ;
- }
- });
- columns.push({
- title: '库存',
- dataIndex: 'quantity',
- render(value, record, index) {
- let props = {
- record: record,
- index: index,
- dispatch: dispatch,
- dataIndex: 'quantity',
- value: record.quantity,
- };
- return ;
- }
- });
- return ;
- // return ;
- }
-
-}
diff --git a/admin-web/src/components/Result/demo/classic.md b/admin-web/src/components/Result/demo/classic.md
deleted file mode 100644
index 0cd9d14b3..000000000
--- a/admin-web/src/components/Result/demo/classic.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-order: 1
-title: Classic
----
-
-典型结果页面。
-
-````jsx
-import Result from 'ant-design-pro/lib/Result';
-import { Button, Row, Col, Icon, Steps } from 'antd';
-
-const { Step } = Steps;
-
-const desc1 = (
-
-
- 曲丽丽
-
-
-
2016-12-12 12:32
-
-
- 项目名称
-
-
-
- 项目 ID：
- 23421
-
-
- 负责人：
- 曲丽丽
-
-
- 生效时间：
- 2016-12-12 ~ 2017-12-12
-
-
-
-
-
-
-
-
-
-
-
-
-
-);
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Result/demo/error.md b/admin-web/src/components/Result/demo/error.md
deleted file mode 100644
index 5fd25cfdd..000000000
--- a/admin-web/src/components/Result/demo/error.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-order: 2
-title: Failed
----
-
-提交失败。
-
-````jsx
-import Result from 'ant-design-pro/lib/Result';
-import { Button, Icon } from 'antd';
-
-const extra = (
-
-);
-
-const actions = ;
-
-ReactDOM.render(
-
-, mountNode);
-````
diff --git a/admin-web/src/components/Result/demo/structure.md b/admin-web/src/components/Result/demo/structure.md
deleted file mode 100644
index 7fcecfd6d..000000000
--- a/admin-web/src/components/Result/demo/structure.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-order: 0
-title: Structure
----
-
-结构包含 `处理结果`，`补充信息` 以及 `操作建议` 三个部分，其中 `处理结果` 由 `提示图标`，`标题` 和 `结果描述` 组成。
-
-````jsx
-import Result from 'ant-design-pro/lib/Result';
-
-ReactDOM.render(
- 标题}
- description={结果描述
}
- extra="其他补充信息，自带灰底效果"
- actions={操作建议，一般放置按钮组
}
- />
-, mountNode);
-````
diff --git a/admin-web/src/components/Result/index.d.ts b/admin-web/src/components/Result/index.d.ts
deleted file mode 100644
index 0c34c2540..000000000
--- a/admin-web/src/components/Result/index.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as React from 'react';
-export interface IResultProps {
- type: 'success' | 'error';
- title: React.ReactNode;
- description?: React.ReactNode;
- extra?: React.ReactNode;
- actions?: React.ReactNode;
- style?: React.CSSProperties;
-}
-
-export default class Result extends React.Component {}
diff --git a/admin-web/src/components/Result/index.js b/admin-web/src/components/Result/index.js
deleted file mode 100644
index 89f9f31ab..000000000
--- a/admin-web/src/components/Result/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Icon } from 'antd';
-import styles from './index.less';
-
-export default function Result({
- className,
- type,
- title,
- description,
- extra,
- actions,
- ...restProps
-}) {
- const iconMap = {
- error: ,
- success: ,
- };
- const clsString = classNames(styles.result, className);
- return (
-
-
{iconMap[type]}
-
{title}
- {description &&
{description}
}
- {extra &&
{extra}
}
- {actions &&
{actions}
}
-
- {list.map(item => (
-
- onChange(item.key)}>
-
-
-
-
-
- ))}
-
- {check ? : ''}
-
-);
-
-const ThemeColor = ({ colors, title, value, onChange }) => {
- let colorList = colors;
- if (!colors) {
- colorList = [
- {
- key: 'dust',
- color: '#F5222D',
- },
- {
- key: 'volcano',
- color: '#FA541C',
- },
- {
- key: 'sunset',
- color: '#FAAD14',
- },
- {
- key: 'cyan',
- color: '#13C2C2',
- },
- {
- key: 'green',
- color: '#52C41A',
- },
- {
- key: 'daybreak',
- color: '#1890FF',
- },
- {
- key: 'geekblue',
- color: '#2F54EB',
- },
- {
- key: 'purple',
- color: '#722ED1',
- },
- ];
- }
- return (
-
-
{title}
-
- {colorList.map(({ key, color }) => (
-
- onChange && onChange(color)}
- />
-
- ))}
-
-
-
{title}
- {children}
-
-);
-
-@connect(({ setting }) => ({ setting }))
-class SettingDrawer extends PureComponent {
- state = {
- collapse: false,
- };
-
- getLayoutSetting = () => {
- const {
- setting: { contentWidth, fixedHeader, layout, autoHideHeader, fixSiderbar },
- } = this.props;
- return [
- {
- title: formatMessage({ id: 'app.setting.content-width' }),
- action: (
-
- ),
- },
- {
- title: formatMessage({ id: 'app.setting.fixedheader' }),
- action: (
- this.changeSetting('fixedHeader', checked)}
- />
- ),
- },
- {
- title: formatMessage({ id: 'app.setting.hideheader' }),
- disabled: !fixedHeader,
- disabledReason: formatMessage({ id: 'app.setting.hideheader.hint' }),
- action: (
- this.changeSetting('autoHideHeader', checked)}
- />
- ),
- },
- {
- title: formatMessage({ id: 'app.setting.fixedsidebar' }),
- disabled: layout === 'topmenu',
- disabledReason: formatMessage({ id: 'app.setting.fixedsidebar.hint' }),
- action: (
- this.changeSetting('fixSiderbar', checked)}
- />
- ),
- },
- ];
- };
-
- changeSetting = (key, value) => {
- const { setting } = this.props;
- const nextState = { ...setting };
- nextState[key] = value;
- if (key === 'layout') {
- nextState.contentWidth = value === 'topmenu' ? 'Fixed' : 'Fluid';
- } else if (key === 'fixedHeader' && !value) {
- nextState.autoHideHeader = false;
- }
- this.setState(nextState, () => {
- const { dispatch } = this.props;
- dispatch({
- type: 'setting/changeSetting',
- payload: this.state,
- });
- });
- };
-
- togglerContent = () => {
- const { collapse } = this.state;
- this.setState({ collapse: !collapse });
- };
-
- renderLayoutSettingItem = item => {
- const action = React.cloneElement(item.action, {
- disabled: item.disabled,
- });
- return (
-
-
- {item.title}
-
-
- );
- };
-
- render() {
- const { setting } = this.props;
- const { navTheme, primaryColor, layout, colorWeak } = setting;
- const { collapse } = this.state;
- return (
-
-
-
- }
- style={{
- zIndex: 999,
- }}
- >
-
-
-
this.changeSetting('navTheme', value)}
- />
-
-
- this.changeSetting('primaryColor', color)}
- />
-
-
-
-
- this.changeSetting('layout', value)}
- />
-
-
-
-
-
-
-
- this.changeSetting('colorWeak', checked)}
- />,
- ]}
- >
- {formatMessage({ id: 'app.setting.weakmode' })}
-
-
-
- message.success(formatMessage({ id: 'app.setting.copyinfo' }))}
- >
-
-
-
- {formatMessage({ id: 'app.setting.production.hint' })}{' '}
-
- src/defaultSettings.js
-
- 
} />;
- }
- if (icon.startsWith('icon-')) {
- return ;
- }
- return ;
- }
- return icon;
-};
-
-export default class BaseMenu extends PureComponent {
- /**
- * 获得菜单子节点
- * @memberof SiderMenu
- */
- getNavMenuItems = (menusData, parent) => {
- if (!menusData) {
- return [];
- }
- return menusData
- .filter(item => item.name && !item.hideInMenu)
- .map(item => this.getSubMenuOrItem(item, parent))
- .filter(item => item);
- };
-
- // Get the currently selected menu
- getSelectedMenuKeys = pathname => {
- const { flatMenuKeys } = this.props;
- return urlToList(pathname).map(itemPath => getMenuMatches(flatMenuKeys, itemPath).pop());
- };
-
- /**
- * get SubMenu or Item
- */
- getSubMenuOrItem = item => {
- // doc: add hideChildrenInMenu
- if (item.children && !item.hideChildrenInMenu && item.children.some(child => child.name)) {
- const { name } = item;
- return (
-
- {getIcon(item.icon)}
- {name}
-
- ) : (
- name
- )
- }
- key={item.path}
- >
- {this.getNavMenuItems(item.children)}
-
- );
- }
- return {this.getMenuItemPath(item)};
- };
-
- /**
- * 判断是否是http链接.返回 Link 或 a
- * Judge whether it is http link.return a or Link
- * @memberof SiderMenu
- */
- getMenuItemPath = item => {
- const { name } = item;
- const itemPath = this.conversionPath(item.path);
- const icon = getIcon(item.icon);
- const { target } = item;
- // Is it a http link
- if (/^https?:\/\//.test(itemPath)) {
- return (
-
- {icon}
- {name}
-
- );
- }
- const { location, isMobile, onCollapse } = this.props;
- return (
- {
- onCollapsetrue;
- }
- : undefined
- }
- >
- {icon}
- {name}
-
- );
- };
-
- conversionPath = path => {
- if (path && path.indexOf('http') === 0) {
- return path;
- }
- return `/${path || ''}`.replace(/\/+/g, '/');
- };
-
- render() {
- const {
- openKeys,
- theme,
- mode,
- location: { pathname },
- className,
- collapsed,
- } = this.props;
- // if pathname can't match, use the nearest parent's key
- let selectedKeys = this.getSelectedMenuKeys(pathname);
- if (!selectedKeys.length && openKeys) {
- selectedKeys = [openKeys[openKeys.length - 1]];
- }
- let props = {};
- if (openKeys && !collapsed) {
- props = {
- openKeys: openKeys.length === 0 ? [...selectedKeys] : openKeys,
- };
- }
- const { handleOpenChange, style, menuData } = this.props;
- const cls = classNames(className, {
- 'top-nav-menu': mode === 'horizontal',
- });
-
- return (
-
- );
- }
-}
diff --git a/admin-web/src/components/SiderMenu/SiderMenu.js b/admin-web/src/components/SiderMenu/SiderMenu.js
deleted file mode 100644
index da9520faa..000000000
--- a/admin-web/src/components/SiderMenu/SiderMenu.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { PureComponent, Suspense } from 'react';
-import { Layout } from 'antd';
-import classNames from 'classnames';
-import Link from 'umi/link';
-import styles from './index.less';
-import PageLoading from '../PageLoading';
-import { getDefaultCollapsedSubMenus } from './SiderMenuUtils';
-import { title } from '../../defaultSettings';
-
-const BaseMenu = React.lazy(() => import('./BaseMenu'));
-const { Sider } = Layout;
-
-let firstMount = true;
-
-export default class SiderMenu extends PureComponent {
- constructor(props) {
- super(props);
- this.state = {
- openKeys: getDefaultCollapsedSubMenus(props),
- };
- }
-
- componentDidMount() {
- firstMount = false;
- }
-
- static getDerivedStateFromProps(props, state) {
- const { pathname, flatMenuKeysLen } = state;
- if (props.location.pathname !== pathname || props.flatMenuKeys.length !== flatMenuKeysLen) {
- return {
- pathname: props.location.pathname,
- flatMenuKeysLen: props.flatMenuKeys.length,
- openKeys: getDefaultCollapsedSubMenus(props),
- };
- }
- return null;
- }
-
- isMainMenu = key => {
- const { menuData } = this.props;
- return menuData.some(item => {
- if (key) {
- return item.key === key || item.path === key;
- }
- return false;
- });
- };
-
- handleOpenChange = openKeys => {
- const moreThanOne = openKeys.filter(openKey => this.isMainMenu(openKey)).length > 1;
- this.setState({
- openKeys: moreThanOne ? [openKeys.pop()] : [...openKeys],
- });
- };
-
- render() {
- const { logo, collapsed, onCollapse, fixSiderbar, theme, isMobile } = this.props;
- const { openKeys } = this.state;
- const defaultProps = collapsed ? {} : { openKeys };
-
- const siderClassName = classNames(styles.sider, {
- [styles.fixSiderBar]: fixSiderbar,
- [styles.light]: theme === 'light',
- });
- return (
- {
- if (firstMount || !isMobile) {
- onCollapse(collapse);
- }
- }}
- width={256}
- theme={theme}
- className={siderClassName}
- >
-
-
-
-
{title}
-
-
- {title && (
-
- {title}
-
- )}
-
{children}
-
-
-
- 已选择 {selectedRowKeys.length} 项
- {needTotalList.map(item => (
-
- {item.title}
- 总计
-
- {item.render ? item.render(item.total) : item.total}
-
-
- ))}
-
- 清空
-
-
- }
- type="info"
- showIcon
- />
-
-
-
-
-
-
- 类目一
- 类目二
- 类目三
- 类目四
- 类目五
- 类目六
-
-
-
- {hideCheckAll ? null : (
-
- {selectAllText}
-
- )}
- {value &&
- React.Children.map(children, child => {
- if (this.isTagSelectOption(child)) {
- return React.cloneElement(child, {
- key: `tag-select-${child.props.value}`,
- value: child.props.value,
- checked: value.indexOf(child.props.value) > -1,
- onChange: this.handleTagChange,
- });
- }
- return child;
- })}
- {expandable && (
-
- {expand ? collapseText : expandText}
-
- )}
-
-
{
- this.maim = ref;
- }}
- className={`${styles.main} ${contentWidth === 'Fixed' ? styles.wide : ''}`}
- >
-
-
-
-
-
{title}
-
-
-
-
-
-
-
-
-
- 12%
- 11%
-
-, mountNode);
-```
diff --git a/admin-web/src/components/Trend/demo/reverse.md b/admin-web/src/components/Trend/demo/reverse.md
deleted file mode 100644
index 26f736672..000000000
--- a/admin-web/src/components/Trend/demo/reverse.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-order: 0
-title: 颜色反转
----
-
-在数值背后添加一个小图标来标识涨跌情况。
-
-```jsx
-import Trend from 'ant-design-pro/lib/Trend';
-
-ReactDOM.render(
-
- 12%
- 11%
-
-, mountNode);
-```
diff --git a/admin-web/src/components/Trend/index.d.ts b/admin-web/src/components/Trend/index.d.ts
deleted file mode 100644
index 7dc020103..000000000
--- a/admin-web/src/components/Trend/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import * as React from 'react';
-
-export interface ITrendProps {
- colorful?: boolean;
- flag: 'up' | 'down';
- style?: React.CSSProperties;
- reverseColor?: boolean;
-}
-
-export default class Trend extends React.Component {}
diff --git a/admin-web/src/components/Trend/index.js b/admin-web/src/components/Trend/index.js
deleted file mode 100644
index c476ef62c..000000000
--- a/admin-web/src/components/Trend/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import { Icon } from 'antd';
-import classNames from 'classnames';
-import styles from './index.less';
-
-const Trend = ({ colorful = true, reverseColor = false, flag, children, className, ...rest }) => {
- const classString = classNames(
- styles.trendItem,
- {
- [styles.trendItemGrey]: !colorful,
- [styles.reverseColor]: reverseColor && colorful,
- },
- className
- );
- return (
-
- {children}
- {flag && (
-
-
-
- )}
-
- );
-};
-
-export default Trend;
diff --git a/admin-web/src/components/Trend/index.less b/admin-web/src/components/Trend/index.less
deleted file mode 100644
index 13618838a..000000000
--- a/admin-web/src/components/Trend/index.less
+++ /dev/null
@@ -1,37 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.trendItem {
- display: inline-block;
- font-size: @font-size-base;
- line-height: 22px;
-
- .up,
- .down {
- position: relative;
- top: 1px;
- margin-left: 4px;
- i {
- font-size: 12px;
- transform: scale(0.83);
- }
- }
- .up {
- color: @red-6;
- }
- .down {
- top: -1px;
- color: @green-6;
- }
-
- &.trendItemGrey .up,
- &.trendItemGrey .down {
- color: @text-color;
- }
-
- &.reverseColor .up {
- color: @green-6;
- }
- &.reverseColor .down {
- color: @red-6;
- }
-}
diff --git a/admin-web/src/components/Trend/index.md b/admin-web/src/components/Trend/index.md
deleted file mode 100644
index 96d83b853..000000000
--- a/admin-web/src/components/Trend/index.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: Trend
-subtitle: 趋势标记
-cols: 1
-order: 14
----
-
-趋势符号，标记上升和下降趋势。通常用绿色代表“好”，红色代表“不好”，股票涨跌场景除外。
-
-## API
-
-```html
-50%
-```
-
-| 参数 | 说明 | 类型 | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| colorful | 是否彩色标记 | Boolean | true |
-| flag | 上升下降标识：`up|down` | string | - |
-| reverseColor | 颜色反转 | Boolean | false |
diff --git a/admin-web/src/components/_utils/pathTools.js b/admin-web/src/components/_utils/pathTools.js
deleted file mode 100644
index bfb94e74e..000000000
--- a/admin-web/src/components/_utils/pathTools.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// /userinfo/2144/id => ['/userinfo','/useinfo/2144,'/userindo/2144/id']
-// eslint-disable-next-line import/prefer-default-export
-export function urlToList(url) {
- const urllist = url.split('/').filter(i => i);
- return urllist.map((urlItem, index) => `/${urllist.slice(0, index + 1).join('/')}`);
-}
diff --git a/admin-web/src/components/_utils/pathTools.test.js b/admin-web/src/components/_utils/pathTools.test.js
deleted file mode 100644
index a9b931551..000000000
--- a/admin-web/src/components/_utils/pathTools.test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { urlToList } from './pathTools';
-
-describe('test urlToList', () => {
- it('A path', () => {
- expect(urlToList('/userinfo')).toEqual(['/userinfo']);
- });
- it('Secondary path', () => {
- expect(urlToList('/userinfo/2144')).toEqual(['/userinfo', '/userinfo/2144']);
- });
- it('Three paths', () => {
- expect(urlToList('/userinfo/2144/addr')).toEqual([
- '/userinfo',
- '/userinfo/2144',
- '/userinfo/2144/addr',
- ]);
- });
-});
diff --git a/admin-web/src/defaultSettings.js b/admin-web/src/defaultSettings.js
deleted file mode 100644
index 5a3dc1b2e..000000000
--- a/admin-web/src/defaultSettings.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
- navTheme: 'dark', // theme for nav menu
- primaryColor: '#1890FF', // primary color of ant design
- layout: 'sidemenu', // nav menu position: sidemenu or topmenu
- contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu
- fixedHeader: false, // sticky header
- autoHideHeader: false, // auto hide header
- fixSiderbar: false, // sticky siderbar
- menu: {
- disableLocal: false,
- },
- title: '一个商城管理平台',
- pwa: true,
- // your iconfont Symbol Scrip Url
- // eg：//at.alicdn.com/t/font_1039637_btcrd5co4w.js
- // 注意：如果需要图标多色，Iconfont图标项目里要进行批量去色处理
- iconfontUrl: '',
-};
diff --git a/admin-web/src/e2e/baseLayout.e2e.js b/admin-web/src/e2e/baseLayout.e2e.js
deleted file mode 100644
index 74938719d..000000000
--- a/admin-web/src/e2e/baseLayout.e2e.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import RouterConfig from '../../config/router.config';
-
-const BASE_URL = `http://localhost:${process.env.PORT || 8000}`;
-
-function formatter(data) {
- return data
- .reduce((pre, item) => {
- pre.push(item.path);
- return pre;
- }, [])
- .filter(item => item);
-}
-
-describe('Homepage', async () => {
- const testPage = path => async () => {
- await page.goto(`${BASE_URL}${path}`);
- await page.waitForSelector('footer', {
- timeout: 2000,
- });
- const haveFooter = await page.evaluate(
- () => document.getElementsByTagName('footer').length > 0
- );
- expect(haveFooter).toBeTruthy();
- };
-
- beforeAll(async () => {
- jest.setTimeout(1000000);
- await page.setCacheEnabled(false);
- });
- const routers = formatter(RouterConfig[1].routes);
- routers.forEach(route => {
- it(`test pages ${route}`, testPage(route));
- });
-});
diff --git a/admin-web/src/e2e/home.e2e.js b/admin-web/src/e2e/home.e2e.js
deleted file mode 100644
index 0531d5f4b..000000000
--- a/admin-web/src/e2e/home.e2e.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const BASE_URL = `http://localhost:${process.env.PORT || 8000}`;
-
-describe('Homepage', () => {
- beforeAll(async () => {
- jest.setTimeout(1000000);
- });
- it('it should have logo text', async () => {
- await page.goto(BASE_URL);
- await page.waitForSelector('h1', {
- timeout: 5000,
- });
- const text = await page.evaluate(() => document.getElementsByTagName('h1')[0].innerText);
- expect(text).toContain('Ant Design Pro');
- });
-});
diff --git a/admin-web/src/e2e/login.e2e.js b/admin-web/src/e2e/login.e2e.js
deleted file mode 100644
index b991af44b..000000000
--- a/admin-web/src/e2e/login.e2e.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const BASE_URL = `http://localhost:${process.env.PORT || 8000}`;
-
-describe('Login', () => {
- beforeAll(async () => {
- jest.setTimeout(1000000);
- });
-
- beforeEach(async () => {
- await page.goto(`${BASE_URL}/user/login`, { waitUntil: 'networkidle2' });
- await page.evaluate(() => window.localStorage.setItem('antd-pro-authority', 'guest'));
- });
-
- it('should login with failure', async () => {
- await page.waitForSelector('#userName', {
- timeout: 2000,
- });
- await page.type('#userName', 'mockuser');
- await page.type('#password', 'wrong_password');
- await page.click('button[type="submit"]');
- await page.waitForSelector('.ant-alert-error'); // should display error
- });
-
- it('should login successfully', async () => {
- await page.waitForSelector('#userName', {
- timeout: 2000,
- });
- await page.type('#userName', 'admin');
- await page.type('#password', 'ant.design');
- await page.click('button[type="submit"]');
- await page.waitForSelector('.ant-layout-sider h1'); // should display error
- const text = await page.evaluate(() => document.body.innerHTML);
- expect(text).toContain('Ant Design Pro
');
- });
-});
diff --git a/admin-web/src/e2e/topMenu.e2e.js b/admin-web/src/e2e/topMenu.e2e.js
deleted file mode 100644
index 51ff9f35c..000000000
--- a/admin-web/src/e2e/topMenu.e2e.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const BASE_URL = `http://localhost:${process.env.PORT || 8000}`;
-
-describe('Homepage', () => {
- beforeAll(async () => {
- jest.setTimeout(1000000);
- });
- it('topmenu should have footer', async () => {
- const params = '/form/basic-form?navTheme=light&layout=topmenu';
- await page.goto(`${BASE_URL}${params}`);
- await page.waitForSelector('footer', {
- timeout: 2000,
- });
- const haveFooter = await page.evaluate(
- () => document.getElementsByTagName('footer').length > 0
- );
- expect(haveFooter).toBeTruthy();
- });
-});
diff --git a/admin-web/src/e2e/userLayout.e2e.js b/admin-web/src/e2e/userLayout.e2e.js
deleted file mode 100644
index a2edfc7b8..000000000
--- a/admin-web/src/e2e/userLayout.e2e.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import RouterConfig from '../../config/router.config';
-
-const BASE_URL = `http://localhost:${process.env.PORT || 8000}`;
-
-function formatter(data) {
- return data
- .reduce((pre, item) => {
- pre.push(item.path);
- return pre;
- }, [])
- .filter(item => item);
-}
-
-describe('Homepage', () => {
- const testPage = path => async () => {
- await page.goto(`${BASE_URL}${path}`);
- await page.waitForSelector('footer', {
- timeout: 2000,
- });
- const haveFooter = await page.evaluate(
- () => document.getElementsByTagName('footer').length > 0
- );
- expect(haveFooter).toBeTruthy();
- };
-
- beforeAll(async () => {
- jest.setTimeout(1000000);
- });
- formatter(RouterConfig[0].routes).forEach(route => {
- it(`test pages ${route}`, testPage(route));
- });
-});
diff --git a/admin-web/src/global.js b/admin-web/src/global.js
deleted file mode 100644
index bebe4829c..000000000
--- a/admin-web/src/global.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { notification, Button, message } from 'antd';
-import { formatMessage } from 'umi/locale';
-import defaultSettings from './defaultSettings';
-
-window.React = React;
-
-const { pwa } = defaultSettings;
-// if pwa is true
-if (pwa) {
- // Notify user if offline now
- window.addEventListener('sw.offline', () => {
- message.warning(formatMessage({ id: 'app.pwa.offline' }));
- });
-
- // Pop up a prompt on the page asking the user if they want to use the latest version
- window.addEventListener('sw.updated', e => {
- const reloadSW = async () => {
- // Check if there is sw whose state is waiting in ServiceWorkerRegistration
- // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration
- const worker = e.detail && e.detail.waiting;
- if (!worker) {
- return Promise.resolve();
- }
- // Send skip-waiting event to waiting SW with MessageChannel
- await new Promise((resolve, reject) => {
- const channel = new MessageChannel();
- channel.port1.onmessage = event => {
- if (event.data.error) {
- reject(event.data.error);
- } else {
- resolve(event.data);
- }
- };
- worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
- });
- // Refresh current page to use the updated HTML and other assets after SW has skiped waiting
- window.location.reload(true);
- return true;
- };
- const key = `open${Date.now()}`;
- const btn = (
-
- );
- notification.open({
- message: formatMessage({ id: 'app.pwa.serviceworker.updated' }),
- description: formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
- btn,
- key,
- onClose: async () => {},
- });
- });
-}
diff --git a/admin-web/src/global.less b/admin-web/src/global.less
deleted file mode 100644
index 1450ba46b..000000000
--- a/admin-web/src/global.less
+++ /dev/null
@@ -1,52 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-html,
-body,
-#root {
- height: 100%;
-}
-
-.colorWeak {
- filter: invert(80%);
-}
-
-.ant-layout {
- min-height: 100vh;
-}
-
-canvas {
- display: block;
-}
-
-body {
- text-rendering: optimizeLegibility;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.globalSpin {
- width: 100%;
- margin: 40px 0 !important;
-}
-
-ul,
-ol {
- list-style: none;
-}
-
-@media (max-width: @screen-xs) {
- .ant-table {
- width: 100%;
- overflow-x: auto;
- &-thead > tr,
- &-tbody > tr {
- > th,
- > td {
- white-space: pre;
- > span {
- display: block;
- }
- }
- }
- }
-}
diff --git a/admin-web/src/layouts/BasicLayout.js b/admin-web/src/layouts/BasicLayout.js
deleted file mode 100644
index 574788052..000000000
--- a/admin-web/src/layouts/BasicLayout.js
+++ /dev/null
@@ -1,233 +0,0 @@
-import React, { Suspense } from 'react';
-import { Layout } from 'antd';
-import DocumentTitle from 'react-document-title';
-import { connect } from 'dva';
-import { ContainerQuery } from 'react-container-query';
-import classNames from 'classnames';
-import pathToRegexp from 'path-to-regexp';
-import Media from 'react-media';
-import Authorized from '@/utils/Authorized';
-import logo from '../assets/logo.svg';
-import Footer from './Footer';
-import Header from './Header';
-import Context from './MenuContext';
-import UrlsContext from './UrlsContext';
-import Exception403 from '../pages/Exception/403';
-import PageLoading from '@/components/PageLoading';
-import SiderMenu from '@/components/SiderMenu';
-import getPageTitle from '@/utils/getPageTitle';
-import DictionaryContext from '@/components/Dictionary/DictionaryContext';
-import styles from './BasicLayout.less';
-
-// lazy load SettingDrawer
-const SettingDrawer = React.lazy(() => import('@/components/SettingDrawer'));
-
-const { Content } = Layout;
-
-const query = {
- 'screen-xs': {
- maxWidth: 575,
- },
- 'screen-sm': {
- minWidth: 576,
- maxWidth: 767,
- },
- 'screen-md': {
- minWidth: 768,
- maxWidth: 991,
- },
- 'screen-lg': {
- minWidth: 992,
- maxWidth: 1199,
- },
- 'screen-xl': {
- minWidth: 1200,
- maxWidth: 1599,
- },
- 'screen-xxl': {
- minWidth: 1600,
- },
-};
-
-class BasicLayout extends React.Component {
- componentDidMount() {
- const {
- dispatch,
- route: { routes, authority },
- } = this.props;
- dispatch({
- type: 'user/fetchCurrent',
- });
- dispatch({
- type: 'setting/getSetting',
- });
- dispatch({
- type: 'menu/getUrlsData',
- payload: { routes, authority },
- });
- dispatch({
- type: 'menu/getMenuData',
- payload: { routes, authority },
- });
- dispatch({
- type: 'dictionaryContext/tree',
- payload: {},
- });
- }
-
- getContext() {
- const { location, breadcrumbNameMap } = this.props;
- return {
- location,
- breadcrumbNameMap,
- };
- }
-
- getUrlsContext() {
- const { urlsData } = this.props;
- return {
- urls: {
- ...urlsData,
- },
- };
- }
-
- getDictionaryContext() {
- const { dicTreeMap } = this.props;
- return dicTreeMap;
- }
-
- getRouteAuthority = (pathname, routeData) => {
- const routes = routeData.slice(); // clone
-
- const getAuthority = (routeDatas, path) => {
- let authorities;
- routeDatas.forEach(route => {
- // check partial route
- if (pathToRegexp(`${route.path}(.*)`).test(path)) {
- if (route.authority) {
- authorities = route.authority;
- }
- // is exact route?
- if (!pathToRegexp(route.path).test(path) && route.routes) {
- authorities = getAuthority(route.routes, path);
- }
- }
- });
- return authorities;
- };
-
- return getAuthority(routes, pathname);
- };
-
- getLayoutStyle = () => {
- const { fixSiderbar, isMobile, collapsed, layout } = this.props;
- if (fixSiderbar && layout !== 'topmenu' && !isMobile) {
- return {
- paddingLeft: collapsed ? '80px' : '256px',
- };
- }
- return null;
- };
-
- handleMenuCollapse = collapsed => {
- const { dispatch } = this.props;
- dispatch({
- type: 'global/changeLayoutCollapsed',
- payload: collapsed,
- });
- };
-
- renderSettingDrawer = () => {
- // Do not render SettingDrawer in production
- // unless it is deployed in preview.pro.ant.design as demo
- if (process.env.NODE_ENV === 'production' && APP_TYPE !== 'site') {
- return null;
- }
- return ;
- };
-
- render() {
- const {
- navTheme,
- layout: PropsLayout,
- children,
- location: { pathname },
- isMobile,
- menuData,
- breadcrumbNameMap,
- route: { routes },
- fixedHeader,
- } = this.props;
-
- const isTop = PropsLayout === 'topmenu';
- const routerConfig = this.getRouteAuthority(pathname, routes);
- const contentStyle = !fixedHeader ? { paddingTop: 0 } : {};
- const layout = (
-
- {isTop && !isMobile ? null : (
-
- )}
-
-
-
- }>
- {children}
-
-
-
-
-
- );
- return (
-
-
-
- {params => (
-
-
-
- {layout}
-
-
-
- )}
-
-
- }>{this.renderSettingDrawer()}
-
- );
- }
-}
-
-export default connect(({ global, setting, dictionaryContext, menu: menuModel }) => ({
- collapsed: global.collapsed,
- layout: setting.layout,
- menuData: menuModel.menuData,
- urlsData: menuModel.urlsData,
- breadcrumbNameMap: menuModel.breadcrumbNameMap,
- dicTreeMap: dictionaryContext.dicTreeMap,
- ...setting,
-}))(props => (
-
- {isMobile => }
-
-));
diff --git a/admin-web/src/layouts/BasicLayout.less b/admin-web/src/layouts/BasicLayout.less
deleted file mode 100644
index 60beb6092..000000000
--- a/admin-web/src/layouts/BasicLayout.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.content {
- margin: 24px;
- padding-top: @layout-header-height;
-}
diff --git a/admin-web/src/layouts/BlankLayout.js b/admin-web/src/layouts/BlankLayout.js
deleted file mode 100644
index ef39aa4c2..000000000
--- a/admin-web/src/layouts/BlankLayout.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-
-export default ({ children }) => {children}
;
diff --git a/admin-web/src/layouts/Footer.js b/admin-web/src/layouts/Footer.js
deleted file mode 100644
index 693c81721..000000000
--- a/admin-web/src/layouts/Footer.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, { Fragment } from 'react';
-import { Layout, Icon } from 'antd';
-import GlobalFooter from '@/components/GlobalFooter';
-
-const { Footer } = Layout;
-const FooterView = () => (
-
-);
-export default FooterView;
diff --git a/admin-web/src/layouts/Header.js b/admin-web/src/layouts/Header.js
deleted file mode 100644
index 0059ee7ea..000000000
--- a/admin-web/src/layouts/Header.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import React, { Component } from 'react';
-import { formatMessage } from 'umi/locale';
-import { Layout, message } from 'antd';
-import Animate from 'rc-animate';
-import { connect } from 'dva';
-import router from 'umi/router';
-import GlobalHeader from '@/components/GlobalHeader';
-import TopNavHeader from '@/components/TopNavHeader';
-import styles from './Header.less';
-
-const { Header } = Layout;
-
-class HeaderView extends Component {
- state = {
- visible: true,
- };
-
- static getDerivedStateFromProps(props, state) {
- if (!props.autoHideHeader && !state.visible) {
- return {
- visible: true,
- };
- }
- return null;
- }
-
- componentDidMount() {
- document.addEventListener('scroll', this.handScroll, { passive: true });
- }
-
- componentWillUnmount() {
- document.removeEventListener('scroll', this.handScroll);
- }
-
- getHeadWidth = () => {
- const { isMobile, collapsed, setting } = this.props;
- const { fixedHeader, layout } = setting;
- if (isMobile || !fixedHeader || layout === 'topmenu') {
- return '100%';
- }
- return collapsed ? 'calc(100% - 80px)' : 'calc(100% - 256px)';
- };
-
- handleNoticeClear = type => {
- message.success(
- `${formatMessage({ id: 'component.noticeIcon.cleared' })} ${formatMessage({
- id: `component.globalHeader.${type}`,
- })}`
- );
- const { dispatch } = this.props;
- dispatch({
- type: 'global/clearNotices',
- payload: type,
- });
- };
-
- handleMenuClick = ({ key }) => {
- const { dispatch } = this.props;
- if (key === 'userCenter') {
- router.push('/account/center');
- return;
- }
- if (key === 'triggerError') {
- router.push('/exception/trigger');
- return;
- }
- if (key === 'userinfo') {
- router.push('/account/settings/base');
- return;
- }
- if (key === 'logout') {
- dispatch({
- type: 'login/logout',
- });
- }
- };
-
- handleNoticeVisibleChange = visible => {
- if (visible) {
- const { dispatch } = this.props;
- dispatch({
- type: 'global/fetchNotices',
- });
- }
- };
-
- handScroll = () => {
- const { autoHideHeader } = this.props;
- const { visible } = this.state;
- if (!autoHideHeader) {
- return;
- }
- const scrollTop = document.body.scrollTop + document.documentElement.scrollTop;
- if (!this.ticking) {
- this.ticking = true;
- requestAnimationFrame(() => {
- if (this.oldScrollTop > scrollTop) {
- this.setState({
- visible: true,
- });
- } else if (scrollTop > 300 && visible) {
- this.setState({
- visible: false,
- });
- } else if (scrollTop < 300 && !visible) {
- this.setState({
- visible: true,
- });
- }
- this.oldScrollTop = scrollTop;
- this.ticking = false;
- });
- }
- };
-
- render() {
- const { isMobile, handleMenuCollapse, setting } = this.props;
- const { navTheme, layout, fixedHeader } = setting;
- const { visible } = this.state;
- const isTop = layout === 'topmenu';
- const width = this.getHeadWidth();
- const HeaderDom = visible ? (
-
- {isTop && !isMobile ? (
-
- ) : (
-
- )}
-
- ) : null;
- return (
-
- {HeaderDom}
-
- );
- }
-}
-
-export default connect(({ user, global, setting, loading }) => ({
- currentUser: user.currentUser,
- collapsed: global.collapsed,
- fetchingMoreNotices: loading.effects['global/fetchMoreNotices'],
- fetchingNotices: loading.effects['global/fetchNotices'],
- loadedAllNotices: global.loadedAllNotices,
- notices: global.notices,
- setting,
-}))(HeaderView);
diff --git a/admin-web/src/layouts/Header.less b/admin-web/src/layouts/Header.less
deleted file mode 100644
index cc2da9629..000000000
--- a/admin-web/src/layouts/Header.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.fixedHeader {
- position: fixed;
- top: 0;
- right: 0;
- z-index: 9;
- width: 100%;
- transition: width 0.2s;
-}
diff --git a/admin-web/src/layouts/MenuContext.js b/admin-web/src/layouts/MenuContext.js
deleted file mode 100644
index 860f10686..000000000
--- a/admin-web/src/layouts/MenuContext.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createContext } from 'react';
-
-export default createContext();
diff --git a/admin-web/src/layouts/UrlsContext.js b/admin-web/src/layouts/UrlsContext.js
deleted file mode 100644
index 860f10686..000000000
--- a/admin-web/src/layouts/UrlsContext.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createContext } from 'react';
-
-export default createContext();
diff --git a/admin-web/src/layouts/UserLayout.js b/admin-web/src/layouts/UserLayout.js
deleted file mode 100644
index c1250f42b..000000000
--- a/admin-web/src/layouts/UserLayout.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, { Component, Fragment } from 'react';
-import { formatMessage } from 'umi/locale';
-import { connect } from 'dva';
-import Link from 'umi/link';
-import { Icon } from 'antd';
-import GlobalFooter from '@/components/GlobalFooter';
-import DocumentTitle from 'react-document-title';
-import SelectLang from '@/components/SelectLang';
-import styles from './UserLayout.less';
-import logo from '../assets/logo.svg';
-import getPageTitle from '@/utils/getPageTitle';
-
-const links = [
- {
- key: 'help',
- title: formatMessage({ id: 'layout.user.link.help' }),
- href: '',
- },
- {
- key: 'privacy',
- title: formatMessage({ id: 'layout.user.link.privacy' }),
- href: '',
- },
- {
- key: 'terms',
- title: formatMessage({ id: 'layout.user.link.terms' }),
- href: '',
- },
-];
-
-const copyright = (
- 请使用谷歌浏览器(Chrome)获取最佳用户体验
-);
-
-class UserLayout extends Component {
- componentDidMount() {
- // const {
- // dispatch,
- // route: { routes, authority },
- // } = this.props;
- // dispatch({
- // type: 'menu/getMenuData',
- // payload: { routes, authority },
- // });
- }
-
- render() {
- const {
- children,
- location: { pathname },
- breadcrumbNameMap,
- } = this.props;
- return (
-
-
-
-
-
-
-
-
-
-
-
一个商城管理平台
-
-
- {/*
TODO....
*/}
-
- {children}
-
-
-
(
-
-
-
- ,
-
-
- ,
-
-
- ,
-
-
- ,
- ]}
- >
- } title={item.title} />
-
-
-
-
-
- )}
- />
- );
- }
-}
-
-export default Center;
diff --git a/admin-web/src/pages/Account/Center/Articles.js b/admin-web/src/pages/Account/Center/Articles.js
deleted file mode 100644
index 9bb5ac309..000000000
--- a/admin-web/src/pages/Account/Center/Articles.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { PureComponent } from 'react';
-import { List, Icon, Tag } from 'antd';
-import { connect } from 'dva';
-import ArticleListContent from '@/components/ArticleListContent';
-import styles from './Articles.less';
-
-@connect(({ list }) => ({
- list,
-}))
-class Center extends PureComponent {
- render() {
- const {
- list: { list },
- } = this.props;
- const IconText = ({ type, text }) => (
-
-
- {text}
-
- );
- return (
- (
- ,
- ,
- ,
- ]}
- >
-
- {item.title}
-
- }
- description={
-
- Ant Design
- 设计语言
- 蚂蚁金服
-
- }
- />
-
-
- )}
- />
- );
- }
-}
-
-export default Center;
diff --git a/admin-web/src/pages/Account/Center/Articles.less b/admin-web/src/pages/Account/Center/Articles.less
deleted file mode 100644
index 2e51509ba..000000000
--- a/admin-web/src/pages/Account/Center/Articles.less
+++ /dev/null
@@ -1,12 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.articleList {
- :global {
- .ant-list-item:first-child {
- padding-top: 0;
- }
- }
-}
-a.listItemMetaTitle {
- color: @heading-color;
-}
diff --git a/admin-web/src/pages/Account/Center/Center.js b/admin-web/src/pages/Account/Center/Center.js
deleted file mode 100644
index d2512f95b..000000000
--- a/admin-web/src/pages/Account/Center/Center.js
+++ /dev/null
@@ -1,216 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect } from 'dva';
-import Link from 'umi/link';
-import router from 'umi/router';
-import { Card, Row, Col, Icon, Avatar, Tag, Divider, Spin, Input } from 'antd';
-import GridContent from '@/components/PageHeaderWrapper/GridContent';
-import styles from './Center.less';
-
-@connect(({ loading, user, project }) => ({
- listLoading: loading.effects['list/fetch'],
- currentUser: user.currentUser,
- currentUserLoading: loading.effects['user/fetchCurrent'],
- project,
- projectLoading: loading.effects['project/fetchNotice'],
-}))
-class Center extends PureComponent {
- state = {
- newTags: [],
- inputVisible: false,
- inputValue: '',
- };
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'user/fetchCurrent',
- });
- dispatch({
- type: 'list/fetch',
- payload: {
- count: 8,
- },
- });
- dispatch({
- type: 'project/fetchNotice',
- });
- }
-
- onTabChange = key => {
- const { match } = this.props;
- switch (key) {
- case 'articles':
- router.push(`${match.url}/articles`);
- break;
- case 'applications':
- router.push(`${match.url}/applications`);
- break;
- case 'projects':
- router.push(`${match.url}/projects`);
- break;
- default:
- break;
- }
- };
-
- showInput = () => {
- this.setState({ inputVisible: true }, () => this.input.focus());
- };
-
- saveInputRef = input => {
- this.input = input;
- };
-
- handleInputChange = e => {
- this.setState({ inputValue: e.target.value });
- };
-
- handleInputConfirm = () => {
- const { state } = this;
- const { inputValue } = state;
- let { newTags } = state;
- if (inputValue && newTags.filter(tag => tag.label === inputValue).length === 0) {
- newTags = [...newTags, { key: `new-${newTags.length}`, label: inputValue }];
- }
- this.setState({
- newTags,
- inputVisible: false,
- inputValue: '',
- });
- };
-
- render() {
- const { newTags, inputVisible, inputValue } = this.state;
- const {
- listLoading,
- currentUser,
- currentUserLoading,
- project: { notice },
- projectLoading,
- match,
- location,
- children,
- } = this.props;
-
- const operationTabList = [
- {
- key: 'articles',
- tab: (
-
- 文章 (8)
-
- ),
- },
- {
- key: 'applications',
- tab: (
-
- 应用 (8)
-
- ),
- },
- {
- key: 'projects',
- tab: (
-
- 项目 (8)
-
- ),
- },
- ];
-
- return (
-
-
-
-
- {currentUser && Object.keys(currentUser).length ? (
-
-
-
-
{currentUser.name}
-
{currentUser.signature}
-
-
-
-
- {currentUser.title}
-
-
-
- {currentUser.group}
-
-
-
- {currentUser.geographic.province.label}
- {currentUser.geographic.city.label}
-
-
-
-
-
标签
- {currentUser.tags.concat(newTags).map(item => (
-
{item.label}
- ))}
- {inputVisible && (
-
- )}
- {!inputVisible && (
-
-
-
- )}
-
-
-
-
团队
-
-
- {notice.map(item => (
-
-
-
- {item.member}
-
-
- ))}
-
-
-
-
-
- );
- }
-}
-
-export default Center;
diff --git a/admin-web/src/pages/Account/Center/Center.less b/admin-web/src/pages/Account/Center/Center.less
deleted file mode 100644
index f6434fafb..000000000
--- a/admin-web/src/pages/Account/Center/Center.less
+++ /dev/null
@@ -1,97 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.avatarHolder {
- margin-bottom: 24px;
- text-align: center;
-
- & > img {
- width: 104px;
- height: 104px;
- margin-bottom: 20px;
- }
-
- .name {
- margin-bottom: 4px;
- color: @heading-color;
- font-weight: 500;
- font-size: 20px;
- line-height: 28px;
- }
-}
-
-.detail {
- p {
- position: relative;
- margin-bottom: 8px;
- padding-left: 26px;
-
- &:last-child {
- margin-bottom: 0;
- }
- }
-
- i {
- position: absolute;
- top: 4px;
- left: 0;
- width: 14px;
- height: 14px;
- background: url(https://gw.alipayobjects.com/zos/rmsportal/pBjWzVAHnOOtAUvZmZfy.svg);
-
- &.title {
- background-position: 0 0;
- }
-
- &.group {
- background-position: 0 -22px;
- }
-
- &.address {
- background-position: 0 -44px;
- }
- }
-}
-
-.tagsTitle,
-.teamTitle {
- margin-bottom: 12px;
- color: @heading-color;
- font-weight: 500;
-}
-
-.tags {
- :global {
- .ant-tag {
- margin-bottom: 8px;
- }
- }
-}
-
-.team {
- :global {
- .ant-avatar {
- margin-right: 12px;
- }
- }
-
- a {
- display: block;
- margin-bottom: 24px;
- color: @text-color;
- transition: color 0.3s;
- .textOverflow();
-
- &:hover {
- color: @primary-color;
- }
- }
-}
-
-.tabsCard {
- :global {
- .ant-card-head {
- padding: 0 16px;
- }
- }
-}
diff --git a/admin-web/src/pages/Account/Center/Projects.js b/admin-web/src/pages/Account/Center/Projects.js
deleted file mode 100644
index ac749fdb5..000000000
--- a/admin-web/src/pages/Account/Center/Projects.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { PureComponent } from 'react';
-import { List, Card } from 'antd';
-import moment from 'moment';
-import { connect } from 'dva';
-import AvatarList from '@/components/AvatarList';
-import stylesProjects from '../../List/Projects.less';
-
-@connect(({ list }) => ({
- list,
-}))
-class Center extends PureComponent {
- render() {
- const {
- list: { list },
- } = this.props;
- return (
- (
-
- }
- >
- {item.title}} description={item.subDescription} />
-
-
{moment(item.updatedAt).fromNow()}
-
-
- {item.members.map(member => (
-
- ))}
-
-
-
-
-
-
-
-
-
-
-
-
-);
-
-const validatorGeographic = (rule, value, callback) => {
- const { province, city } = value;
- if (!province.key) {
- callback('Please input your province!');
- }
- if (!city.key) {
- callback('Please input your city!');
- }
- callback();
-};
-
-const validatorPhone = (rule, value, callback) => {
- const values = value.split('-');
- if (!values[0]) {
- callback('Please input your area code!');
- }
- if (!values[1]) {
- callback('Please input your phone number!');
- }
- callback();
-};
-
-@connect(({ user }) => ({
- currentUser: user.currentUser,
-}))
-@Form.create()
-class BaseView extends Component {
- componentDidMount() {
- this.setBaseInfo();
- }
-
- setBaseInfo = () => {
- const { currentUser, form } = this.props;
- Object.keys(form.getFieldsValue()).forEach(key => {
- const obj = {};
- obj[key] = currentUser[key] || null;
- form.setFieldsValue(obj);
- });
- };
-
- getAvatarURL() {
- const { currentUser } = this.props;
- if (currentUser.avatar) {
- return currentUser.avatar;
- }
- const url = 'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png';
- return url;
- }
-
- getViewDom = ref => {
- this.view = ref;
- };
-
- render() {
- const {
- form: { getFieldDecorator },
- } = this.props;
- return (
-
- );
- }
-}
-
-export default BaseView;
diff --git a/admin-web/src/pages/Account/Settings/BaseView.less b/admin-web/src/pages/Account/Settings/BaseView.less
deleted file mode 100644
index e1b09e937..000000000
--- a/admin-web/src/pages/Account/Settings/BaseView.less
+++ /dev/null
@@ -1,52 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.baseView {
- display: flex;
- padding-top: 12px;
-
- .left {
- min-width: 224px;
- max-width: 448px;
- }
- .right {
- flex: 1;
- padding-left: 104px;
- .avatar_title {
- height: 22px;
- margin-bottom: 8px;
- color: @heading-color;
- font-size: @font-size-base;
- line-height: 22px;
- }
- .avatar {
- width: 144px;
- height: 144px;
- margin-bottom: 12px;
- overflow: hidden;
- img {
- width: 100%;
- }
- }
- .button_view {
- width: 144px;
- text-align: center;
- }
- }
-}
-
-@media screen and (max-width: @screen-xl) {
- .baseView {
- flex-direction: column-reverse;
-
- .right {
- display: flex;
- flex-direction: column;
- align-items: center;
- max-width: 448px;
- padding: 20px;
- .avatar_title {
- display: none;
- }
- }
- }
-}
diff --git a/admin-web/src/pages/Account/Settings/BindingView.js b/admin-web/src/pages/Account/Settings/BindingView.js
deleted file mode 100644
index 29a29890c..000000000
--- a/admin-web/src/pages/Account/Settings/BindingView.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { Component, Fragment } from 'react';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import { Icon, List } from 'antd';
-
-class BindingView extends Component {
- getData = () => [
- {
- title: formatMessage({ id: 'app.settings.binding.taobao' }, {}),
- description: formatMessage({ id: 'app.settings.binding.taobao-description' }, {}),
- actions: [
-
-
- ,
- ],
- avatar: ,
- },
- {
- title: formatMessage({ id: 'app.settings.binding.alipay' }, {}),
- description: formatMessage({ id: 'app.settings.binding.alipay-description' }, {}),
- actions: [
-
-
- ,
- ],
- avatar: ,
- },
- {
- title: formatMessage({ id: 'app.settings.binding.dingding' }, {}),
- description: formatMessage({ id: 'app.settings.binding.dingding-description' }, {}),
- actions: [
-
-
- ,
- ],
- avatar: ,
- },
- ];
-
- render() {
- return (
-
- (
-
-
-
- )}
- />
-
- );
- }
-}
-
-export default BindingView;
diff --git a/admin-web/src/pages/Account/Settings/GeographicView.js b/admin-web/src/pages/Account/Settings/GeographicView.js
deleted file mode 100644
index d33cb1387..000000000
--- a/admin-web/src/pages/Account/Settings/GeographicView.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import React, { PureComponent } from 'react';
-import { Select, Spin } from 'antd';
-import { connect } from 'dva';
-import styles from './GeographicView.less';
-
-const { Option } = Select;
-
-const nullSlectItem = {
- label: '',
- key: '',
-};
-
-@connect(({ geographic }) => {
- const { province, isLoading, city } = geographic;
- return {
- province,
- city,
- isLoading,
- };
-})
-class GeographicView extends PureComponent {
- componentDidMount = () => {
- const { dispatch } = this.props;
- dispatch({
- type: 'geographic/fetchProvince',
- });
- };
-
- componentDidUpdate(props) {
- const { dispatch, value } = this.props;
-
- if (!props.value && !!value && !!value.province) {
- dispatch({
- type: 'geographic/fetchCity',
- payload: value.province.key,
- });
- }
- }
-
- getProvinceOption() {
- const { province } = this.props;
- return this.getOption(province);
- }
-
- getCityOption = () => {
- const { city } = this.props;
- return this.getOption(city);
- };
-
- getOption = list => {
- if (!list || list.length < 1) {
- return (
-
- );
- }
- return list.map(item => (
-
- ));
- };
-
- selectProvinceItem = item => {
- const { dispatch, onChange } = this.props;
- dispatch({
- type: 'geographic/fetchCity',
- payload: item.key,
- });
- onChange({
- province: item,
- city: nullSlectItem,
- });
- };
-
- selectCityItem = item => {
- const { value, onChange } = this.props;
- onChange({
- province: value.province,
- city: item,
- });
- };
-
- conversionObject() {
- const { value } = this.props;
- if (!value) {
- return {
- province: nullSlectItem,
- city: nullSlectItem,
- };
- }
- const { province, city } = value;
- return {
- province: province || nullSlectItem,
- city: city || nullSlectItem,
- };
- }
-
- render() {
- const { province, city } = this.conversionObject();
- const { isLoading } = this.props;
- return (
-
-
-
-
- );
- }
-}
-
-export default GeographicView;
diff --git a/admin-web/src/pages/Account/Settings/GeographicView.less b/admin-web/src/pages/Account/Settings/GeographicView.less
deleted file mode 100644
index fdc975003..000000000
--- a/admin-web/src/pages/Account/Settings/GeographicView.less
+++ /dev/null
@@ -1,19 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.row {
- .item {
- width: 50%;
- max-width: 220px;
- }
- .item:first-child {
- width: ~'calc(50% - 8px)';
- margin-right: 8px;
- }
-}
-
-@media screen and (max-width: @screen-sm) {
- .item:first-child {
- margin: 0;
- margin-bottom: 8px;
- }
-}
diff --git a/admin-web/src/pages/Account/Settings/Info.js b/admin-web/src/pages/Account/Settings/Info.js
deleted file mode 100644
index ceee506b8..000000000
--- a/admin-web/src/pages/Account/Settings/Info.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'dva';
-import router from 'umi/router';
-import { FormattedMessage } from 'umi/locale';
-import { Menu } from 'antd';
-import GridContent from '@/components/PageHeaderWrapper/GridContent';
-import styles from './Info.less';
-
-const { Item } = Menu;
-
-@connect(({ user }) => ({
- currentUser: user.currentUser,
-}))
-class Info extends Component {
- constructor(props) {
- super(props);
- const { match, location } = props;
- const menuMap = {
- base: ,
- security: (
-
- ),
- binding: (
-
- ),
- notification: (
-
- ),
- };
- const key = location.pathname.replace(`${match.path}/`, '');
- this.state = {
- mode: 'inline',
- menuMap,
- selectKey: menuMap[key] ? key : 'base',
- };
- }
-
- static getDerivedStateFromProps(props, state) {
- const { match, location } = props;
- let selectKey = location.pathname.replace(`${match.path}/`, '');
- selectKey = state.menuMap[selectKey] ? selectKey : 'base';
- if (selectKey !== state.selectKey) {
- return { selectKey };
- }
- return null;
- }
-
- componentDidMount() {
- window.addEventListener('resize', this.resize);
- this.resize();
- }
-
- componentWillUnmount() {
- window.removeEventListener('resize', this.resize);
- }
-
- getmenu = () => {
- const { menuMap } = this.state;
- return Object.keys(menuMap).map(item => - {menuMap[item]}
);
- };
-
- getRightTitle = () => {
- const { selectKey, menuMap } = this.state;
- return menuMap[selectKey];
- };
-
- selectKey = ({ key }) => {
- router.push(`/account/settings/${key}`);
- this.setState({
- selectKey: key,
- });
- };
-
- resize = () => {
- if (!this.main) {
- return;
- }
- requestAnimationFrame(() => {
- let mode = 'inline';
- const { offsetWidth } = this.main;
- if (this.main.offsetWidth < 641 && offsetWidth > 400) {
- mode = 'horizontal';
- }
- if (window.innerWidth < 768 && offsetWidth > 400) {
- mode = 'horizontal';
- }
- this.setState({
- mode,
- });
- });
- };
-
- render() {
- const { children, currentUser } = this.props;
- if (!currentUser.userid) {
- return '';
- }
- const { mode, selectKey } = this.state;
- return (
-
- {
- this.main = ref;
- }}
- >
-
-
-
-
-
{this.getRightTitle()}
- {children}
-
-
(
-
-
-
- )}
- />
-
- );
- }
-}
-
-export default NotificationView;
diff --git a/admin-web/src/pages/Account/Settings/PhoneView.js b/admin-web/src/pages/Account/Settings/PhoneView.js
deleted file mode 100644
index 266552764..000000000
--- a/admin-web/src/pages/Account/Settings/PhoneView.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { Fragment, PureComponent } from 'react';
-import { Input } from 'antd';
-import styles from './PhoneView.less';
-
-class PhoneView extends PureComponent {
- render() {
- const { value, onChange } = this.props;
- let values = ['', ''];
- if (value) {
- values = value.split('-');
- }
- return (
-
- {
- onChange(`${e.target.value}-${values[1]}`);
- }}
- />
- {
- onChange(`${values[0]}-${e.target.value}`);
- }}
- value={values[1]}
- />
-
- );
- }
-}
-
-export default PhoneView;
diff --git a/admin-web/src/pages/Account/Settings/PhoneView.less b/admin-web/src/pages/Account/Settings/PhoneView.less
deleted file mode 100644
index ee4328ebf..000000000
--- a/admin-web/src/pages/Account/Settings/PhoneView.less
+++ /dev/null
@@ -1,11 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.area_code {
- width: 30%;
- max-width: 128px;
- margin-right: 8px;
-}
-.phone_number {
- width: ~'calc(70% - 8px)';
- max-width: 312px;
-}
diff --git a/admin-web/src/pages/Account/Settings/SecurityView.js b/admin-web/src/pages/Account/Settings/SecurityView.js
deleted file mode 100644
index 0706bd0b9..000000000
--- a/admin-web/src/pages/Account/Settings/SecurityView.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { Component, Fragment } from 'react';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import { List } from 'antd';
-// import { getTimeDistance } from '@/utils/utils';
-
-const passwordStrength = {
- strong: (
-
-
-
- ),
- medium: (
-
-
-
- ),
- weak: (
-
-
- Weak
-
- ),
-};
-
-class SecurityView extends Component {
- getData = () => [
- {
- title: formatMessage({ id: 'app.settings.security.password' }, {}),
- description: (
-
- {formatMessage({ id: 'app.settings.security.password-description' })}：
- {passwordStrength.strong}
-
- ),
- actions: [
-
-
- ,
- ],
- },
- {
- title: formatMessage({ id: 'app.settings.security.phone' }, {}),
- description: `${formatMessage(
- { id: 'app.settings.security.phone-description' },
- {}
- )}：138****8293`,
- actions: [
-
-
- ,
- ],
- },
- {
- title: formatMessage({ id: 'app.settings.security.question' }, {}),
- description: formatMessage({ id: 'app.settings.security.question-description' }, {}),
- actions: [
-
-
- ,
- ],
- },
- {
- title: formatMessage({ id: 'app.settings.security.email' }, {}),
- description: `${formatMessage(
- { id: 'app.settings.security.email-description' },
- {}
- )}：ant***sign.com`,
- actions: [
-
-
- ,
- ],
- },
- {
- title: formatMessage({ id: 'app.settings.security.mfa' }, {}),
- description: formatMessage({ id: 'app.settings.security.mfa-description' }, {}),
- actions: [
-
-
- ,
- ],
- },
- ];
-
- render() {
- return (
-
- (
-
-
-
- )}
- />
-
- );
- }
-}
-
-export default SecurityView;
diff --git a/admin-web/src/pages/Account/Settings/models/geographic.js b/admin-web/src/pages/Account/Settings/models/geographic.js
deleted file mode 100644
index a501920c7..000000000
--- a/admin-web/src/pages/Account/Settings/models/geographic.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { queryProvince, queryCity } from '@/services/geographic';
-
-export default {
- namespace: 'geographic',
-
- state: {
- province: [],
- city: [],
- isLoading: false,
- },
-
- effects: {
- *fetchProvince(_, { call, put }) {
- yield put({
- type: 'changeLoading',
- payload: true,
- });
- const response = yield call(queryProvince);
- yield put({
- type: 'setProvince',
- payload: response,
- });
- yield put({
- type: 'changeLoading',
- payload: false,
- });
- },
- *fetchCity({ payload }, { call, put }) {
- yield put({
- type: 'changeLoading',
- payload: true,
- });
- const response = yield call(queryCity, payload);
- yield put({
- type: 'setCity',
- payload: response,
- });
- yield put({
- type: 'changeLoading',
- payload: false,
- });
- },
- },
-
- reducers: {
- setProvince(state, action) {
- return {
- ...state,
- province: action.payload,
- };
- },
- setCity(state, action) {
- return {
- ...state,
- city: action.payload,
- };
- },
- changeLoading(state, action) {
- return {
- ...state,
- isLoading: action.payload,
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Admin/AdminList.js b/admin-web/src/pages/Admin/AdminList.js
deleted file mode 100644
index a78de6e75..000000000
--- a/admin-web/src/pages/Admin/AdminList.js
+++ /dev/null
@@ -1,589 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import {
- Card,
- Form,
- Input,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Spin,
- Row,
- Col,
- Select,
- Icon,
- TreeSelect,
-} from 'antd';
-import { checkTypeWithEnglishAndNumbers } from '../../../helpers/validator';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './AdminList.less';
-import moment from 'moment';
-import PaginationHelper from '../../../helpers/PaginationHelper';
-
-const FormItem = Form.Item;
-const { TreeNode } = Tree;
-const status = ['未知', '在职', '离职'];
-
-// 列表
-function List({
- dataSource,
- loading,
- pagination,
- searchParams,
- dispatch,
- handleModalVisible,
- handleRoleAssignModalVisible,
-}) {
- function handleRoleAssign(record) {
- // 显示 Modal
- handleRoleAssignModalVisible(true, record);
- // 查询角色列表
- dispatch({
- type: 'adminList/queryRoleList',
- payload: {
- id: record.id,
- },
- });
- }
-
- function handleDelete(record) {
- Modal.confirm({
- title: `确认删除?`,
- content: `${record.username}`,
- onOk() {
- dispatch({
- type: 'adminList/delete',
- payload: {
- id: record.id,
- },
- });
- },
- onCancel() {},
- });
- }
-
- const columns = [
- {
- title: '账号',
- dataIndex: 'username',
- },
- {
- title: '员工姓名',
- dataIndex: 'name',
- },
- {
- title: '部门',
- dataIndex: 'deptment.name',
- },
- {
- title: '角色',
- dataIndex: 'roles',
- render(roles) {
- let text = '';
- if (roles) {
- for (let i in roles) {
- if (i > 0) {
- text += ' ';
- }
- text += roles[i].name;
- }
- }
- return {text};
- },
- },
- {
- title: '在职状态',
- dataIndex: 'status',
- render(val) {
- return {status[val]}; // TODO 芋艿，此处要改
- },
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD HH:mm')},
- },
- {
- title: '操作',
- width: 360,
- render: (text, record) => {
- return (
-
- handleModalVisible(true, 'update', record)}>编辑
-
- handleRoleAssign(record)}>角色分配
-
- {record.status === 2 ? (
-
-
- handleDelete(record)}>
- 删除
-
-
- ) : null}
-
- );
- },
- },
- ];
-
- function onPageChange(page) {
- // 翻页
- dispatch({
- type: 'adminList/query',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams,
- },
- });
- }
-
- return (
-
- );
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- deptSelectTree,
- } = props;
-
- function search() {
- const fields = form.getFieldsValue();
- if (fields.deptmentId) {
- const deptmentId = fields.deptmentId.split('-')[1];
- fields.deptmentId = deptmentId;
- }
- dispatch({
- type: 'adminList/query',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...fields,
- },
- });
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// 添加 or 修改 Form 表单
-const AddOrUpdateForm = Form.create()(props => {
- const {
- dispatch,
- modalVisible,
- form,
- handleModalVisible,
- modalType,
- formVals,
- deptSelectTree,
- } = props;
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- // 添加表单
- if (fields.deptmentId) {
- const deptmentId = fields.deptmentId.split('-')[1];
- fields.deptmentId = deptmentId;
- }
- if (modalType === 'add') {
- dispatch({
- type: 'adminList/add',
- payload: {
- body: {
- ...fields,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('新建成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- // 修改表单
- } else {
- dispatch({
- type: 'adminList/update',
- payload: {
- body: {
- id: formVals.id,
- ...fields,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('编辑成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- }
- });
- };
-
- const title = modalType === 'add' ? '新建员工' : '更新员工';
- return (
- handleModalVisible()}
- >
-
- {form.getFieldDecorator('name', {
- rules: [
- { required: true, message: '请输入员工姓名！' },
- { max: 10, message: '姓名最大长度为 10' },
- ],
- initialValue: formVals.name,
- })()}
-
-
- {form.getFieldDecorator('deptmentId', {
- rules: [{ required: true, message: '请选择部门' }],
- initialValue:
- formVals.deptmentId && formVals.deptmentId !== 0 ? formVals.deptmentId : null,
- })(
-
- )}
-
-
- {form.getFieldDecorator('username', {
- rules: [
- { required: true, message: '请输入账号！' },
- { max: 16, min: 6, message: '长度为 6-16 位' },
- {
- validator: (rule, value, callback) =>
- checkTypeWithEnglishAndNumbers(rule, value, callback, '数字以及字母'),
- },
- ],
- initialValue: formVals.username,
- })()}
-
-
- {form.getFieldDecorator('password', {
- rules: [
- { required: modalType === 'add', message: '请填写密码' }, // 添加时，必须输入密码
- { max: 16, min: 6, message: '长度为 6-18 位' },
- ],
- initialValue: formVals.password,
- })()}
-
-
- );
-});
-
-// 角色分配 Modal
-const RoleAssignModal = Form.create()(props => {
- const {
- modalVisible,
- form,
- handleModalVisible,
- treeData,
- checkedKeys,
- loading,
- formVals,
- dispatch,
- } = props;
-
- const handleCheckBoxClick = checkedKeys => {
- // 获得新选择
- const newCheckedKeys = checkedKeys.map(item => {
- return parseInt(item);
- });
- // 设置到 model 中
- dispatch({
- type: 'adminList/changeRoleCheckedKeys',
- payload: newCheckedKeys,
- });
- };
-
- const renderTreeNodes = data => {
- return data.map(item => {
- if (item.children) {
- // 递归拼接节点
- return (
-
- {renderTreeNodes(item.children)}
-
- );
- }
- return ;
- });
- };
-
- const renderModalContent = treeData => {
- const RenderTreeNodes = renderTreeNodes(treeData);
- if (RenderTreeNodes) {
- return (
-
- {form.getFieldDecorator('name', {})(
-
- {renderTreeNodes(treeData)}
-
- )}
-
- );
- } else {
- return null;
- }
- };
-
- const okHandle = () => {
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- // debugger;
- dispatch({
- type: 'adminList/roleAssign',
- payload: {
- body: {
- id: formVals.id,
- roleIds: checkedKeys,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('分配角色成功');
- // 关闭弹窗
- handleModalVisible(false);
- },
- },
- });
- });
- };
-
- return (
- handleModalVisible()}
- >
- {renderModalContent(treeData)}
-
- );
-});
-
-@connect(({ adminList }) => ({
- // list: adminList.list,
- // pagination: adminList.pagination,
- ...adminList,
-}))
-// 主界面
-@Form.create()
-class AdminList extends PureComponent {
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'adminList/query',
- payload: {
- ...PaginationHelper.defaultPayload,
- },
- });
- dispatch({
- type: 'adminList/getDeptmentTree',
- payload: {},
- });
- }
-
- handleModalVisible = (modalVisible, modalType, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'adminList/setAll',
- payload: {
- modalVisible,
- modalType,
- formVals: record || {},
- },
- });
- };
-
- handleRoleAssignModalVisible = (roleModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'adminList/setAll',
- payload: {
- roleModalVisible: roleModalVisible,
- formVals: record || {},
- },
- });
- };
-
- render() {
- // let that = this;
- const {
- dispatch,
- list,
- listLoading,
- searchParams,
- pagination,
- modalVisible,
- modalType,
- formVals,
- confirmLoading,
- roleList,
- roleModalVisible,
- roleAssignLoading,
- roleCheckedKeys,
- deptSelectTree,
- } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- loading: listLoading,
- confirmLoading,
- handleModalVisible: this.handleModalVisible, // Function
- handleRoleAssignModalVisible: this.handleRoleAssignModalVisible, // Function
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- deptSelectTree,
- };
-
- // 添加 or 更新表单属性
- const addOrUpdateFormProps = {
- modalVisible,
- modalType,
- formVals,
- dispatch,
- deptSelectTree,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- // 分配角色 Modal 属性
- const roleAssignModal = {
- loading: roleAssignLoading,
- treeData: roleList,
- formVals,
- checkedKeys: roleCheckedKeys,
- modalVisible: roleModalVisible,
- dispatch,
- handleModalVisible: this.handleRoleAssignModalVisible, // Function
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default AdminList;
diff --git a/admin-web/src/pages/Admin/AdminList.less b/admin-web/src/pages/Admin/AdminList.less
deleted file mode 100644
index 7ad3dac3f..000000000
--- a/admin-web/src/pages/Admin/AdminList.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
-
-.tableListForm {
- :global {
- .ant-form-item {
- display: flex;
- margin-right: 0;
- margin-bottom: 24px;
- > .ant-form-item-label {
- width: auto;
- padding-right: 8px;
- line-height: 32px;
- }
- .ant-form-item-control {
- line-height: 32px;
- }
- }
- .ant-form-item-control-wrapper {
- flex: 1;
- }
- }
- .submitButtons {
- display: block;
- margin-bottom: 24px;
- white-space: nowrap;
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .tableListForm :global(.ant-form-item) {
- margin-right: 24px;
- }
-}
\ No newline at end of file
diff --git a/admin-web/src/pages/Admin/DeptmentList.js b/admin-web/src/pages/Admin/DeptmentList.js
deleted file mode 100644
index 621d86539..000000000
--- a/admin-web/src/pages/Admin/DeptmentList.js
+++ /dev/null
@@ -1,280 +0,0 @@
-import React, { PureComponent, Fragment } from 'react';
-import { Button, Card, Table, Form, Divider, Modal, Input, TreeSelect, message } from 'antd';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import { connect } from 'dva';
-import styles from './DeptmentList.less';
-import PaginationHelper from '../../../helpers/PaginationHelper';
-import moment from 'moment';
-const FormItem = Form.Item;
-// 添加 form 表单
-const CreateForm = Form.create()(props => {
- const {
- modalVisible,
- form,
- handleAdd,
- handleModalVisible,
- modalType,
- initValues,
- selectTree,
- } = props;
-
- const okHandle = () => {
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- let pid = fieldsValue.pid;
- if (fieldsValue.pid) {
- pid = pid.split('-')[1];
- fieldsValue.pid = pid;
- }
- form.resetFields();
- handleAdd({
- fields: fieldsValue,
- modalType,
- initValues,
- });
- });
- };
-
- const selectStyle = {
- width: 200,
- };
-
- function onTypeChange(event) {
- initValues.type = parseInt(event.target.value);
- }
-
- // 给 type 赋予初始值
- initValues.type = initValues.type || 1;
-
- const title = modalType === 'add' ? '添加部门' : '编辑部门';
- const okText = modalType === 'add' ? '添加' : '编辑';
- return (
- handleModalVisible()}
- >
-
- {form.getFieldDecorator('name', {
- initialValue: initValues.name,
- rules: [{ required: true, message: '请输入部门名称！', min: 2 }],
- })()}
-
-
- {form.getFieldDecorator('sort', {
- initialValue: initValues.sort,
- })()}
-
-
- {form.getFieldDecorator('pid', {
- rules: [{ required: true, message: '请选择父级编号！' }],
- initialValue:
- initValues.pid === 0
- ? `根节点-${initValues.pid}`
- : initValues.pid
- ? `${initValues.name}-${initValues.pid}`
- : undefined,
- })(
-
- )}
-
-
- );
-});
-
-@connect(({ deptmentList, loading }) => ({
- deptmentList,
- deptmentData: deptmentList.deptmentData,
- loading: loading.models.deptmentList,
-}))
-@Form.create()
-export default class DepetmentList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add or update
- initValues: {},
- };
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'deptmentList/getDeptmentAll',
- payload: {
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
- initFetch = () => {
- const { dispatch } = this.props;
- dispatch({
- type: 'deptmentList/getDeptmentAll',
- payload: {
- ...PaginationHelper.defaultPayload,
- },
- });
- };
-
- handleModalVisible = (flag, modalType, initValues) => {
- this.setState({
- modalVisible: !!flag,
- initValues: initValues || {},
- modalType: modalType || 'add',
- });
- if (flag) {
- //query treeSelect
- const { dispatch } = this.props;
- dispatch({
- type: 'deptmentList/getDeptmentAll',
- payload: {},
- });
- }
- };
-
- handleDelete(row) {
- const { dispatch } = this.props;
- const _this = this;
- Modal.confirm({
- title: `确认删除?`,
- content: `${row.name}`,
- onOk() {
- dispatch({
- type: 'deptmentList/delete',
- payload: {
- body: {
- id: row.id,
- },
- onSuccess: () => {
- message.success('删除成功');
- _this.initFetch();
- },
- onFail: response => {
- message.warn('删除失败' + response.message);
- },
- },
- });
- },
- onCancel() {},
- });
- }
-
- handleAdd = ({ fields, modalType, initValues }) => {
- const { dispatch } = this.props;
- if (modalType === 'add') {
- dispatch({
- type: 'deptmentList/add',
- payload: {
- body: {
- ...fields,
- },
- onSuccess: () => {
- message.success('添加成功');
- this.handleModalVisible();
- this.initFetch();
- },
- onFail: response => {
- message.warn('添加失败' + response.message);
- },
- },
- });
- } else {
- dispatch({
- type: 'deptmentList/update',
- payload: {
- body: {
- ...initValues,
- ...fields,
- },
- onSuccess: () => {
- message.success('更新成功成功');
- this.handleModalVisible();
- this.initFetch();
- },
- onFail: response => {
- message.warn('更新失败' + response.message);
- },
- },
- });
- }
- };
-
- render() {
- const { deptmentData, deptmentList, loading } = this.props;
- const { selectTree } = deptmentList;
- const { modalVisible, modalType, initValues } = this.state;
- const parentMethods = {
- handleAdd: this.handleAdd,
- handleModalVisible: this.handleModalVisible,
- modalType,
- initValues,
- };
- const columns = [
- {
- title: '部门名称',
- dataIndex: 'name',
- },
- {
- title: '排序',
- dataIndex: 'sort',
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- sorter: true,
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- render: (text, record) => (
-
- this.handleModalVisible(true, 'update', record)}>编辑
-
- this.handleDelete(record)}>
- 删除
-
-
- ),
- },
- ];
-
- // const {
- // deptmentList: {deptmentData},
- // loading,
- // } = this.props;
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
- action={
- }
- >
-
-
- }
- loading={loading}
- total={() => 126560}
- footer={
- }
- value={`￥${numeral(12423).format('0,0')}`}
- />
- }
- contentHeight={46}
- >
-
-
- 12%
-
-
-
- 11%
-
-
-
-
-
- }
- action={
- }
- >
-
-
- }
- total={numeral(8846).format('0,0')}
- footer={
- }
- value={numeral(1234).format('0,0')}
- />
- }
- contentHeight={46}
- >
-
-
-
-
- }
- action={
- }
- >
-
-
- }
- total={numeral(6560).format('0,0')}
- footer={
-
- }
- value="60%"
- />
- }
- contentHeight={46}
- >
-
-
-
-
-
- }
- action={
- }
- >
-
-
- }
- total="78%"
- footer={
-
-
-
- 12%
-
-
-
- 11%
-
-
- }
- contentHeight={46}
- >
-
-
-
-
-));
-
-export default IntroduceRow;
diff --git a/admin-web/src/pages/Dashboard/Monitor.js b/admin-web/src/pages/Dashboard/Monitor.js
deleted file mode 100644
index d9bb87c61..000000000
--- a/admin-web/src/pages/Dashboard/Monitor.js
+++ /dev/null
@@ -1,249 +0,0 @@
-import React, { Component } from 'react';
-import { AsyncLoadBizCharts } from '@/components/Charts/AsyncLoadBizCharts';
-import { connect } from 'dva';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import { Row, Col, Card, Tooltip } from 'antd';
-import { Pie, WaterWave, Gauge, TagCloud } from '@/components/Charts';
-import NumberInfo from '@/components/NumberInfo';
-import CountDown from '@/components/CountDown';
-import ActiveChart from '@/components/ActiveChart';
-import numeral from 'numeral';
-import GridContent from '@/components/PageHeaderWrapper/GridContent';
-import Authorized from '@/utils/Authorized';
-import styles from './Monitor.less';
-
-const { Secured } = Authorized;
-
-const targetTime = new Date().getTime() + 3900000;
-
-// use permission as a parameter
-const havePermissionAsync = new Promise(resolve => {
- // Call resolve on behalf of passed
- setTimeout(() => resolve(), 300);
-});
-
-@Secured(havePermissionAsync)
-@connect(({ monitor, loading }) => ({
- monitor,
- loading: loading.models.monitor,
-}))
-class Monitor extends Component {
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'monitor/fetchTags',
- });
- }
-
- render() {
- const { monitor, loading } = this.props;
- const { tags } = monitor;
-
- return (
-
-
-
-
- }
- bordered={false}
- >
-
-
-
- }
- suffix="元"
- total={numeral(124543233).format('0,0')}
- />
-
-
-
- }
- total="92%"
- />
-
-
-
- }
- total={}
- />
-
-
-
- }
- suffix="元"
- total={numeral(234).format('0,0')}
- />
-
-
-
-
- }
- >
-
-
-
-
-
-
- }
- bordered={false}
- className={styles.pieCard}
- >
-
-
-
- }
- total="28%"
- height={128}
- lineWidth={2}
- />
-
-
-
- }
- total="22%"
- height={128}
- lineWidth={2}
- />
-
-
-
- }
- total="32%"
- height={128}
- lineWidth={2}
- />
-
-
-
-
-
-
- }
- loading={loading}
- bordered={false}
- bodyStyle={{ overflow: 'hidden' }}
- >
-
-
-
-
-
- }
- bodyStyle={{ textAlign: 'center', fontSize: 0 }}
- bordered={false}
- >
-
- }
- percent={34}
- />
-
-
-
-
- );
- }
-}
-
-export default props => (
-
-
-
-);
diff --git a/admin-web/src/pages/Dashboard/Monitor.less b/admin-web/src/pages/Dashboard/Monitor.less
deleted file mode 100644
index 82d727229..000000000
--- a/admin-web/src/pages/Dashboard/Monitor.less
+++ /dev/null
@@ -1,23 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.mapChart {
- height: 452px;
- padding-top: 24px;
- text-align: center;
- img {
- display: inline-block;
- max-width: 100%;
- max-height: 437px;
- }
-}
-
-.pieCard :global(.pie-stat) {
- font-size: 24px !important;
-}
-
-@media screen and (max-width: @screen-lg) {
- .mapChart {
- height: auto;
- }
-}
diff --git a/admin-web/src/pages/Dashboard/OfflineData.js b/admin-web/src/pages/Dashboard/OfflineData.js
deleted file mode 100644
index f7d06ef07..000000000
--- a/admin-web/src/pages/Dashboard/OfflineData.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { memo } from 'react';
-import { Card, Tabs, Row, Col } from 'antd';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import styles from './Analysis.less';
-import { TimelineChart, Pie } from '@/components/Charts';
-import NumberInfo from '@/components/NumberInfo';
-
-const CustomTab = ({ data, currentTabKey: currentKey }) => (
-
-
-
- }
- gap={2}
- total={`${data.cvr * 100}%`}
- theme={currentKey !== data.name && 'light'}
- />
-
-
-
-
-
-);
-
-const { TabPane } = Tabs;
-
-const OfflineData = memo(
- ({ activeKey, loading, offlineData, offlineChartData, handleTabChange }) => (
-
-
- {offlineData.map(shop => (
- } key={shop.name}>
-
-
-
-
- ))}
-
-
- )
-);
-
-export default OfflineData;
diff --git a/admin-web/src/pages/Dashboard/ProportionSales.js b/admin-web/src/pages/Dashboard/ProportionSales.js
deleted file mode 100644
index ff16a7d23..000000000
--- a/admin-web/src/pages/Dashboard/ProportionSales.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React, { memo } from 'react';
-import { Card, Radio } from 'antd';
-import { FormattedMessage } from 'umi/locale';
-import styles from './Analysis.less';
-import { Pie } from '@/components/Charts';
-import Yuan from '@/utils/Yuan';
-
-const ProportionSales = memo(
- ({ dropdownGroup, salesType, loading, salesPieData, handleChangeSalesType }) => (
-
- }
- bodyStyle={{ padding: 24 }}
- extra={
-
- {dropdownGroup}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
- total={() => {salesPieData.reduce((pre, now) => now.y + pre, 0)}}
- data={salesPieData}
- valueFormat={value => {value}}
- height={270}
- lineWidth={4}
- style={{ padding: '8px 0' }}
- />
-
- )
-);
-
-export default ProportionSales;
diff --git a/admin-web/src/pages/Dashboard/SalesCard.js b/admin-web/src/pages/Dashboard/SalesCard.js
deleted file mode 100644
index 3ab577757..000000000
--- a/admin-web/src/pages/Dashboard/SalesCard.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import React, { memo } from 'react';
-import { Row, Col, Card, Tabs, DatePicker } from 'antd';
-import { FormattedMessage, formatMessage } from 'umi/locale';
-import numeral from 'numeral';
-import styles from './Analysis.less';
-import { Bar } from '@/components/Charts';
-
-const { RangePicker } = DatePicker;
-const { TabPane } = Tabs;
-
-const rankingListData = [];
-for (let i = 0; i < 7; i += 1) {
- rankingListData.push({
- title: formatMessage({ id: 'app.analysis.test' }, { no: i }),
- total: 323234,
- });
-}
-
-const SalesCard = memo(
- ({ rangePickerValue, salesData, isActive, handleRangePickerChange, loading, selectDate }) => (
-
-
- }
- size="large"
- tabBarStyle={{ marginBottom: 24 }}
- >
- }
- key="sales"
- >
-
-
-
-
- }
- data={salesData}
- />
-
-
-
-
-
-
-
-
- {rankingListData.map((item, i) => (
- -
-
- {i + 1}
-
-
- {item.title}
-
-
- {numeral(item.total).format('0,0')}
-
-
- ))}
-
-
-
- }
- key="views"
- >
-
-
-
-
- }
- data={salesData}
- />
-
-
-
-
-
-
-
-
- {rankingListData.map((item, i) => (
- -
-
- {i + 1}
-
-
- {item.title}
-
- {numeral(item.total).format('0,0')}
-
- ))}
-
-
-
-
-
-
- )
-);
-
-export default SalesCard;
diff --git a/admin-web/src/pages/Dashboard/TopSearch.js b/admin-web/src/pages/Dashboard/TopSearch.js
deleted file mode 100644
index 4e75ea7d5..000000000
--- a/admin-web/src/pages/Dashboard/TopSearch.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { memo } from 'react';
-import { Row, Col, Table, Tooltip, Card, Icon } from 'antd';
-import { FormattedMessage } from 'umi/locale';
-import Trend from '@/components/Trend';
-import numeral from 'numeral';
-import styles from './Analysis.less';
-import NumberInfo from '@/components/NumberInfo';
-import { MiniArea } from '@/components/Charts';
-
-const columns = [
- {
- title: ,
- dataIndex: 'index',
- key: 'index',
- },
- {
- title: (
-
- ),
- dataIndex: 'keyword',
- key: 'keyword',
- render: text => {text},
- },
- {
- title: ,
- dataIndex: 'count',
- key: 'count',
- sorter: (a, b) => a.count - b.count,
- className: styles.alignRight,
- },
- {
- title: ,
- dataIndex: 'range',
- key: 'range',
- sorter: (a, b) => a.range - b.range,
- render: (text, record) => (
-
- {text}%
-
- ),
- align: 'right',
- },
-];
-
-const TopSearch = memo(({ loading, visitData2, searchData, dropdownGroup }) => (
-
- }
- extra={dropdownGroup}
- style={{ marginTop: 24 }}
- >
-
-
-
-
- }
- >
-
-
-
- }
- gap={8}
- total={numeral(12321).format('0,0')}
- status="up"
- subTotal={17.1}
- />
-
-
-
-
-
- }
- >
-
-
-
- }
- total={2.7}
- status="down"
- subTotal={26.2}
- gap={8}
- />
-
-
-
- record.index}
- size="small"
- columns={columns}
- dataSource={searchData}
- pagination={{
- style: { marginBottom: 0 },
- pageSize: 5,
- }}
- />
-
-));
-
-export default TopSearch;
diff --git a/admin-web/src/pages/Dashboard/Workplace.js b/admin-web/src/pages/Dashboard/Workplace.js
deleted file mode 100644
index 3e7ff986a..000000000
--- a/admin-web/src/pages/Dashboard/Workplace.js
+++ /dev/null
@@ -1,260 +0,0 @@
-import React, { PureComponent } from 'react';
-import moment from 'moment';
-import { connect } from 'dva';
-import Link from 'umi/link';
-import { Row, Col, Card, List, Avatar } from 'antd';
-import { AsyncLoadBizCharts } from '@/components/Charts/AsyncLoadBizCharts';
-import { Radar } from '@/components/Charts';
-import EditableLinkGroup from '@/components/EditableLinkGroup';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './Workplace.less';
-
-const links = [
- {
- title: '操作一',
- href: '',
- },
- {
- title: '操作二',
- href: '',
- },
- {
- title: '操作三',
- href: '',
- },
- {
- title: '操作四',
- href: '',
- },
- {
- title: '操作五',
- href: '',
- },
- {
- title: '操作六',
- href: '',
- },
-];
-
-@connect(({ user, project, activities, chart, loading }) => ({
- currentUser: user.currentUser,
- project,
- activities,
- chart,
- currentUserLoading: loading.effects['user/fetchCurrent'],
- projectLoading: loading.effects['project/fetchNotice'],
- activitiesLoading: loading.effects['activities/fetchList'],
-}))
-class Workplace extends PureComponent {
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'user/fetchCurrent',
- });
- dispatch({
- type: 'project/fetchNotice',
- });
- dispatch({
- type: 'activities/fetchList',
- });
- dispatch({
- type: 'chart/fetch',
- });
- }
-
- componentWillUnmount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'chart/clear',
- });
- }
-
- renderActivities() {
- const {
- activities: { list },
- } = this.props;
- return list.map(item => {
- const events = item.template.split(/@\{([^{}]*)\}/gi).map(key => {
- if (item[key]) {
- return (
-
- {item[key].name}
-
- );
- }
- return key;
- });
- return (
-
- }
- title={
-
- {item.user.name}
-
- {events}
-
- }
- description={
-
- {moment(item.updatedAt).fromNow()}
-
- }
- />
-
- );
- });
- }
-
- render() {
- const {
- currentUser,
- currentUserLoading,
- project: { notice },
- projectLoading,
- activitiesLoading,
- chart: { radarData },
- } = this.props;
-
- const pageHeaderContent =
- currentUser && Object.keys(currentUser).length ? (
-
-
-
-
- 早安，
- {currentUser.name}
- ，祝你开心每一天！
-
-
- {currentUser.title} |{currentUser.group}
-
-
-
-
- 全部项目}
- loading={projectLoading}
- bodyStyle={{ padding: 0 }}
- >
- {notice.map(item => (
-
-
-
-
- {item.title}
-
- }
- description={item.description}
- />
-
- {item.member || ''}
- {item.updatedAt && (
-
- {moment(item.updatedAt).fromNow()}
-
- )}
-
-
-
- ))}
-
-
-
- {this.renderActivities()}
-
-
-
-
-
- {}} links={links} linkElement={Link} />
-
-
-
-
-
-
-
-
-
- {notice.map(item => (
-
-
-
- {item.member}
-
-
- ))}
-
-
-
- );
- }
-}
-
-export default props => (
-
-
-
-);
diff --git a/admin-web/src/pages/Dashboard/Workplace.less b/admin-web/src/pages/Dashboard/Workplace.less
deleted file mode 100644
index b67e0b64a..000000000
--- a/admin-web/src/pages/Dashboard/Workplace.less
+++ /dev/null
@@ -1,228 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.activitiesList {
- padding: 0 24px 8px 24px;
- .username {
- color: @text-color;
- }
- .event {
- font-weight: normal;
- }
-}
-
-.pageHeaderContent {
- display: flex;
- .avatar {
- flex: 0 1 72px;
- margin-bottom: 8px;
- & > span {
- display: block;
- width: 72px;
- height: 72px;
- border-radius: 72px;
- }
- }
- .content {
- position: relative;
- top: 4px;
- flex: 1 1 auto;
- margin-left: 24px;
- color: @text-color-secondary;
- line-height: 22px;
- .contentTitle {
- margin-bottom: 12px;
- color: @heading-color;
- font-weight: 500;
- font-size: 20px;
- line-height: 28px;
- }
- }
-}
-
-.extraContent {
- .clearfix();
-
- float: right;
- white-space: nowrap;
- .statItem {
- position: relative;
- display: inline-block;
- padding: 0 32px;
- > p:first-child {
- margin-bottom: 4px;
- color: @text-color-secondary;
- font-size: @font-size-base;
- line-height: 22px;
- }
- > p {
- margin: 0;
- color: @heading-color;
- font-size: 30px;
- line-height: 38px;
- > span {
- color: @text-color-secondary;
- font-size: 20px;
- }
- }
- &::after {
- position: absolute;
- top: 8px;
- right: 0;
- width: 1px;
- height: 40px;
- background-color: @border-color-split;
- content: '';
- }
- &:last-child {
- padding-right: 0;
- &::after {
- display: none;
- }
- }
- }
-}
-
-.members {
- a {
- display: block;
- height: 24px;
- margin: 12px 0;
- color: @text-color;
- transition: all 0.3s;
- .textOverflow();
- .member {
- margin-left: 12px;
- font-size: @font-size-base;
- line-height: 24px;
- vertical-align: top;
- }
- &:hover {
- color: @primary-color;
- }
- }
-}
-
-.projectList {
- :global {
- .ant-card-meta-description {
- height: 44px;
- overflow: hidden;
- color: @text-color-secondary;
- line-height: 22px;
- }
- }
- .cardTitle {
- font-size: 0;
- a {
- display: inline-block;
- height: 24px;
- margin-left: 12px;
- color: @heading-color;
- font-size: @font-size-base;
- line-height: 24px;
- vertical-align: top;
- &:hover {
- color: @primary-color;
- }
- }
- }
- .projectGrid {
- width: 33.33%;
- }
- .projectItemContent {
- display: flex;
- height: 20px;
- margin-top: 8px;
- overflow: hidden;
- font-size: 12px;
- line-height: 20px;
- .textOverflow();
- a {
- display: inline-block;
- flex: 1 1 0;
- color: @text-color-secondary;
- .textOverflow();
- &:hover {
- color: @primary-color;
- }
- }
- .datetime {
- flex: 0 0 auto;
- float: right;
- color: @disabled-color;
- }
- }
-}
-
-.datetime {
- color: @disabled-color;
-}
-
-@media screen and (max-width: @screen-xl) and (min-width: @screen-lg) {
- .activeCard {
- margin-bottom: 24px;
- }
- .members {
- margin-bottom: 0;
- }
- .extraContent {
- margin-left: -44px;
- .statItem {
- padding: 0 16px;
- }
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .activeCard {
- margin-bottom: 24px;
- }
- .members {
- margin-bottom: 0;
- }
- .extraContent {
- float: none;
- margin-right: 0;
- .statItem {
- padding: 0 16px;
- text-align: left;
- &::after {
- display: none;
- }
- }
- }
-}
-
-@media screen and (max-width: @screen-md) {
- .extraContent {
- margin-left: -16px;
- }
- .projectList {
- .projectGrid {
- width: 50%;
- }
- }
-}
-
-@media screen and (max-width: @screen-sm) {
- .pageHeaderContent {
- display: block;
- .content {
- margin-left: 0;
- }
- }
- .extraContent {
- .statItem {
- float: none;
- }
- }
-}
-
-@media screen and (max-width: @screen-xs) {
- .projectList {
- .projectGrid {
- width: 100%;
- }
- }
-}
diff --git a/admin-web/src/pages/Dashboard/models/activities.js b/admin-web/src/pages/Dashboard/models/activities.js
deleted file mode 100644
index 4e0a11e27..000000000
--- a/admin-web/src/pages/Dashboard/models/activities.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { queryActivities } from '@/services/api';
-
-export default {
- namespace: 'activities',
-
- state: {
- list: [],
- },
-
- effects: {
- *fetchList(_, { call, put }) {
- const response = yield call(queryActivities);
- yield put({
- type: 'saveList',
- payload: Array.isArray(response) ? response : [],
- });
- },
- },
-
- reducers: {
- saveList(state, action) {
- return {
- ...state,
- list: action.payload,
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Dashboard/models/chart.js b/admin-web/src/pages/Dashboard/models/chart.js
deleted file mode 100644
index 8dfe4a93f..000000000
--- a/admin-web/src/pages/Dashboard/models/chart.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import { fakeChartData } from '@/services/api';
-
-export default {
- namespace: 'chart',
-
- state: {
- visitData: [],
- visitData2: [],
- salesData: [],
- searchData: [],
- offlineData: [],
- offlineChartData: [],
- salesTypeData: [],
- salesTypeDataOnline: [],
- salesTypeDataOffline: [],
- radarData: [],
- loading: false,
- },
-
- effects: {
- *fetch(_, { call, put }) {
- const response = yield call(fakeChartData);
- yield put({
- type: 'save',
- payload: response,
- });
- },
- *fetchSalesData(_, { call, put }) {
- const response = yield call(fakeChartData);
- yield put({
- type: 'save',
- payload: {
- salesData: response.salesData,
- },
- });
- },
- },
-
- reducers: {
- save(state, { payload }) {
- return {
- ...state,
- ...payload,
- };
- },
- clear() {
- return {
- visitData: [],
- visitData2: [],
- salesData: [],
- searchData: [],
- offlineData: [],
- offlineChartData: [],
- salesTypeData: [],
- salesTypeDataOnline: [],
- salesTypeDataOffline: [],
- radarData: [],
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Dashboard/models/monitor.js b/admin-web/src/pages/Dashboard/models/monitor.js
deleted file mode 100644
index e3e832ff8..000000000
--- a/admin-web/src/pages/Dashboard/models/monitor.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { queryTags } from '@/services/api';
-
-export default {
- namespace: 'monitor',
-
- state: {
- tags: [],
- },
-
- effects: {
- *fetchTags(_, { call, put }) {
- const response = yield call(queryTags);
- yield put({
- type: 'saveTags',
- payload: response.list,
- });
- },
- },
-
- reducers: {
- saveTags(state, action) {
- return {
- ...state,
- tags: action.payload,
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Exception/403.js b/admin-web/src/pages/Exception/403.js
deleted file mode 100644
index 35e4ca3a1..000000000
--- a/admin-web/src/pages/Exception/403.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { formatMessage } from 'umi/locale';
-import Link from 'umi/link';
-import Exception from '@/components/Exception';
-
-const Exception403 = () => (
-
-);
-
-export default Exception403;
diff --git a/admin-web/src/pages/Exception/404.js b/admin-web/src/pages/Exception/404.js
deleted file mode 100644
index 84c986c5e..000000000
--- a/admin-web/src/pages/Exception/404.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { formatMessage } from 'umi/locale';
-import Link from 'umi/link';
-import Exception from '@/components/Exception';
-
-const Exception404 = () => (
-
-);
-
-export default Exception404;
diff --git a/admin-web/src/pages/Exception/500.js b/admin-web/src/pages/Exception/500.js
deleted file mode 100644
index 9d96f2120..000000000
--- a/admin-web/src/pages/Exception/500.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { formatMessage } from 'umi/locale';
-import Link from 'umi/link';
-import Exception from '@/components/Exception';
-
-const Exception500 = () => (
-
-);
-
-export default Exception500;
diff --git a/admin-web/src/pages/Exception/TriggerException.js b/admin-web/src/pages/Exception/TriggerException.js
deleted file mode 100644
index 15ace510f..000000000
--- a/admin-web/src/pages/Exception/TriggerException.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, { PureComponent } from 'react';
-import { Button, Spin, Card } from 'antd';
-import { connect } from 'dva';
-import styles from './style.less';
-
-@connect(state => ({
- isloading: state.error.isloading,
-}))
-class TriggerException extends PureComponent {
- state = {
- isloading: false,
- };
-
- triggerError = code => {
- this.setState({
- isloading: true,
- });
- const { dispatch } = this.props;
- dispatch({
- type: 'error/query',
- payload: {
- code,
- },
- });
- };
-
- render() {
- const { isloading } = this.state;
- return (
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default TriggerException;
diff --git a/admin-web/src/pages/Exception/models/error.js b/admin-web/src/pages/Exception/models/error.js
deleted file mode 100644
index 1bfd93921..000000000
--- a/admin-web/src/pages/Exception/models/error.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import queryError from '@/services/error';
-
-export default {
- namespace: 'error',
-
- state: {
- error: '',
- isloading: false,
- },
-
- effects: {
- *query({ payload }, { call, put }) {
- yield call(queryError, payload.code);
- yield put({
- type: 'trigger',
- payload: payload.code,
- });
- },
- },
-
- reducers: {
- trigger(state, action) {
- return {
- error: action.payload,
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Exception/style.less b/admin-web/src/pages/Exception/style.less
deleted file mode 100644
index 91ec7dcf5..000000000
--- a/admin-web/src/pages/Exception/style.less
+++ /dev/null
@@ -1,7 +0,0 @@
-.trigger {
- background: 'red';
- :global(.ant-btn) {
- margin-right: 8px;
- margin-bottom: 12px;
- }
-}
diff --git a/admin-web/src/pages/Forms/AdvancedForm.js b/admin-web/src/pages/Forms/AdvancedForm.js
deleted file mode 100644
index fbd396893..000000000
--- a/admin-web/src/pages/Forms/AdvancedForm.js
+++ /dev/null
@@ -1,323 +0,0 @@
-import React, { PureComponent } from 'react';
-import {
- Card,
- Button,
- Form,
- Icon,
- Col,
- Row,
- DatePicker,
- TimePicker,
- Input,
- Select,
- Popover,
-} from 'antd';
-import { connect } from 'dva';
-import FooterToolbar from '@/components/FooterToolbar';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import TableForm from './TableForm';
-import styles from './style.less';
-
-const { Option } = Select;
-const { RangePicker } = DatePicker;
-
-const fieldLabels = {
- name: '仓库名',
- url: '仓库域名',
- owner: '仓库管理员',
- approver: '审批人',
- dateRange: '生效日期',
- type: '仓库类型',
- name2: '任务名',
- url2: '任务描述',
- owner2: '执行人',
- approver2: '责任人',
- dateRange2: '生效日期',
- type2: '任务类型',
-};
-
-const tableData = [
- {
- key: '1',
- workId: '00001',
- name: 'John Brown',
- department: 'New York No. 1 Lake Park',
- },
- {
- key: '2',
- workId: '00002',
- name: 'Jim Green',
- department: 'London No. 1 Lake Park',
- },
- {
- key: '3',
- workId: '00003',
- name: 'Joe Black',
- department: 'Sidney No. 1 Lake Park',
- },
-];
-
-@connect(({ loading }) => ({
- submitting: loading.effects['form/submitAdvancedForm'],
-}))
-@Form.create()
-class AdvancedForm extends PureComponent {
- state = {
- width: '100%',
- };
-
- componentDidMount() {
- window.addEventListener('resize', this.resizeFooterToolbar, { passive: true });
- }
-
- componentWillUnmount() {
- window.removeEventListener('resize', this.resizeFooterToolbar);
- }
-
- getErrorInfo = () => {
- const {
- form: { getFieldsError },
- } = this.props;
- const errors = getFieldsError();
- const errorCount = Object.keys(errors).filter(key => errors[key]).length;
- if (!errors || errorCount === 0) {
- return null;
- }
- const scrollToField = fieldKey => {
- const labelNode = document.querySelector(`label[for="${fieldKey}"]`);
- if (labelNode) {
- labelNode.scrollIntoView(true);
- }
- };
- const errorList = Object.keys(errors).map(key => {
- if (!errors[key]) {
- return null;
- }
- return (
- scrollToField(key)}>
-
- {errors[key][0]}
- {fieldLabels[key]}
-
- );
- });
- return (
-
- trigger.parentNode}
- >
-
-
- {errorCount}
-
- );
- };
-
- resizeFooterToolbar = () => {
- requestAnimationFrame(() => {
- const sider = document.querySelectorAll('.ant-layout-sider')[0];
- if (sider) {
- const width = `calc(100% - ${sider.style.width})`;
- const { width: stateWidth } = this.state;
- if (stateWidth !== width) {
- this.setState({ width });
- }
- }
- });
- };
-
- validate = () => {
- const {
- form: { validateFieldsAndScroll },
- dispatch,
- } = this.props;
- validateFieldsAndScroll((error, values) => {
- if (!error) {
- // submit the values
- dispatch({
- type: 'form/submitAdvancedForm',
- payload: values,
- });
- }
- });
- };
-
- render() {
- const {
- form: { getFieldDecorator },
- submitting,
- } = this.props;
- const { width } = this.state;
-
- return (
-
-
-
-
-
-
-
-
- {getFieldDecorator('members', {
- initialValue: tableData,
- })()}
-
-
- {this.getErrorInfo()}
-
-
-
- );
- }
-}
-
-export default AdvancedForm;
diff --git a/admin-web/src/pages/Forms/BasicForm.js b/admin-web/src/pages/Forms/BasicForm.js
deleted file mode 100644
index 55833150a..000000000
--- a/admin-web/src/pages/Forms/BasicForm.js
+++ /dev/null
@@ -1,247 +0,0 @@
-import React, { PureComponent } from 'react';
-import { connect } from 'dva';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import {
- Form,
- Input,
- DatePicker,
- Select,
- Button,
- Card,
- InputNumber,
- Radio,
- Icon,
- Tooltip,
-} from 'antd';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import styles from './style.less';
-
-const FormItem = Form.Item;
-const { Option } = Select;
-const { RangePicker } = DatePicker;
-const { TextArea } = Input;
-
-@connect(({ loading }) => ({
- submitting: loading.effects['form/submitRegularForm'],
-}))
-@Form.create()
-class BasicForms extends PureComponent {
- handleSubmit = e => {
- const { dispatch, form } = this.props;
- e.preventDefault();
- form.validateFieldsAndScroll((err, values) => {
- if (!err) {
- dispatch({
- type: 'form/submitRegularForm',
- payload: values,
- });
- }
- });
- };
-
- render() {
- const { submitting } = this.props;
- const {
- form: { getFieldDecorator, getFieldValue },
- } = this.props;
-
- const formItemLayout = {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 7 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 12 },
- md: { span: 10 },
- },
- };
-
- const submitFormLayout = {
- wrapperCol: {
- xs: { span: 24, offset: 0 },
- sm: { span: 10, offset: 7 },
- },
- };
-
- return (
- }
- content={}
- >
-
-
-
-
- );
- }
-}
-
-export default BasicForms;
diff --git a/admin-web/src/pages/Forms/StepForm/Step1.js b/admin-web/src/pages/Forms/StepForm/Step1.js
deleted file mode 100644
index a62e29419..000000000
--- a/admin-web/src/pages/Forms/StepForm/Step1.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { Fragment } from 'react';
-import { connect } from 'dva';
-import { Form, Input, Button, Select, Divider } from 'antd';
-import router from 'umi/router';
-import styles from './style.less';
-
-const { Option } = Select;
-
-const formItemLayout = {
- labelCol: {
- span: 5,
- },
- wrapperCol: {
- span: 19,
- },
-};
-
-@connect(({ form }) => ({
- data: form.step,
-}))
-@Form.create()
-class Step1 extends React.PureComponent {
- render() {
- const { form, dispatch, data } = this.props;
- const { getFieldDecorator, validateFields } = form;
- const onValidateForm = () => {
- validateFields((err, values) => {
- if (!err) {
- dispatch({
- type: 'form/saveStepFormData',
- payload: values,
- });
- router.push('/form/step-form/confirm');
- }
- });
- };
- return (
-
-
-
-
-
说明
-
转账到支付宝账户
-
- 如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。
-
-
转账到银行卡
-
- 如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。
-
-
-
-
- 付款账户：
-
-
- {data.payAccount}
-
-
-
-
- 收款账户：
-
-
- {data.receiverAccount}
-
-
-
-
- 收款人姓名：
-
-
- {data.receiverName}
-
-
-
-
- 转账金额：
-
-
- {data.amount} 元
-
-
-
- );
- const actions = (
-
-
-
-
- );
- return (
-
- );
- }
-}
-
-export default Step3;
diff --git a/admin-web/src/pages/Forms/StepForm/index.js b/admin-web/src/pages/Forms/StepForm/index.js
deleted file mode 100644
index 98902a0aa..000000000
--- a/admin-web/src/pages/Forms/StepForm/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, { PureComponent, Fragment } from 'react';
-import { Card, Steps } from 'antd';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import styles from '../style.less';
-
-const { Step } = Steps;
-
-export default class StepForm extends PureComponent {
- getCurrentStep() {
- const { location } = this.props;
- const { pathname } = location;
- const pathList = pathname.split('/');
- switch (pathList[pathList.length - 1]) {
- case 'info':
- return 0;
- case 'confirm':
- return 1;
- case 'result':
- return 2;
- default:
- return 0;
- }
- }
-
- render() {
- const { location, children } = this.props;
- return (
-
-
-
-
-
-
-
-
- {children}
-
-
-
- );
- }
-}
diff --git a/admin-web/src/pages/Forms/StepForm/style.less b/admin-web/src/pages/Forms/StepForm/style.less
deleted file mode 100644
index 452e1b3fe..000000000
--- a/admin-web/src/pages/Forms/StepForm/style.less
+++ /dev/null
@@ -1,78 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.stepForm {
- max-width: 500px;
- margin: 40px auto 0;
-}
-
-.stepFormText {
- margin-bottom: 24px;
- :global {
- .ant-form-item-label,
- .ant-form-item-control {
- line-height: 22px;
- }
- }
-}
-
-.result {
- max-width: 560px;
- margin: 0 auto;
- padding: 24px 0 8px;
-}
-
-.desc {
- padding: 0 56px;
- color: @text-color-secondary;
- h3 {
- margin: 0 0 12px 0;
- color: @text-color-secondary;
- font-size: 16px;
- line-height: 32px;
- }
- h4 {
- margin: 0 0 4px 0;
- color: @text-color-secondary;
- font-size: 14px;
- line-height: 22px;
- }
- p {
- margin-top: 0;
- margin-bottom: 12px;
- line-height: 22px;
- }
-}
-
-@media screen and (max-width: @screen-md) {
- .desc {
- padding: 0;
- }
-}
-
-.information {
- line-height: 22px;
- :global {
- .ant-row:not(:last-child) {
- margin-bottom: 24px;
- }
- }
- .label {
- padding-right: 8px;
- color: @heading-color;
- text-align: right;
- @media screen and (max-width: @screen-sm) {
- text-align: left;
- }
- }
-}
-
-.money {
- font-weight: 500;
- font-size: 20px;
- font-family: 'Helvetica Neue', sans-serif;
- line-height: 14px;
-}
-
-.uppercase {
- font-size: 12px;
-}
diff --git a/admin-web/src/pages/Forms/TableForm.js b/admin-web/src/pages/Forms/TableForm.js
deleted file mode 100644
index ae2723e7b..000000000
--- a/admin-web/src/pages/Forms/TableForm.js
+++ /dev/null
@@ -1,261 +0,0 @@
-import React, { PureComponent, Fragment } from 'react';
-import { Table, Button, Input, message, Popconfirm, Divider } from 'antd';
-import isEqual from 'lodash/isEqual';
-import styles from './style.less';
-
-class TableForm extends PureComponent {
- index = 0;
-
- cacheOriginData = {};
-
- constructor(props) {
- super(props);
-
- this.state = {
- data: props.value,
- loading: false,
- /* eslint-disable-next-line react/no-unused-state */
- value: props.value,
- };
- }
-
- static getDerivedStateFromProps(nextProps, preState) {
- if (isEqual(nextProps.value, preState.value)) {
- return null;
- }
- return {
- data: nextProps.value,
- value: nextProps.value,
- };
- }
-
- getRowByKey(key, newData) {
- const { data } = this.state;
- return (newData || data).filter(item => item.key === key)[0];
- }
-
- toggleEditable = (e, key) => {
- e.preventDefault();
- const { data } = this.state;
- const newData = data.map(item => ({ ...item }));
- const target = this.getRowByKey(key, newData);
- if (target) {
- // 进入编辑状态时保存原始数据
- if (!target.editable) {
- this.cacheOriginData[key] = { ...target };
- }
- target.editable = !target.editable;
- this.setState({ data: newData });
- }
- };
-
- newMember = () => {
- const { data } = this.state;
- const newData = data.map(item => ({ ...item }));
- newData.push({
- key: `NEW_TEMP_ID_${this.index}`,
- workId: '',
- name: '',
- department: '',
- editable: true,
- isNew: true,
- });
- this.index += 1;
- this.setState({ data: newData });
- };
-
- remove(key) {
- const { data } = this.state;
- const { onChange } = this.props;
- const newData = data.filter(item => item.key !== key);
- this.setState({ data: newData });
- onChange(newData);
- }
-
- handleKeyPress(e, key) {
- if (e.key === 'Enter') {
- this.saveRow(e, key);
- }
- }
-
- handleFieldChange(e, fieldName, key) {
- const { data } = this.state;
- const newData = data.map(item => ({ ...item }));
- const target = this.getRowByKey(key, newData);
- if (target) {
- target[fieldName] = e.target.value;
- this.setState({ data: newData });
- }
- }
-
- saveRow(e, key) {
- e.persist();
- this.setState({
- loading: true,
- });
- setTimeout(() => {
- if (this.clickedCancel) {
- this.clickedCancel = false;
- return;
- }
- const target = this.getRowByKey(key) || {};
- if (!target.workId || !target.name || !target.department) {
- message.error('请填写完整成员信息。');
- e.target.focus();
- this.setState({
- loading: false,
- });
- return;
- }
- delete target.isNew;
- this.toggleEditable(e, key);
- const { data } = this.state;
- const { onChange } = this.props;
- onChange(data);
- this.setState({
- loading: false,
- });
- }, 500);
- }
-
- cancel(e, key) {
- this.clickedCancel = true;
- e.preventDefault();
- const { data } = this.state;
- const newData = data.map(item => ({ ...item }));
- const target = this.getRowByKey(key, newData);
- if (this.cacheOriginData[key]) {
- Object.assign(target, this.cacheOriginData[key]);
- delete this.cacheOriginData[key];
- }
- target.editable = false;
- this.setState({ data: newData });
- this.clickedCancel = false;
- }
-
- render() {
- const columns = [
- {
- title: '成员姓名',
- dataIndex: 'name',
- key: 'name',
- width: '20%',
- render: (text, record) => {
- if (record.editable) {
- return (
- this.handleFieldChange(e, 'name', record.key)}
- onKeyPress={e => this.handleKeyPress(e, record.key)}
- placeholder="成员姓名"
- />
- );
- }
- return text;
- },
- },
- {
- title: '工号',
- dataIndex: 'workId',
- key: 'workId',
- width: '20%',
- render: (text, record) => {
- if (record.editable) {
- return (
- this.handleFieldChange(e, 'workId', record.key)}
- onKeyPress={e => this.handleKeyPress(e, record.key)}
- placeholder="工号"
- />
- );
- }
- return text;
- },
- },
- {
- title: '所属部门',
- dataIndex: 'department',
- key: 'department',
- width: '40%',
- render: (text, record) => {
- if (record.editable) {
- return (
- this.handleFieldChange(e, 'department', record.key)}
- onKeyPress={e => this.handleKeyPress(e, record.key)}
- placeholder="所属部门"
- />
- );
- }
- return text;
- },
- },
- {
- title: '操作',
- key: 'action',
- render: (text, record) => {
- const { loading } = this.state;
- if (!!record.editable && loading) {
- return null;
- }
- if (record.editable) {
- if (record.isNew) {
- return (
-
- this.saveRow(e, record.key)}>添加
-
- this.remove(record.key)}>
- 删除
-
-
- );
- }
- return (
-
- this.saveRow(e, record.key)}>保存
-
- this.cancel(e, record.key)}>取消
-
- );
- }
- return (
-
- this.toggleEditable(e, record.key)}>编辑
-
- this.remove(record.key)}>
- 删除
-
-
- );
- },
- },
- ];
-
- const { loading, data } = this.state;
-
- return (
-
- (record.editable ? styles.editable : '')}
- />
-
-
- );
- }
-}
-
-export default TableForm;
diff --git a/admin-web/src/pages/Forms/models/form.js b/admin-web/src/pages/Forms/models/form.js
deleted file mode 100644
index 0b241b133..000000000
--- a/admin-web/src/pages/Forms/models/form.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { routerRedux } from 'dva/router';
-import { message } from 'antd';
-import { fakeSubmitForm } from '@/services/api';
-
-export default {
- namespace: 'form',
-
- state: {
- step: {
- payAccount: 'ant-design@alipay.com',
- receiverAccount: 'test@example.com',
- receiverName: 'Alex',
- amount: '500',
- },
- },
-
- effects: {
- *submitRegularForm({ payload }, { call }) {
- yield call(fakeSubmitForm, payload);
- message.success('提交成功');
- },
- *submitStepForm({ payload }, { call, put }) {
- yield call(fakeSubmitForm, payload);
- yield put({
- type: 'saveStepFormData',
- payload,
- });
- yield put(routerRedux.push('/form/step-form/result'));
- },
- *submitAdvancedForm({ payload }, { call }) {
- yield call(fakeSubmitForm, payload);
- message.success('提交成功');
- },
- },
-
- reducers: {
- saveStepFormData(state, { payload }) {
- return {
- ...state,
- step: {
- ...state.step,
- ...payload,
- },
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Forms/style.less b/admin-web/src/pages/Forms/style.less
deleted file mode 100644
index cb23b0b4c..000000000
--- a/admin-web/src/pages/Forms/style.less
+++ /dev/null
@@ -1,90 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.card {
- margin-bottom: 24px;
-}
-
-.heading {
- margin: 0 0 16px 0;
- font-size: 14px;
- line-height: 22px;
-}
-
-.steps:global(.ant-steps) {
- max-width: 750px;
- margin: 16px auto;
-}
-
-.errorIcon {
- margin-right: 24px;
- color: @error-color;
- cursor: pointer;
- i {
- margin-right: 4px;
- }
-}
-
-.errorPopover {
- :global {
- .ant-popover-inner-content {
- min-width: 256px;
- max-height: 290px;
- padding: 0;
- overflow: auto;
- }
- }
-}
-
-.errorListItem {
- padding: 8px 16px;
- list-style: none;
- border-bottom: 1px solid @border-color-split;
- cursor: pointer;
- transition: all 0.3s;
- &:hover {
- background: @primary-1;
- }
- &:last-child {
- border: 0;
- }
- .errorIcon {
- float: left;
- margin-top: 4px;
- margin-right: 12px;
- padding-bottom: 22px;
- color: @error-color;
- }
- .errorField {
- margin-top: 2px;
- color: @text-color-secondary;
- font-size: 12px;
- }
-}
-
-.editable {
- td {
- padding-top: 13px !important;
- padding-bottom: 12.5px !important;
- }
-}
-
-// custom footer for fixed footer toolbar
-.advancedForm + div {
- padding-bottom: 64px;
-}
-
-.advancedForm {
- :global {
- .ant-form .ant-row:last-child .ant-form-item {
- margin-bottom: 24px;
- }
- .ant-table td {
- transition: none !important;
- }
- }
-}
-
-.optional {
- color: @text-color-secondary;
- font-style: normal;
-}
diff --git a/admin-web/src/pages/Home/Home.js b/admin-web/src/pages/Home/Home.js
deleted file mode 100644
index 42651f51b..000000000
--- a/admin-web/src/pages/Home/Home.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React, { Component } from 'react';
-import { Button } from 'antd';
-import DictionarySelect from '@/components/Dictionary/DictionarySelect';
-import DictionaryText from '@/components/Dictionary/DictionaryText';
-import AuthorityControl from '@/components/AuthorityControl';
-
-export default class Home extends Component {
- state = {};
-
- render() {
- return (
-
- {/*
*/}
- {/**/}
- {/**/}
-
home...
-
-
-
-
-
-
-
-
(
-
-
-
- ,
-
-
- ,
-
-
- ,
-
-
- ,
- ]}
- >
- } title={item.title} />
-
-
-
-
-
- )}
- />
-
-
-
- ) : null;
-
- return (
-
-
-
-
-
- (
- ,
- ,
- ,
- ]}
- extra={}
- >
-
- {item.title}
-
- }
- description={
-
- Ant Design
- 设计语言
- 蚂蚁金服
-
- }
- />
-
-
- )}
- />
-
-
- );
- }
-}
-
-export default SearchList;
diff --git a/admin-web/src/pages/List/Articles.less b/admin-web/src/pages/List/Articles.less
deleted file mode 100644
index 3ec950159..000000000
--- a/admin-web/src/pages/List/Articles.less
+++ /dev/null
@@ -1,31 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-a.listItemMetaTitle {
- color: @heading-color;
-}
-.listItemExtra {
- width: 272px;
- height: 1px;
-}
-.selfTrigger {
- margin-left: 12px;
-}
-
-@media screen and (max-width: @screen-xs) {
- .selfTrigger {
- display: block;
- margin-left: 0;
- }
-}
-@media screen and (max-width: @screen-md) {
- .selfTrigger {
- display: block;
- margin-left: 0;
- }
-}
-@media screen and (max-width: @screen-lg) {
- .listItemExtra {
- width: 0;
- height: 1px;
- }
-}
diff --git a/admin-web/src/pages/List/BasicList.js b/admin-web/src/pages/List/BasicList.js
deleted file mode 100644
index 1e33cbce7..000000000
--- a/admin-web/src/pages/List/BasicList.js
+++ /dev/null
@@ -1,340 +0,0 @@
-import React, { PureComponent } from 'react';
-import { findDOMNode } from 'react-dom';
-import moment from 'moment';
-import { connect } from 'dva';
-import {
- List,
- Card,
- Row,
- Col,
- Radio,
- Input,
- Progress,
- Button,
- Icon,
- Dropdown,
- Menu,
- Avatar,
- Modal,
- Form,
- DatePicker,
- Select,
-} from 'antd';
-
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import Result from '@/components/Result';
-
-import styles from './BasicList.less';
-
-const FormItem = Form.Item;
-const RadioButton = Radio.Button;
-const RadioGroup = Radio.Group;
-const SelectOption = Select.Option;
-const { Search, TextArea } = Input;
-
-@connect(({ list, loading }) => ({
- list,
- loading: loading.models.list,
-}))
-@Form.create()
-class BasicList extends PureComponent {
- state = { visible: false, done: false };
-
- formLayout = {
- labelCol: { span: 7 },
- wrapperCol: { span: 13 },
- };
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'list/fetch',
- payload: {
- count: 5,
- },
- });
- }
-
- showModal = () => {
- this.setState({
- visible: true,
- current: undefined,
- });
- };
-
- showEditModal = item => {
- this.setState({
- visible: true,
- current: item,
- });
- };
-
- handleDone = () => {
- setTimeout(() => this.addBtn.blur(), 0);
- this.setState({
- done: false,
- visible: false,
- });
- };
-
- handleCancel = () => {
- setTimeout(() => this.addBtn.blur(), 0);
- this.setState({
- visible: false,
- });
- };
-
- handleSubmit = e => {
- e.preventDefault();
- const { dispatch, form } = this.props;
- const { current } = this.state;
- const id = current ? current.id : '';
-
- setTimeout(() => this.addBtn.blur(), 0);
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- this.setState({
- done: true,
- });
- dispatch({
- type: 'list/submit',
- payload: { id, ...fieldsValue },
- });
- });
- };
-
- deleteItem = id => {
- const { dispatch } = this.props;
- dispatch({
- type: 'list/submit',
- payload: { id },
- });
- };
-
- render() {
- const {
- list: { list },
- loading,
- } = this.props;
- const {
- form: { getFieldDecorator },
- } = this.props;
- const { visible, done, current = {} } = this.state;
-
- const editAndDelete = (key, currentItem) => {
- if (key === 'edit') this.showEditModal(currentItem);
- else if (key === 'delete') {
- Modal.confirm({
- title: '删除任务',
- content: '确定删除该任务吗？',
- okText: '确认',
- cancelText: '取消',
- onOk: () => this.deleteItem(currentItem.id),
- });
- }
- };
-
- const modalFooter = done
- ? { footer: null, onCancel: this.handleDone }
- : { okText: '保存', onOk: this.handleSubmit, onCancel: this.handleCancel };
-
- const Info = ({ title, value, bordered }) => (
-
-
{title}
-
{value}
- {bordered &&
}
-
-
- 全部
- 进行中
- 等待中
-
- ({})} />
-
- );
-
- const paginationProps = {
- showSizeChanger: true,
- showQuickJumper: true,
- pageSize: 5,
- total: 50,
- };
-
- const ListContent = ({ data: { owner, createdAt, percent, status } }) => (
-
-
-
-
开始时间
-
{moment(createdAt).format('YYYY-MM-DD HH:mm')}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (
- {
- e.preventDefault();
- this.showEditModal(item);
- }}
- >
- 编辑
- ,
- ,
- ]}
- >
- }
- title={{item.title}}
- description={item.subDescription}
- />
-
-
- )}
- />
-
-
-
- 段落示意：蚂蚁金服务设计平台 ant.design，用最小的工作量，无缝接入蚂蚁金服生态，
- 提供跨越设计与开发的体验解决方案。
-
-
-
-
-
-
- item ? (
-
- 操作一, 操作二]}>
- }
- title={{item.title}}
- description={
-
- {item.description}
-
- }
- />
-
-
- ) : (
-
-
-
- )
- }
- />
-
-
-
- );
-
- const { match, children, location } = this.props;
-
- return (
-
- {children}
- {/*
- {routes.map(item => (
-
- ))}
- */}
-
- );
- }
-}
-
-export default SearchList;
diff --git a/admin-web/src/pages/List/Projects.js b/admin-web/src/pages/List/Projects.js
deleted file mode 100644
index 3f4a6e9d7..000000000
--- a/admin-web/src/pages/List/Projects.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import React, { PureComponent } from 'react';
-import moment from 'moment';
-import { connect } from 'dva';
-import { Row, Col, Form, Card, Select, List } from 'antd';
-import { FormattedMessage } from 'umi/locale';
-
-import TagSelect from '@/components/TagSelect';
-import AvatarList from '@/components/AvatarList';
-import Ellipsis from '@/components/Ellipsis';
-import StandardFormRow from '@/components/StandardFormRow';
-
-import styles from './Projects.less';
-
-const { Option } = Select;
-const FormItem = Form.Item;
-
-/* eslint react/no-array-index-key: 0 */
-
-@connect(({ list, loading }) => ({
- list,
- loading: loading.models.list,
-}))
-@Form.create({
- onValuesChange({ dispatch }, changedValues, allValues) {
- // 表单项变化时请求数据
- // eslint-disable-next-line
- console.log(changedValues, allValues);
- // 模拟查询表单生效
- dispatch({
- type: 'list/fetch',
- payload: {
- count: 8,
- },
- });
- },
-})
-class CoverCardList extends PureComponent {
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'list/fetch',
- payload: {
- count: 8,
- },
- });
- }
-
- render() {
- const {
- list: { list = [] },
- loading,
- form,
- } = this.props;
- const { getFieldDecorator } = form;
-
- const cardList = list ? (
- (
-
- }
- >
- {item.title}}
- description={{item.subDescription}}
- />
-
-
{moment(item.updatedAt).fromNow()}
-
-
- {item.members.map((member, i) => (
-
- ))}
-
-
-
-
{this.renderForm()}
-
-
- {selectedRows.length > 0 && (
-
-
-
-
-
-
- )}
-
-
-
-
-
{row.skuName}
-
-
配送信息
{' '}
-
-
- 收货人: {name} ({mobile})
-
- 配件方式: 快递 TODO暂时只有一种
- 收件地址: {address}
-
-
-
-
-
发货方式
{' '}
-
-
-
-
- );
-});
-
-export default OrderDelivery;
diff --git a/admin-web/src/pages/Order/OrderDelivery.less b/admin-web/src/pages/Order/OrderDelivery.less
deleted file mode 100644
index cce8ea7ae..000000000
--- a/admin-web/src/pages/Order/OrderDelivery.less
+++ /dev/null
@@ -1,9 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.goodImg {
- @size: 100px;
-
- width: @size;
- height: @size;
-}
diff --git a/admin-web/src/pages/Order/OrderDetails.js b/admin-web/src/pages/Order/OrderDetails.js
deleted file mode 100644
index f1635f53a..000000000
--- a/admin-web/src/pages/Order/OrderDetails.js
+++ /dev/null
@@ -1,691 +0,0 @@
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import router from 'umi/router';
-import {
- Row,
- Col,
- Card,
- Form,
- Input,
- Select,
- Icon,
- Button,
- Dropdown,
- Menu,
- InputNumber,
- DatePicker,
- Modal,
- message,
- Badge,
- Divider,
- Steps,
- Radio,
-} from 'antd';
-import StandardTable from '@/components/StandardTable';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './OrderDetails.less';
-
-const FormItem = Form.Item;
-const { Step } = Steps;
-const { TextArea } = Input;
-const { Option } = Select;
-const RadioGroup = Radio.Group;
-const getValue = obj =>
- Object.keys(obj)
- .map(key => obj[key])
- .join(',');
-const statusMap = ['default', 'processing', 'success', 'error'];
-const status = ['关闭', '运行中', '已上线', '异常'];
-
-const CreateForm = Form.create()(props => {
- const { modalVisible, form, handleAdd, handleModalVisible } = props;
- const okHandle = () => {
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- form.resetFields();
- handleAdd(fieldsValue);
- });
- };
- return (
- handleModalVisible()}
- >
-
- {form.getFieldDecorator('desc', {
- rules: [{ required: true, message: '请输入至少五个字符的规则描述！', min: 5 }],
- })()}
-
-
- );
-});
-
-@Form.create()
-class UpdateForm extends PureComponent {
- static defaultProps = {
- handleUpdate: () => {},
- handleUpdateModalVisible: () => {},
- values: {},
- };
-
- constructor(props) {
- super(props);
-
- this.state = {
- formVals: {
- name: props.values.name,
- desc: props.values.desc,
- key: props.values.key,
- target: '0',
- template: '0',
- type: '1',
- time: '',
- frequency: 'month',
- },
- currentStep: 0,
- };
-
- this.formLayout = {
- labelCol: { span: 7 },
- wrapperCol: { span: 13 },
- };
- }
-
- handleNext = currentStep => {
- const { form, handleUpdate } = this.props;
- const { formVals: oldValue } = this.state;
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- const formVals = { ...oldValue, ...fieldsValue };
- this.setState(
- {
- formVals,
- },
- () => {
- if (currentStep < 2) {
- this.forward();
- } else {
- handleUpdate(formVals);
- }
- }
- );
- });
- };
-
- backward = () => {
- const { currentStep } = this.state;
- this.setState({
- currentStep: currentStep - 1,
- });
- };
-
- forward = () => {
- const { currentStep } = this.state;
- this.setState({
- currentStep: currentStep + 1,
- });
- };
-
- renderContent = (currentStep, formVals) => {
- const { form } = this.props;
- if (currentStep === 1) {
- return [
-
- {form.getFieldDecorator('target', {
- initialValue: formVals.target,
- })(
-
- )}
- ,
-
- {form.getFieldDecorator('template', {
- initialValue: formVals.template,
- })(
-
- )}
- ,
-
- {form.getFieldDecorator('type', {
- initialValue: formVals.type,
- })(
-
- 强
- 弱
-
- )}
- ,
- ];
- }
- if (currentStep === 2) {
- return [
-
- {form.getFieldDecorator('time', {
- rules: [{ required: true, message: '请选择开始时间！' }],
- })(
-
- )}
- ,
-
- {form.getFieldDecorator('frequency', {
- initialValue: formVals.frequency,
- })(
-
- )}
- ,
- ];
- }
- return [
-
- {form.getFieldDecorator('name', {
- rules: [{ required: true, message: '请输入规则名称！' }],
- initialValue: formVals.name,
- })()}
- ,
-
- {form.getFieldDecorator('desc', {
- rules: [{ required: true, message: '请输入至少五个字符的规则描述！', min: 5 }],
- initialValue: formVals.desc,
- })()}
- ,
- ];
- };
-
- renderFooter = currentStep => {
- const { handleUpdateModalVisible, values } = this.props;
- if (currentStep === 1) {
- return [
- ,
- ,
- ,
- ];
- }
- if (currentStep === 2) {
- return [
- ,
- ,
- ,
- ];
- }
- return [
- ,
- ,
- ];
- };
-
- render() {
- const { updateModalVisible, handleUpdateModalVisible, values } = this.props;
- const { currentStep, formVals } = this.state;
-
- return (
- handleUpdateModalVisible(false, values)}
- afterClose={() => handleUpdateModalVisible()}
- >
-
-
-
-
-
- {this.renderContent(currentStep, formVals)}
-
- );
- }
-}
-
-/* eslint react/no-multi-comp:0 */
-@connect(({ rule, loading }) => ({
- rule,
- loading: loading.models.rule,
-}))
-@Form.create()
-class TableList extends PureComponent {
- state = {
- modalVisible: false,
- updateModalVisible: false,
- expandForm: false,
- selectedRows: [],
- formValues: {},
- stepFormValues: {},
- };
-
- columns = [
- {
- title: '规则名称',
- dataIndex: 'name',
- render: text => this.previewItem(text)}>{text},
- },
- {
- title: '描述',
- dataIndex: 'desc',
- },
- {
- title: '服务调用次数',
- dataIndex: 'callNo',
- sorter: true,
- render: val => `${val} 万`,
- // mark to display a total number
- needTotal: true,
- },
- {
- title: '状态',
- dataIndex: 'status',
- filters: [
- {
- text: status[0],
- value: 0,
- },
- {
- text: status[1],
- value: 1,
- },
- {
- text: status[2],
- value: 2,
- },
- {
- text: status[3],
- value: 3,
- },
- ],
- render(val) {
- return ;
- },
- },
- {
- title: '上次调度时间',
- dataIndex: 'updatedAt',
- sorter: true,
- render: val => {moment(val).format('YYYY-MM-DD HH:mm:ss')},
- },
- {
- title: '操作',
- render: (text, record) => (
-
- this.handleUpdateModalVisible(true, record)}>配置
-
- 订阅警报
-
- ),
- },
- ];
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'rule/fetch',
- });
- }
-
- handleStandardTableChange = (pagination, filtersArg, sorter) => {
- const { dispatch } = this.props;
- const { formValues } = this.state;
-
- const filters = Object.keys(filtersArg).reduce((obj, key) => {
- const newObj = { ...obj };
- newObj[key] = getValue(filtersArg[key]);
- return newObj;
- }, {});
-
- const params = {
- currentPage: pagination.current,
- pageSize: pagination.pageSize,
- ...formValues,
- ...filters,
- };
- if (sorter.field) {
- params.sorter = `${sorter.field}_${sorter.order}`;
- }
-
- dispatch({
- type: 'rule/fetch',
- payload: params,
- });
- };
-
- previewItem = id => {
- router.push(`/profile/basic/${id}`);
- };
-
- handleFormReset = () => {
- const { form, dispatch } = this.props;
- form.resetFields();
- this.setState({
- formValues: {},
- });
- dispatch({
- type: 'rule/fetch',
- payload: {},
- });
- };
-
- toggleForm = () => {
- const { expandForm } = this.state;
- this.setState({
- expandForm: !expandForm,
- });
- };
-
- handleMenuClick = e => {
- const { dispatch } = this.props;
- const { selectedRows } = this.state;
-
- if (selectedRows.length === 0) return;
- switch (e.key) {
- case 'remove':
- dispatch({
- type: 'rule/remove',
- payload: {
- key: selectedRows.map(row => row.key),
- },
- callback: () => {
- this.setState({
- selectedRows: [],
- });
- },
- });
- break;
- default:
- break;
- }
- };
-
- handleSelectRows = rows => {
- this.setState({
- selectedRows: rows,
- });
- };
-
- handleSearch = e => {
- e.preventDefault();
-
- const { dispatch, form } = this.props;
-
- form.validateFields((err, fieldsValue) => {
- if (err) return;
-
- const values = {
- ...fieldsValue,
- updatedAt: fieldsValue.updatedAt && fieldsValue.updatedAt.valueOf(),
- };
-
- this.setState({
- formValues: values,
- });
-
- dispatch({
- type: 'rule/fetch',
- payload: values,
- });
- });
- };
-
- handleModalVisible = flag => {
- this.setState({
- modalVisible: !!flag,
- });
- };
-
- handleUpdateModalVisible = (flag, record) => {
- this.setState({
- updateModalVisible: !!flag,
- stepFormValues: record || {},
- });
- };
-
- handleAdd = fields => {
- const { dispatch } = this.props;
- dispatch({
- type: 'rule/add',
- payload: {
- desc: fields.desc,
- },
- });
-
- message.success('添加成功');
- this.handleModalVisible();
- };
-
- handleUpdate = fields => {
- const { dispatch } = this.props;
- const { formValues } = this.state;
- dispatch({
- type: 'rule/update',
- payload: {
- query: formValues,
- body: {
- name: fields.name,
- desc: fields.desc,
- key: fields.key,
- },
- },
- });
-
- message.success('配置成功');
- this.handleUpdateModalVisible();
- };
-
- renderSimpleForm() {
- const {
- form: { getFieldDecorator },
- } = this.props;
- return (
-
- );
- }
-
- renderAdvancedForm() {
- const {
- form: { getFieldDecorator },
- } = this.props;
- return (
-
- );
- }
-
- renderForm() {
- const { expandForm } = this.state;
- return expandForm ? this.renderAdvancedForm() : this.renderSimpleForm();
- }
-
- render() {
- const {
- rule: { data },
- loading,
- } = this.props;
- const { selectedRows, modalVisible, updateModalVisible, stepFormValues } = this.state;
- const menu = (
-
- );
-
- const parentMethods = {
- handleAdd: this.handleAdd,
- handleModalVisible: this.handleModalVisible,
- };
- const updateMethods = {
- handleUpdateModalVisible: this.handleUpdateModalVisible,
- handleUpdate: this.handleUpdate,
- };
- return (
-
-
-
-
{this.renderForm()}
-
-
- {selectedRows.length > 0 && (
-
-
-
-
-
-
- )}
-
-
-
-
-
-
-
{quantity}件
-
- {presentPrice / 100.0} 元/{presentTotal / 100.0} 元
-
-
-
-
- {renderGoods(item.orderItems)}
-
-
-
-
(下单时间)
-
{moment(createTime).format('YYYY-MM-DD HH:mm')}
-
-
-
-
-
-
-
{renderStatusButtons(props)}
-
-
-
(实付金额)
-
{item.presentPrice / 100}元
-
-
-
(
-
-
-
-
-
订单号: {item.orderNo}
-
-
支付金额: {item.payAmount / 100} 元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{quantity}件
-
- {price / 100} 元/{quantity * (price / 100)} 元
-
-
-
-
-
(下单时间)
-
{moment(createTime).format('YYYY-MM-DD HH:mm')}
-
-
-
-
-
-
-
{renderStatusButtons()}
-
-
-
(实付金额)
-
{payAmount / 100}元
-
-
-
(
-
-
-
-
-
订单号: {item.orderNo}
-
-
支付金额: {item.payAmount / 100} 元
-
-
-
-
-
- {item.orderItems.map(orderItem => {
- return (
-
- );
- })}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{moment(approvalTime).format('YYYY-MM-DD HH:mm')}
;
- }
- return 无
;
- },
- },
- {
- title: '申请时间',
- dataIndex: 'createTime',
- key: 'createTime',
- render(createTime) {
- return {moment(createTime).format('YYYY-MM-DD HH:mm')}
;
- },
- },
- {
- title: '操作',
- render: row => {
- const { status } = row;
- let buttons;
- if (status === 1) {
- buttons = (
-
- );
- } else if (status === 2) {
- buttons = (
-
- );
- } else if (status === 5) {
- buttons = (
-
- );
- }
- return buttons;
- },
- },
- ];
-
- const pagination = {
- total: totalCount,
- index,
- pageSize,
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default OrderRefundsList;
diff --git a/admin-web/src/pages/OrderRefunds/OrderRefundsList.less b/admin-web/src/pages/OrderRefunds/OrderRefundsList.less
deleted file mode 100644
index bc5601c1a..000000000
--- a/admin-web/src/pages/OrderRefunds/OrderRefundsList.less
+++ /dev/null
@@ -1,49 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableListForm {
- :global {
- .ant-form-item {
- display: flex;
- margin-right: 0;
- margin-bottom: 24px;
- > .ant-form-item-label {
- width: auto;
- padding-right: 8px;
- line-height: 32px;
- }
- .ant-form-item-control {
- line-height: 32px;
- }
- }
- .ant-form-item-control-wrapper {
- flex: 1;
- }
- }
- .submitButtons {
- display: block;
- margin-bottom: 24px;
- white-space: nowrap;
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .tableListForm :global(.ant-form-item) {
- margin-right: 24px;
- }
-}
-
-@media screen and (max-width: @screen-md) {
- .tableListForm :global(.ant-form-item) {
- margin-right: 8px;
- }
-}
diff --git a/admin-web/src/pages/OrderRefunds/TableSearch.js b/admin-web/src/pages/OrderRefunds/TableSearch.js
deleted file mode 100644
index f13d2b154..000000000
--- a/admin-web/src/pages/OrderRefunds/TableSearch.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-import { Button, Col, Form, Input, Row, DatePicker } from 'antd';
-
-const FormItem = Form.Item;
-
-/**
- * table 查询
- *
- * @type {React.ComponentClass>}
- */
-const TableSearch = Form.create()(props => {
- const { handleSearch } = props;
- const { getFieldDecorator, validateFields, form } = props.form;
-
- function onSubmit(e) {
- e.preventDefault();
-
- validateFields((err, fields) => {
- const buildTime = (fieldValue, key) => {
- const res = {};
- if (fieldValue && fieldValue.length >= 2) {
- const keySuffix = key.substring(0, 1).toUpperCase() + key.substring(1);
- res[`start${keySuffix}`] = fieldValue[0].format('YYYY-MM-DD HH:mm:ss');
- res[`end${keySuffix}`] = fieldValue[1].format('YYYY-MM-DD HH:mm:ss');
- }
- return res;
- };
-
- const timeFields = ['createTime'];
- const buildSearchParams = fields2 => {
- let res = {};
- Object.keys(fields).map(objectKey => {
- const fieldValue = fields2[objectKey];
- if (timeFields.indexOf(objectKey) !== -1) {
- // 处理时间
- res = {
- ...res,
- ...buildTime(fieldValue, objectKey),
- };
- } else if (fieldValue !== undefined) {
- res[objectKey] = fieldValue;
- }
- return true;
- });
- return res;
- };
-
- const searchParams = buildSearchParams(fields);
- if (handleSearch) {
- handleSearch(searchParams);
- }
- });
- }
-
- function handleFormReset() {
- form.resetFields();
- }
-
- return (
-
- );
-});
-
-export default TableSearch;
diff --git a/admin-web/src/pages/Pay/PayRefundList.js b/admin-web/src/pages/Pay/PayRefundList.js
deleted file mode 100644
index 03bb590af..000000000
--- a/admin-web/src/pages/Pay/PayRefundList.js
+++ /dev/null
@@ -1,319 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber, DatePicker, Select
-} from 'antd';
-const TabPane = Tabs.TabPane;
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-const { RangePicker } = DatePicker;
-
-import styles from './PayRefundList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-
-const statuses = {
- 1: '处理中',
- 2: '成功',
- 3: '失败',
-};
-
-const payChannels = {
- 100: '微信 App 支付',
- 101: '微信 JS API 支付',
- 200: '支付宝 App 支付',
- 9999: 'ping++',
-};
-
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,}) {
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'payRefundList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD HH:mm:ss')},
- width: 120,
- },
- {
- title: '完成时间',
- dataIndex: 'finishTime',
- render: val => val ? {moment(val).format('YYYY-MM-DD HH:mm:ss')} : '',
- width: 120,
- },
- {
- title: '渠道流水号',
- dataIndex: 'tradeNo',
- },
- {
- title: '退款金额',
- dataIndex: 'price',
- render: val => val / 100.0,
- },
- {
- title: '退款状态',
- dataIndex: 'status',
- render: val => statuses[val + ''],
- },
- {
- title: '支付时间',
- dataIndex: 'transaction.finishTime',
- render: val => val ? {moment(val).format('YYYY-MM-DD HH:mm:ss')} : '',
- width: 120,
- },
- {
- title: '商户订单号',
- dataIndex: 'orderId',
- },
- {
- title: '商品名称',
- dataIndex: 'transaction.orderSubject',
- },
- {
- title: '支付金额',
- dataIndex: 'transaction.price',
- },
- {
- title: '支付渠道',
- dataIndex: 'transaction.payChannel',
- render: val => payChannels[val + ''],
- },
- {
- title: '操作',
- width: 120,
- render: (text, record) => (
-
- {/* this.handleModalVisible(true, 'update', record)}>更新*/}
- alert('正在开发中')}>详情
-
- ),
- },
- ];
-
- // console.log(pagination);
-
- return (
-
- )
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- } = props;
-
- function search() {
- const getBeginAndEndTime = (key, beginKey, endKey) => {
- let val = form.getFieldsValue()[key];
- if (val && val.length === 2) {
- let res = {};
- res[beginKey] = val[0].format('YYYY-MM-DD HH:mm:ss');
- res[endKey] = val[1].format('YYYY-MM-DD HH:mm:ss');
- return res;
- }
- return {};
- };
-
- dispatch({
- type: 'payRefundList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
- createTime: undefined,
- finishTime: undefined,
- ...getBeginAndEndTime('createTime', 'createBeginTime', 'createEndTime'),
- ...getBeginAndEndTime('finishTime', 'finishBeginTime', 'finishEndTime'),
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// payRefundList
-@connect(({ payRefundList }) => ({
- ...payRefundList,
- // list: payRefundList.list.spus,
- // loading: loading.models.payRefundList,
-}))
-
-@Form.create()
-class PayTransactionList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- };
-
- componentDidMount() {
- const { dispatch, searchParams } = this.props;
- // 查询初始数据
- dispatch({
- type: 'payRefundList/page',
- payload: {
- ...searchParams,
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
- handleSortModalVisible = (sortModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'payRefundList/setAll',
- payload: {
- sortModalVisible,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, formVals, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleSortModalVisible: this.handleSortModalVisible, // Func
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- return (
-
-
-
-
- {/* alert('正在开发中')}*/}
- {/*>*/}
- {/* 新建限时折扣*/}
- {/**/}
-
-
-
-
- );
- }
-}
-
-export default PayTransactionList;
diff --git a/admin-web/src/pages/Pay/PayRefundList.less b/admin-web/src/pages/Pay/PayRefundList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Pay/PayRefundList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Pay/PayTransactionList.js b/admin-web/src/pages/Pay/PayTransactionList.js
deleted file mode 100644
index 1e2146521..000000000
--- a/admin-web/src/pages/Pay/PayTransactionList.js
+++ /dev/null
@@ -1,328 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber, DatePicker, Select
-} from 'antd';
-const TabPane = Tabs.TabPane;
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-const { RangePicker } = DatePicker;
-
-import styles from './PayTransactionList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-
-const statuses = {
- 1: '等待支付',
- 2: '支付成功',
- 3: '取消支付',
-};
-
-const payChannels = {
- 100: '微信 App 支付',
- 101: '微信 JS API 支付',
- 200: '支付宝 App 支付',
- 9999: 'ping++',
-};
-
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,}) {
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'payTransactionList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD HH:mm:ss')},
- width: 120,
- },
- {
- title: '支付时间',
- dataIndex: 'paymentTime',
- render: val => val ? {moment(val).format('YYYY-MM-DD HH:mm:ss')} : '',
- width: 120,
- },
- {
- title: '商户订单号',
- dataIndex: 'orderId',
- },
- {
- title: '商品名称',
- dataIndex: 'orderSubject',
- },
- {
- title: '支付金额',
- dataIndex: 'price',
- render: val => val / 100.0,
- },
- {
- title: '支付状态',
- dataIndex: 'status',
- render: val => statuses[val + ''],
- },
- {
- title: '支付渠道',
- dataIndex: 'payChannel',
- render: val => payChannels[val + ''],
- },
- {
- title: '退款情况',
- dataIndex: 'refundTotal',
- render: val => val && val > 0 ? '有退款' : '无退款' ,
- },
- {
- title: '退款金额',
- dataIndex: 'refundTotal',
- render: val => val && val > 0 ? val / 100.0 : undefined ,
- },
- {
- title: '操作',
- width: 120,
- render: (text, record) => (
-
- {/* this.handleModalVisible(true, 'update', record)}>更新*/}
- alert('正在开发中')}>退款
-
- ),
- },
- ];
-
- // console.log(pagination);
-
- return (
-
- )
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- } = props;
-
- function search() {
- const getBeginAndEndTime = (key, beginKey, endKey) => {
- let val = form.getFieldsValue()[key];
- if (val && val.length === 2) {
- let res = {};
- res[beginKey] = val[0].format('YYYY-MM-DD HH:mm:ss');
- res[endKey] = val[1].format('YYYY-MM-DD HH:mm:ss');
- return res;
- }
- return {};
- };
-
- dispatch({
- type: 'payTransactionList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
- createTime: undefined,
- paymentTime: undefined,
- ...getBeginAndEndTime('createTime', 'createBeginTime', 'createEndTime'),
- ...getBeginAndEndTime('paymentTime', 'paymentBeginTime', 'paymentEndTime'),
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// payTransactionList
-@connect(({ payTransactionList }) => ({
- ...payTransactionList,
- // list: payTransactionList.list.spus,
- // loading: loading.models.payTransactionList,
-}))
-
-@Form.create()
-class PayTransactionList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- };
-
- componentDidMount() {
- const { dispatch, searchParams } = this.props;
- // 查询初始数据
- dispatch({
- type: 'payTransactionList/page',
- payload: {
- ...searchParams,
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
- handleSortModalVisible = (sortModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'payTransactionList/setAll',
- payload: {
- sortModalVisible,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, formVals, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleSortModalVisible: this.handleSortModalVisible, // Func
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- return (
-
-
-
-
- {/* alert('正在开发中')}*/}
- {/*>*/}
- {/* 新建限时折扣*/}
- {/**/}
-
-
-
-
- );
- }
-}
-
-export default PayTransactionList;
diff --git a/admin-web/src/pages/Pay/PayTransactionList.less b/admin-web/src/pages/Pay/PayTransactionList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Pay/PayTransactionList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Product/ProductAttrList.js b/admin-web/src/pages/Product/ProductAttrList.js
deleted file mode 100644
index fad82cb73..000000000
--- a/admin-web/src/pages/Product/ProductAttrList.js
+++ /dev/null
@@ -1,550 +0,0 @@
-import React, { PureComponent, Fragment, Component } from 'react';
-import {
- Row,
- Col,
- Form,
- Card,
- Table,
- Button,
- Divider,
- Modal,
- Input,
- message,
- Switch,
- Select,
-} from 'antd';
-import moment from 'moment';
-import { connect } from 'dva';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import PaginationHelper from '../../../helpers/PaginationHelper';
-import styles from './ProductAttrList.less';
-
-const FormItem = Form.Item;
-const Option = Select.Option;
-
-const ValueCreateForm = Form.create()(props => {
- const {
- valueModalVisible,
- form,
- handleValueAdd,
- handleValueModalVisible,
- modalType,
- initValues,
- tree,
- } = props;
-
- const okHandle = () => {
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- let pid = fieldsValue.pid;
- if (fieldsValue.pid) {
- pid = pid.split('-')[1];
- fieldsValue.pid = pid;
- }
- form.resetFields();
- handleValueAdd({
- fields: fieldsValue,
- modalType,
- initValues,
- });
- });
- };
-
- const selectStyle = {
- width: 200,
- };
-
- function onTypeChange(event) {
- initValues.type = parseInt(event.target.value);
- }
-
- const title = modalType === 'add' ? '添加规格值' : '编辑规格值';
- const okText = modalType === 'add' ? '添加' : '编辑';
- return (
- handleValueModalVisible()}
- >
- {modalType === 'add' ? (
-
- {form.getFieldDecorator('attrId', {
- // initialValue: template.durationHour ? template.durationHour : '3',
- rules: [
- {
- required: true,
- message: '请选择规格',
- },
- ],
- })(
-
- )}
-
- ) : null}
-
- {form.getFieldDecorator('name', {
- initialValue: initValues ? initValues.name : null,
- rules: [{ required: true, message: '请输入规格值！', min: 2 }],
- })()}
-
-
- );
-});
-
-const CreateForm = Form.create()(props => {
- const { modalVisible, form, handleAdd, handleModalVisible, modalType, initValues } = props;
-
- const okHandle = () => {
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- let pid = fieldsValue.pid;
- if (fieldsValue.pid) {
- pid = pid.split('-')[1];
- fieldsValue.pid = pid;
- }
- form.resetFields();
- handleAdd({
- fields: fieldsValue,
- modalType,
- initValues,
- });
- });
- };
-
- const selectStyle = {
- width: 200,
- };
-
- function onTypeChange(event) {
- initValues.type = parseInt(event.target.value);
- }
-
- const title = modalType === 'add' ? '添加规格' : '编辑规格';
- const okText = modalType === 'add' ? '添加' : '编辑';
- return (
- handleModalVisible()}
- >
-
- {form.getFieldDecorator('name', {
- initialValue: initValues ? initValues.name : null,
- rules: [{ required: true, message: '请输入规格名称！', min: 2 }],
- })()}
-
-
- );
-});
-
-@connect(({ productAttrList, loading }) => ({
- productAttrList,
- attrData: productAttrList.attrData,
- tree: productAttrList.tree,
- loading: loading.models.productAttrList,
-}))
-@Form.create()
-export default class ProductAttrList extends PureComponent {
- state = {
- modalVisible: false,
- valueModalVisible: false,
- modalType: 'add', //add or update
- initValues: {},
- current: 1,
- pageSize: 10,
- name: null,
- };
-
- componentDidMount() {
- this.initFetch();
- }
-
- initFetch = () => {
- const { dispatch } = this.props;
- const { current, pageSize, name } = this.state;
- dispatch({
- type: 'productAttrList/page',
- payload: {
- pageNo: current,
- pageSize,
- name,
- },
- });
- // const { dispatch } = this.props;
- dispatch({
- type: 'productAttrList/tree',
- payload: {
- ...PaginationHelper.defaultPayload,
- },
- });
- };
-
- expandedRowRender = record => {
- const columns = [
- {
- title: '规格值',
- dataIndex: 'name',
- },
- {
- title: '状态',
- // dataIndex: 'status',
- render: (text, record) => (
- this.switchValueChange(checked, record)}
- />
- ),
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- sorter: true,
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- render: (text, record) => (
-
- this.handleValueModalVisible(true, 'update', record)}>编辑
-
- {/* this.handleDelete(record)}>
- 删除
- */}
-
- ),
- },
- ];
-
- return ;
- };
-
- handleAdd = ({ fields, modalType, initValues }) => {
- const { dispatch } = this.props;
- if (modalType === 'add') {
- dispatch({
- type: 'productAttrList/add',
- payload: {
- body: {
- ...fields,
- },
- onSuccess: () => {
- message.success('添加成功');
- this.handleModalVisible();
- this.initFetch();
- },
- onFail: response => {
- message.warn('添加失败' + response.message);
- },
- },
- });
- } else {
- dispatch({
- type: 'productAttrList/update',
- payload: {
- body: {
- ...initValues,
- ...fields,
- },
- onSuccess: () => {
- message.success('更新成功');
- this.handleModalVisible();
- this.initFetch();
- },
- onFail: response => {
- message.warn('更新失败' + response.message);
- },
- },
- });
- }
- };
-
- handleValueAdd = ({ fields, modalType, initValues }) => {
- const { dispatch } = this.props;
- if (modalType === 'add') {
- dispatch({
- type: 'productAttrList/value_add',
- payload: {
- body: {
- ...fields,
- },
- onSuccess: () => {
- message.success('添加成功');
- this.handleValueModalVisible();
- this.initFetch();
- },
- onFail: response => {
- message.warn('添加失败' + response.message);
- },
- },
- });
- } else {
- dispatch({
- type: 'productAttrList/value_update',
- payload: {
- body: {
- ...initValues,
- ...fields,
- },
- onSuccess: () => {
- message.success('更新成功');
- this.handleValueModalVisible();
- this.initFetch();
- },
- onFail: response => {
- message.warn('更新失败' + response.message);
- },
- },
- });
- }
- };
-
- handleModalVisible = (flag, modalType, initValues) => {
- this.setState({
- modalVisible: !!flag,
- initValues: initValues || {},
- modalType: modalType || 'add',
- });
- };
-
- handleValueModalVisible = (flag, modalType, initValues) => {
- this.setState({
- valueModalVisible: !!flag,
- initValues: initValues || {},
- modalType: modalType || 'add',
- });
- };
-
- handleTableChange = pagination => {
- const { pageSize, current, index } = pagination;
- this.setState(
- {
- current,
- pageSize,
- },
- function() {
- this.initFetch();
- }
- );
- };
-
- switchValueChange = (checked, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productAttrList/value_update_status',
- payload: {
- body: {
- id: record.id,
- status: checked ? 1 : 2,
- },
- onSuccess: () => {
- message.success('修改状态成功');
- this.initFetch();
- },
- },
- });
- };
-
- switchChange = (checked, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productAttrList/update_status',
- payload: {
- body: {
- id: record.id,
- status: checked ? 1 : 2,
- },
- onSuccess: () => {
- message.success('修改状态成功');
- this.initFetch();
- },
- },
- });
- };
-
- handleFormReset = () => {
- const { form, dispatch } = this.props;
- form.resetFields();
- this.setState(
- {
- name: null,
- },
- function() {
- this.initFetch();
- }
- );
- };
-
- handleCondition = e => {
- e.preventDefault();
-
- const { dispatch, form } = this.props;
-
- form.validateFields((err, fieldsValue) => {
- if (err) return;
- const values = {
- ...fieldsValue,
- };
-
- if (values.name) {
- this.setState(
- {
- searched: true,
- name: values.name,
- },
- function() {
- this.initFetch();
- }
- );
- } else {
- this.initFetch();
- }
-
- // dispatch({
- // type: 'fenfa/getCategoryList',
- // payload: {
- // key: values.name
- // },
- // });
- });
- };
-
- renderSimpleForm() {
- const { form } = this.props;
- const { getFieldDecorator } = form;
- return (
-
- );
- }
-
- render() {
- const { attrData, productAttrList, loading, tree } = this.props;
- const columns = [
- {
- title: '规格名称',
- dataIndex: 'name',
- },
- {
- title: '状态',
- // dataIndex: 'status',
- render: (text, record) => (
- this.switchChange(checked, record)}
- />
- ),
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- sorter: true,
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- render: (text, record) => (
-
- this.handleModalVisible(true, 'update', record)}>编辑
-
- this.handleValueModalVisible(true, 'add', {})}>新建规格值
- {/* this.handleDelete(record)}>
- 删除
- */}
-
- ),
- },
- ];
-
- const { modalVisible, modalType, initValues, valueModalVisible } = this.state;
-
- const parentMethods = {
- handleAdd: this.handleAdd,
- handleModalVisible: this.handleModalVisible,
- modalType,
- initValues,
- };
-
- const valueFormParentMethods = {
- handleValueAdd: this.handleValueAdd,
- handleValueModalVisible: this.handleValueModalVisible,
- modalType,
- initValues,
- tree: tree,
- };
-
- const pagination = {
- total: attrData.count,
- index: this.state.current,
- pageSize: this.state.pageSize,
- };
-
- return (
-
-
-
-
-
-
-
-
-
- {this.renderSimpleForm()}
-
-
-
-
this.handleTableChange(pagination)}
- />
-
- {modalVisible ? : null}
- {valueModalVisible ? (
-
- ) : null}
-
- );
- }
-}
diff --git a/admin-web/src/pages/Product/ProductAttrList.less b/admin-web/src/pages/Product/ProductAttrList.less
deleted file mode 100644
index 22e257421..000000000
--- a/admin-web/src/pages/Product/ProductAttrList.less
+++ /dev/null
@@ -1,11 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
diff --git a/admin-web/src/pages/Product/ProductBrandList.js b/admin-web/src/pages/Product/ProductBrandList.js
deleted file mode 100644
index 11fb120c6..000000000
--- a/admin-web/src/pages/Product/ProductBrandList.js
+++ /dev/null
@@ -1,357 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber
-} from 'antd';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './ProductSpuList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-import PicturesWall from "../../components/Image/PicturesWall";
-
-const FormItem = Form.Item;
-
-const status = ['未知', '开启', '禁用'];
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,
- categoryTree,handleModalVisible}) {
-
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'productBrandList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
-
- const columns = [
- {
- title: '品牌名称',
- dataIndex: 'name',
- },
- {
- title: '品牌描述',
- dataIndex: 'description'
- },
- {
- title: '品牌图片',
- dataIndex: 'picUrl',
- render(val) {return 
;},
- },
- {
- title: '状态',
- dataIndex: 'status',
- render(val) {return {status[val]};},
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- width: 200,
- render: (text, record) => {
- const statusText = record.status === 1 ? '禁用' : '开启';
- return (
-
- handleModalVisible(true, 'update', record)}>编辑
-
- handleStatus(record)}>{statusText}
-
- handleDelete(record)}>删除
-
- );
- },
- },
-];
-
-
- return (
-
-)
-}
-
-// 新建 form 表单
- const AddOrUpdateForm = Form.create()(props => {
- const { dispatch, loading, modalVisible, form, handleModalVisible, modalType, categoryTree, formVals } = props;
- let picturesWall = null;
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- if (modalType === 'add') {
- dispatch({
- type: 'productBrandList/add',
- payload: {
- body: {
- ...fields,
- picUrl: picturesWall ? picturesWall.getUrl() : undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('新建成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- } else {
- dispatch({
- type: 'productCategoryList/update',
- payload: {
- body: {
- ...formVals,
- ...fields,
- picUrl: picturesWall ? picturesWall.getUrl() : undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('编辑成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- }
- });
- };
-
-
- const title = modalType === 'add' ? '新建品牌' : '编辑品牌';
- const okText = modalType === 'add' ? '新建' : '编辑';
- return (
- handleModalVisible()}
->
-
-
- {form.getFieldDecorator('name', {
- rules: [{ required: true, message: '请输入品牌名称！', min: 2 }],
- initialValue: formVals.name,
- })()}
-
-
-
- {form.getFieldDecorator('description', {
- rules: [{ required: true, message: '请输入描述！' }],
- initialValue: formVals.description,
- })()}
-
-
-
-);
-});
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- categoryTree,
- } = props;
-
-function search() {
- dispatch({
- type: 'productBrandList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
-}
-})
-}
-
-// 提交搜索
-function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
-}
-
-// 重置搜索
-function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
-}
-
-
-
-
-return (
-
-);
-});
-
-
-
-
-// productSpuList
-@connect(({ productBrandList}) => ({
- ...productBrandList
-}))
-
-@Form.create()
-class ProductBrandList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- roleAssignVisible: false,
- roleAssignRecord: {},
- };
-
- componentDidMount() {
- const { dispatch } = this.props;
- // 查询初始数据
- dispatch({
- type: 'productBrandList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
-
-
- handleModalVisible = (modalVisible, modalType, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productBrandList/add',
- payload: {
- modalVisible,
- modalType,
- formVals: record || {}
- },
- });
- };
-
-
-render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, modalType,formVals,
- modalVisible,modalLoading} = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- // 添加 or 编辑表单属性
- const addOrUpdateFormProps = {
- modalVisible,
- modalType,
- formVals,
- dispatch,
- loading: modalLoading,
- categoryTree: list,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-);
-}
-}
-
-export default ProductBrandList;
diff --git a/admin-web/src/pages/Product/ProductCategoryList.js b/admin-web/src/pages/Product/ProductCategoryList.js
deleted file mode 100644
index a2e40be2e..000000000
--- a/admin-web/src/pages/Product/ProductCategoryList.js
+++ /dev/null
@@ -1,341 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {Card, Form, Input, Select, Button, Modal, message, Table, Divider, InputNumber, TreeSelect, Spin} from 'antd';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './ProductCategoryList.less';
-import PicturesWall from "../../components/Image/PicturesWall";
-
-const FormItem = Form.Item;
-const { Option } = Select;
-const status = ['未知', '开启', '禁用'];
-
-// 列表
-function List({ dataSource, loading, dispatch,
- handleModalVisible}) {
-
- function handleStatus(record) {
- Modal.confirm({
- title: record.status === 1 ? '确认禁用？' : '确认开启？',
- content: `${record.name}`,
- onOk() {
- dispatch({
- type: 'productCategoryList/updateStatus',
- payload: {
- body: {
- id: record.id,
- status: record.status === 1 ? 2 : 1,
- }
- },
- });
- },
- onCancel() {},
- });
- }
-
- function handleDelete(record) {
- Modal.confirm({
- title: `确认删除?`,
- content: `${record.name}`,
- onOk() {
- dispatch({
- type: 'productCategoryList/delete',
- payload: {
- id: record.id,
- },
- });
- },
- onCancel() {},
- });
- }
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '分类名称',
- dataIndex: 'name',
- },
- {
- title: '图片',
- dataIndex: 'picUrl',
- render(val) {
- return ;
- },
- },
- {
- title: '排序值',
- dataIndex: 'sort',
- },
- {
- title: '状态',
- dataIndex: 'status',
- render(val) {
- return {status[val]};
- },
- },
- {
- title: '描述',
- dataIndex: 'description',
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- render: (text, record) => {
- const statusText = record.status === 1 ? '禁用' : '开启';
- return (
-
- handleModalVisible(true, 'update', record)}>编辑
-
- handleStatus(record)}>
- {statusText}
-
-
- {
- record.status === 2 ? (
-
-
- handleDelete(record)}>
- 删除
-
-
- ) : ''
- }
-
- );
- }
- },
- ];
-
- return (
-
- )
-}
-
-// 新建 form 表单
-const AddOrUpdateForm = Form.create()(props => {
- const { dispatch, loading, modalVisible, form, handleModalVisible, modalType, categoryTree, formVals } = props;
- let picturesWall = null;
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- if (modalType === 'add') {
- dispatch({
- type: 'productCategoryList/add',
- payload: {
- body: {
- ...fields,
- picUrl: picturesWall ? picturesWall.getUrl() : undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('新建成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- } else {
- dispatch({
- type: 'productCategoryList/update',
- payload: {
- body: {
- ...formVals,
- ...fields,
- picUrl: picturesWall ? picturesWall.getUrl() : undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('编辑成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- }
- });
- };
-
- function onPidChange(value) {
- formVals.pid = parseInt(value);
- }
-
- // 处理分类筛选
- const buildSelectTree = (list) => {
- return list.map(item => {
- let children = [];
- // if (item.children) { // 暂时不允许添加二级分类。
- // children = buildSelectTree(item.children);
- // }
- return {
- title: item.name,
- value: item.id,
- key: item.id,
- children,
- };
- });
- };
- let categoryTreeSelect = buildSelectTree(categoryTree);
- categoryTreeSelect.unshift({
- title: '无父分类',
- value: 0,
- key: 0,
- children: [],
- });
-
- const title = modalType === 'add' ? '新建分类' : '编辑分类';
- const okText = modalType === 'add' ? '新建' : '编辑';
- return (
- handleModalVisible()}
- >
-
-
- {form.getFieldDecorator('name', {
- rules: [{ required: true, message: '请输入分类名称！', min: 2 }],
- initialValue: formVals.name,
- })()}
-
-
- {form.getFieldDecorator('pid', {
- rules: [{ required: true, message: '请选择父分类！' }],
- initialValue: formVals.pid,
- })(
-
- )}
-
- {
- formVals.pid > 0 ? (
-
- picturesWall = node} maxLength={1} />
-
- ) : ''
- }
-
- {form.getFieldDecorator('sort', {
- rules: [{ required: true, message: '请输入排序值！' }],
- initialValue: formVals.sort,
- })()}
-
-
- {form.getFieldDecorator('description', {
- rules: [{ required: true, message: '请输入描述！' }],
- initialValue: formVals.description,
- })()}
-
-
-
- );
-});
-
-@connect(({ productCategoryList, }) => ({
- ...productCategoryList,
- // list: productCategoryList.list,
- // loading: loading.models.productCategoryList,
-}))
-
-@Form.create()
-class ProductCategoryList extends PureComponent {
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'productCategoryList/tree',
- payload: {},
- });
- }
-
- handleModalVisible = (modalVisible, modalType, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productCategoryList/setAll',
- payload: {
- modalVisible,
- modalType,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list,listLoading,
- modalVisible, modalType, formVals, modalLoading,} = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- dispatch,
- loading: listLoading,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- // 添加 or 编辑表单属性
- const addOrUpdateFormProps = {
- modalVisible,
- modalType,
- formVals,
- dispatch,
- loading: modalLoading,
- categoryTree: list,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default ProductCategoryList;
diff --git a/admin-web/src/pages/Product/ProductCategoryList.less b/admin-web/src/pages/Product/ProductCategoryList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Product/ProductCategoryList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Product/ProductSpuAddOrUpdate.js b/admin-web/src/pages/Product/ProductSpuAddOrUpdate.js
deleted file mode 100644
index d1741550c..000000000
--- a/admin-web/src/pages/Product/ProductSpuAddOrUpdate.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/* eslint-disable */
-
-import React, {PureComponent, Fragment, Component} from 'react';
-// import crypto from 'crypto';
-// import fs from 'fs';
-import { connect } from 'dva';
-import moment from 'moment';
-import {Card, Form, Input, Radio, Button, Modal, Select, Upload, Icon, Spin, TreeSelect} from 'antd';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-// import * as qiniu from 'qiniu-js'
-// import uuid from 'js-uuid';
-
-import styles from './ProductSpuAddOrUpdate.less';
-import ProductAttrSelectFormItem from "../../components/Product/ProductAttrSelectFormItem";
-import ProductSkuAddOrUpdateTable from "../../components/Product/ProductSkuAddOrUpdateTable";
-// import {fileGetQiniuToken} from "../../services/admin";
-import PicturesWall from "../../components/Image/PicturesWall";
-import {fileGetQiniuToken} from "../../services/admin";
-import uuid from "js-uuid";
-import * as qiniu from "qiniu-js";
-import HtmlEditor from "../../components/Editor/HtmlEditor";
-
-const FormItem = Form.Item;
-const RadioGroup = Radio.Group;
-const Option = Select.Option;
-
-// roleList
-@connect(({ productAttrList, productSpuAddOrUpdate, productCategoryList }) => ({
- // list: productSpuList.list.spus,
- // loading: loading.models.productSpuList,
- productAttrList,
- productSpuAddOrUpdate,
- allAttrTree: productAttrList.tree,
- loading: productSpuAddOrUpdate.loading,
- spu: productSpuAddOrUpdate.spu,
- attrTree: productSpuAddOrUpdate.attrTree,
- skus: productSpuAddOrUpdate.skus,
- categoryTree: productCategoryList.list,
-}))
-
-@Form.create()
-class ProductSpuAddOrUpdate extends Component {
- state = {
- // modalVisible: false,
- modalType: 'add', //add update
- // initValues: {},
- htmlEditor: undefined,
- };
-
- componentDidMount() {
- const { dispatch } = this.props;
- const that = this;
- // 重置表单
- dispatch({
- type: 'productSpuAddOrUpdate/clear',
- });
- // 判断是否是更新
- const params = new URLSearchParams(this.props.location.search);
- if (params.get("id")) {
- let id = params.get("id");
- this.setState({
- modalType: 'update',
- id: id,
- })
- dispatch({
- type: 'productSpuAddOrUpdate/info',
- payload: parseInt(id),
- callback: function (data) {
- that.refs.picturesWall.setUrls(data.picUrls); // TODO 后续找找，有没更合适的做法
- // debugger;
- that.state.htmlEditor.setHtml(data.description);
- }
- })
- }
- // 获得规格列表
- dispatch({
- type: 'productAttrList/tree',
- payload: {
- name: '',
- pageNo: 0,
- pageSize: 10,
- },
- });
- // 获得商品分类
- dispatch({
- type: 'productCategoryList/tree',
- payload: {},
- });
- }
-
- handleAddAttr = e => {
- // alert('你猜');
- const { dispatch } = this.props;
- dispatch({
- type: 'productSpuAddOrUpdate/addAttr',
- payload: {
- },
- });
- };
-
- handleSubmit = e => {
- e.preventDefault();
- const { skus, dispatch } = this.props;
- const { modalType, id } = this.state;
- if (this.state.htmlEditor.isEmpty()) {
- alert('请设置商品描述！');
- return;
- }
- const description = this.state.htmlEditor.getHtml();
- // 获得图片
- let picUrls = this.refs.picturesWall.getUrls(); // TODO 芋艿，后续找找其他做法
- if (picUrls.length === 0) {
- alert('请必须上传一张图片！');
- return;
- }
- // 生成 skuStr 格式
- let skuStr = []; // 因为提交是字符串格式
- for (let i in skus) {
- let sku = skus[i];
- if (!sku.price || !sku.quantity) {
- continue;
- }
- let newAttr = {
- attrs: [],
- price: sku.price * 100,
- quantity: sku.quantity,
- }
- for (let j in sku.attrs) {
- newAttr.attrs.push(sku.attrs[j].id);
- }
- skuStr.push(newAttr);
- }
- if (skuStr.length === 0) {
- alert('请设置商品规格！');
- return;
- }
-
- // debugger;
- this.props.form.validateFields((err, values) => {
- // debugger;
- // 获得富文本编辑的描述
- if (!err) {
- if (modalType === 'add') {
- dispatch({
- type: 'productSpuAddOrUpdate/add',
- payload: {
- body: {
- ...values,
- picUrls: picUrls.join(','),
- skuStr: JSON.stringify(skuStr),
- description,
- }
- },
- });
- } else if (modalType === 'update') {
- dispatch({
- type: 'productSpuAddOrUpdate/update',
- payload: {
- body: {
- ...values,
- id,
- picUrls: picUrls.join(','),
- skuStr: JSON.stringify(skuStr),
- description,
- }
- },
- });
- }
- }
- });
- // console.log(fields);
- };
-
- render() {
- // debugger;
- const { form, skus, attrTree, allAttrTree, loading, spu, categoryTree, dispatch } = this.props;
- // const that = this;
-
- // 处理分类筛选
- const buildSelectTree = (list) => {
- return list.map(item => {
- let children = [];
- if (item.children) {
- children = buildSelectTree(item.children);
- }
- return {
- title: item.name,
- value: item.id,
- key: item.id,
- children,
- selectable: item.pid > 0
- };
- });
- };
- let categoryTreeSelect = buildSelectTree(categoryTree);
-
- // 添加规格
- // debugger;
- let attrTreeHTML = [];
- if (attrTree && attrTree.length > 0) {
- // 已选择的的规格集合
- let selectedAttrIds = new Set();
- for (let i in attrTree) {
- let attr = attrTree[i];
- selectedAttrIds.add(attr.id);
- }
- // 创建每个规格下拉框的 HTML
- for (let i in attrTree) {
- let attr = attrTree[i];
- let itemProps = {
- attr: attr,
- allAttrTree: allAttrTree,
- dispatch: dispatch,
- selectedAttrIds: selectedAttrIds,
- index: i // 位置。不然无法正确修改 Model 指定位置的数据
- };
- attrTreeHTML.push();
- }
- }
-
- // 规格明细
- let productSkuProps = {
- attrTree: attrTree,
- skus: skus,
- dispatch: dispatch,
- };
- // console.log(productSkuProps);
- // let htmlEditor = undefined;
-
- return (
-
-
-
-
-
-
-
- );
- }
-}
-
-export default ProductSpuAddOrUpdate;
diff --git a/admin-web/src/pages/Product/ProductSpuAddOrUpdate.less b/admin-web/src/pages/Product/ProductSpuAddOrUpdate.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Product/ProductSpuAddOrUpdate.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Product/ProductSpuList.js b/admin-web/src/pages/Product/ProductSpuList.js
deleted file mode 100644
index 096cdec46..000000000
--- a/admin-web/src/pages/Product/ProductSpuList.js
+++ /dev/null
@@ -1,409 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber
-} from 'antd';
-const TabPane = Tabs.TabPane;
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './ProductSpuList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-import PicturesWall from "../../components/Image/PicturesWall";
-
-const FormItem = Form.Item;
-const { TreeNode } = Tree;
-
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,
- categoryTree, handleSortModalVisible}) {
-
- const handleTabsChange = (value) => {
- dispatch({
- type: 'productSpuList/page',
- payload: {
- ...searchParams,
- status: value,
- ...PaginationHelper.defaultPayload,
- }
- })
- };
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'productSpuList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- const redirectToUpdate = (spuId) => {
- dispatch({
- type: 'productSpuList/redirectToUpdate',
- payload: spuId,
- });
- };
-
- const getCategoryName = (cid, array) => {
- // debugger;
- for (let i in array) {
- // debugger;
- const node = array[i];
- if (node.id === cid) {
- return node.name;
- }
- if (!node.children) {
- continue;
- }
- let name = getCategoryName(cid, node.children);
- if (name) {
- return name;
- }
- }
- return undefined;
- };
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '商品名称',
- dataIndex: 'name',
- },
- {
- title: '商品分类',
- dataIndex: 'cid',
- render: value => getCategoryName(value, categoryTree),
- },
- {
- title: '商品主图',
- dataIndex: 'picUrls',
- render(val) {
- return 
;
- },
- },
- {
- title: '商品库存',
- dataIndex: 'quantity'
- },
- {
- title: '排序值',
- dataIndex: 'sort',
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- width: 200,
- render: (text, record) => (
-
- {/* this.handleModalVisible(true, 'update', record)}>更新*/}
- redirectToUpdate(record.id)}>编辑
-
- handleSortModalVisible(true, record)}>
- 排序
-
-
- ),
- },
- ];
-
- // console.log(pagination);
-
- return (
-
- )
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- categoryTree,
- } = props;
-
- function search() {
- dispatch({
- type: 'productSpuList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- // 处理分类筛选
- const buildSelectTree = (list) => {
- return list.map(item => {
- let children = [];
- if (item.children) {
- children = buildSelectTree(item.children);
- }
- return {
- title: item.name,
- value: item.id,
- key: item.id,
- children,
- selectable: item.pid > 0
- };
- });
- };
- let categoryTreeSelect = buildSelectTree(categoryTree);
-
- return (
-
- );
-});
-
-//
-
-// 新建 form 表单
-const UpdateSortForm = Form.create()(props => {
- const { dispatch, loading, modalVisible, form, handleModalVisible, formVals } = props;
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- dispatch({
- type: 'productSpuList/updateSort',
- payload: {
- body: {
- id: formVals.id,
- ...fields,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('编辑排序成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- });
- };
-
- const title = '编辑排序值';
- const okText = '确定';
- return (
- handleModalVisible()}
- >
-
-
- {form.getFieldDecorator('sort', {
- rules: [{ required: true, message: '请输入排序值！' }],
- initialValue: formVals.sort,
- })()}
-
-
-
- );
-});
-
-// productSpuList
-@connect(({ productSpuList, productCategoryList }) => ({
- ...productSpuList,
- // list: productSpuList.list.spus,
- // loading: loading.models.productSpuList,
- categoryTree: productCategoryList.list,
-}))
-
-@Form.create()
-class ProductSpuList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- roleAssignVisible: false,
- roleAssignRecord: {},
- };
-
- componentDidMount() {
- const { dispatch } = this.props;
- // 查询初始数据
- dispatch({
- type: 'productSpuList/page',
- payload: {
- status: 1,
- ...PaginationHelper.defaultPayload,
- },
- });
- // 获得商品分类
- dispatch({
- type: 'productCategoryList/tree',
- payload: {},
- });
- }
-
- redirectToAdd = () => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productSpuList/redirectToAdd',
- });
- };
-
- handleSortModalVisible = (sortModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productSpuList/setAll',
- payload: {
- sortModalVisible,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, formVals,
- sortModalLoading, sortModalVisible, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleSortModalVisible: this.handleSortModalVisible, // Func
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- // 添加 or 编辑表单属性
- // debugger;
- const updateSortFormProps = {
- modalVisible: sortModalVisible,
- formVals,
- dispatch,
- loading: sortModalLoading,
- handleModalVisible: this.handleSortModalVisible, // Func
- };
-
- return (
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default ProductSpuList;
diff --git a/admin-web/src/pages/Product/ProductSpuList.less b/admin-web/src/pages/Product/ProductSpuList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Product/ProductSpuList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Profile/AdvancedProfile.js b/admin-web/src/pages/Profile/AdvancedProfile.js
deleted file mode 100644
index 0006f993a..000000000
--- a/admin-web/src/pages/Profile/AdvancedProfile.js
+++ /dev/null
@@ -1,353 +0,0 @@
-import React, { Component, Fragment } from 'react';
-import Debounce from 'lodash-decorators/debounce';
-import Bind from 'lodash-decorators/bind';
-import { connect } from 'dva';
-import {
- Button,
- Menu,
- Dropdown,
- Icon,
- Row,
- Col,
- Steps,
- Card,
- Popover,
- Badge,
- Table,
- Tooltip,
- Divider,
-} from 'antd';
-import classNames from 'classnames';
-import DescriptionList from '@/components/DescriptionList';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import styles from './AdvancedProfile.less';
-
-const { Step } = Steps;
-const { Description } = DescriptionList;
-const ButtonGroup = Button.Group;
-
-const getWindowWidth = () => window.innerWidth || document.documentElement.clientWidth;
-
-const menu = (
-
-);
-
-const action = (
-
-
-
-
-
-
-
-
-
-
-);
-
-const extra = (
-
-
- 状态
- 待审批
-
-
- 订单金额
- ¥ 568.08
-
-
-);
-
-const description = (
-
- 曲丽丽
- XX 服务
- 2017-07-07
-
- 12421
-
- 2017-07-07 ~ 2017-08-08
- 请于两个工作日内确认
-
-);
-
-const tabList = [
- {
- key: 'detail',
- tab: '详情',
- },
- {
- key: 'rule',
- tab: '规则',
- },
-];
-
-const desc1 = (
-
-
- 曲丽丽
-
-
-
2016-12-12 12:32
-
- 吴加号
-
- 未响应} />
-
-
- 耗时：2小时25分钟
-
-
信息组
-
-
- 林东东
- 1234567
- XX公司 - YY部
- 2017-08-08
-
- 这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...
-
-
-
-
-
- Citrullus lanatus (Thunb.) Matsum. et
- Nakai一年生蔓生藤本；茎、枝粗壮，具明显的棱。卷须较粗..
-
-
-
-
- 付小小
- 1234568
-
-
-
-
-
-
- 暂无数据
-
-
-
- {contentList[operationkey]}
-
-
- );
- }
-}
-
-export default AdvancedProfile;
diff --git a/admin-web/src/pages/Profile/AdvancedProfile.less b/admin-web/src/pages/Profile/AdvancedProfile.less
deleted file mode 100644
index 4ee7621d0..000000000
--- a/admin-web/src/pages/Profile/AdvancedProfile.less
+++ /dev/null
@@ -1,54 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.headerList {
- margin-bottom: 4px;
-}
-
-.tabsCard {
- :global {
- .ant-card-head {
- padding: 0 16px;
- }
- }
-}
-
-.noData {
- color: @disabled-color;
- font-size: 16px;
- line-height: 64px;
- text-align: center;
- i {
- position: relative;
- top: 3px;
- margin-right: 16px;
- font-size: 24px;
- }
-}
-
-.heading {
- color: @heading-color;
- font-size: 20px;
-}
-
-.stepDescription {
- position: relative;
- left: 38px;
- padding-top: 8px;
- font-size: 14px;
- text-align: left;
-
- > div {
- margin-top: 8px;
- margin-bottom: 4px;
- }
-}
-
-.textSecondary {
- color: @text-color-secondary;
-}
-
-@media screen and (max-width: @screen-sm) {
- .stepDescription {
- left: 8px;
- }
-}
diff --git a/admin-web/src/pages/Profile/BasicProfile.js b/admin-web/src/pages/Profile/BasicProfile.js
deleted file mode 100644
index c339dba10..000000000
--- a/admin-web/src/pages/Profile/BasicProfile.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'dva';
-import { Card, Badge, Table, Divider } from 'antd';
-import DescriptionList from '@/components/DescriptionList';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import styles from './BasicProfile.less';
-
-const { Description } = DescriptionList;
-
-const progressColumns = [
- {
- title: '时间',
- dataIndex: 'time',
- key: 'time',
- },
- {
- title: '当前进度',
- dataIndex: 'rate',
- key: 'rate',
- },
- {
- title: '状态',
- dataIndex: 'status',
- key: 'status',
- render: text =>
- text === 'success' ? (
-
- ) : (
-
- ),
- },
- {
- title: '操作员ID',
- dataIndex: 'operator',
- key: 'operator',
- },
- {
- title: '耗时',
- dataIndex: 'cost',
- key: 'cost',
- },
-];
-
-@connect(({ profile, loading }) => ({
- profile,
- loading: loading.effects['profile/fetchBasic'],
-}))
-class BasicProfile extends Component {
- componentDidMount() {
- const { dispatch, match } = this.props;
- const { params } = match;
-
- dispatch({
- type: 'profile/fetchBasic',
- payload: params.id || '1000000000',
- });
- }
-
- render() {
- const { profile = {}, loading } = this.props;
- const { basicGoods = [], basicProgress = [], userInfo = {}, application = {} } = profile;
- let goodsData = [];
- if (basicGoods.length) {
- let num = 0;
- let amount = 0;
- basicGoods.forEach(item => {
- num += Number(item.num);
- amount += Number(item.amount);
- });
- goodsData = basicGoods.concat({
- id: '总计',
- num,
- amount,
- });
- }
- const renderContent = (value, row, index) => {
- const obj = {
- children: value,
- props: {},
- };
- if (index === basicGoods.length) {
- obj.props.colSpan = 0;
- }
- return obj;
- };
- const goodsColumns = [
- {
- title: '商品编号',
- dataIndex: 'id',
- key: 'id',
- render: (text, row, index) => {
- if (index < basicGoods.length) {
- return {text};
- }
- return {
- children: 总计,
- props: {
- colSpan: 4,
- },
- };
- },
- },
- {
- title: '商品名称',
- dataIndex: 'name',
- key: 'name',
- render: renderContent,
- },
- {
- title: '商品条码',
- dataIndex: 'barcode',
- key: 'barcode',
- render: renderContent,
- },
- {
- title: '单价',
- dataIndex: 'price',
- key: 'price',
- align: 'right',
- render: renderContent,
- },
- {
- title: '数量（件）',
- dataIndex: 'num',
- key: 'num',
- align: 'right',
- render: (text, row, index) => {
- if (index < basicGoods.length) {
- return text;
- }
- return {text};
- },
- },
- {
- title: '金额',
- dataIndex: 'amount',
- key: 'amount',
- align: 'right',
- render: (text, row, index) => {
- if (index < basicGoods.length) {
- return text;
- }
- return {text};
- },
- },
- ];
- return (
-
-
-
- {application.id}
- {application.status}
- {application.orderNo}
- {application.childOrderNo}
-
-
-
- {userInfo.name}
- {userInfo.tel}
- {userInfo.delivery}
- {userInfo.addr}
- {userInfo.remark}
-
-
- 退货商品
-
- 退货进度
-
-
-
- );
- }
-}
-
-export default BasicProfile;
diff --git a/admin-web/src/pages/Profile/BasicProfile.less b/admin-web/src/pages/Profile/BasicProfile.less
deleted file mode 100644
index 5c3f94f5c..000000000
--- a/admin-web/src/pages/Profile/BasicProfile.less
+++ /dev/null
@@ -1,8 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.title {
- margin-bottom: 16px;
- color: @heading-color;
- font-weight: 500;
- font-size: 16px;
-}
diff --git a/admin-web/src/pages/Profile/models/profile.js b/admin-web/src/pages/Profile/models/profile.js
deleted file mode 100644
index 3b9a290c5..000000000
--- a/admin-web/src/pages/Profile/models/profile.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { queryBasicProfile, queryAdvancedProfile } from '@/services/api';
-
-export default {
- namespace: 'profile',
-
- state: {
- basicGoods: [],
- advancedOperation1: [],
- advancedOperation2: [],
- advancedOperation3: [],
- },
-
- effects: {
- *fetchBasic({ payload }, { call, put }) {
- const response = yield call(queryBasicProfile, payload);
- yield put({
- type: 'show',
- payload: response,
- });
- },
- *fetchAdvanced(_, { call, put }) {
- const response = yield call(queryAdvancedProfile);
- yield put({
- type: 'show',
- payload: response,
- });
- },
- },
-
- reducers: {
- show(state, { payload }) {
- return {
- ...state,
- ...payload,
- };
- },
- },
-};
diff --git a/admin-web/src/pages/Promotion/BannerList.js b/admin-web/src/pages/Promotion/BannerList.js
deleted file mode 100644
index 96a6afcc3..000000000
--- a/admin-web/src/pages/Promotion/BannerList.js
+++ /dev/null
@@ -1,409 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import {
- Card,
- Form,
- Input,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Spin,
- Row,
- Col,
- Select,
- Icon,
- InputNumber
-} from 'antd';
-import { checkTypeWithEnglishAndNumbers } from '../../../helpers/validator'
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './BannerList.less';
-import moment from "moment";
-import PaginationHelper from "../../../helpers/PaginationHelper";
-import PicturesWall from "../../components/Image/PicturesWall";
-
-const FormItem = Form.Item;
-const status = ['未知', '正常', '禁用'];
-
-// 列表
-function List ({ dataSource, loading, pagination, searchParams, dispatch,
- handleModalVisible}) {
-
- function handleStatus(record) {
- Modal.confirm({
- title: record.status === 1 ? '确认禁用' : '取消禁用',
- content: `${record.username}`,
- onOk() {
- dispatch({
- type: 'bannerList/updateStatus',
- payload: {
- id: record.id,
- status: record.status === 1 ? 2 : 1,
- },
- });
- },
- onCancel() {},
- });
- }
-
- function handleDelete(record) {
- Modal.confirm({
- title: `确认删除?`,
- content: `${record.title}`,
- onOk() {
- dispatch({
- type: 'bannerList/delete',
- payload: {
- id: record.id,
- },
- });
- },
- onCancel() {},
- });
- }
-
- const columns = [
- {
- title: '标题',
- dataIndex: 'title',
- width: 120,
- },
- {
- title: '跳转链接',
- dataIndex: 'url',
- width: 120,
- },
- {
- title: '图片',
- dataIndex: 'picUrl',
- render(val) {
- return ;
- },
- },
- {
- title: '排序值',
- dataIndex: 'sort',
- },
- {
- title: '状态',
- dataIndex: 'status',
- render(val) {
- return {status[val]}; // TODO 芋艿，此处要改
- },
- },
- {
- title: '备注',
- dataIndex: 'memo',
- width: 150,
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- width: 120,
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- width: 150,
- render: (text, record) => {
- const statusText = record.status === 1 ? '禁用' : '开启'; // TODO 芋艿，此处要改
- return (
-
- handleModalVisible(true, 'update', record)}>编辑
-
- handleStatus(record)}>
- {statusText}
-
- {
- record.status === 2 ?
-
-
- handleDelete(record)}>
- 删除
-
- : null
- }
-
- );
- },
- },
- ];
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'bannerList/query',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- return (
-
- )
-}
-
-// 搜索表单
-// TODO 芋艿，有没办法换成上面那种写法
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch
- } = props;
-
- function search() {
- dispatch({
- type: 'bannerList/query',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...form.getFieldsValue()
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// 添加 or 修改 Form 表单
-const AddOrUpdateForm = Form.create()(props => {
- const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals } = props;
- let picturesWall = null;
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- // 添加表单
- if (modalType === 'add') {
- dispatch({
- type: 'bannerList/add',
- payload: {
- body: {
- ...fields,
- picUrl: picturesWall ? picturesWall.getUrl() : undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('添加成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- // 修改表单
- } else {
- dispatch({
- type: 'bannerList/update',
- payload: {
- body: {
- id: formVals.id,
- ...fields,
- picUrl: picturesWall ? picturesWall.getUrl() : undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('编辑成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- }
- });
- };
-
- const title = modalType === 'add' ? '新建广告' : '编辑广告';
- return (
- handleModalVisible()}
- >
-
- {form.getFieldDecorator('title', {
- rules: [{ required: true, message: '请输入标题！'},
- {max: 32, min:2, message: '长度为 2-32 位'},
- ],
- initialValue: formVals.title,
- })()}
-
-
- {form.getFieldDecorator('url', {
- rules: [{ required: true, message: '请输入跳转链接！'},
- { type: 'url', message: '必须是 URL！'},
- {max: 255, message: '最大长度为 255 位'},
- ],
- initialValue: formVals.picUrl,
- })()}
-
-
- picturesWall = node} maxLength={1} />
-
-
- {form.getFieldDecorator('sort', {
- rules: [{ required: true, message: '请输入排序值！' }],
- initialValue: formVals.sort,
- })()}
-
-
- {form.getFieldDecorator('memo', {
- rules: [{ required: false, message: '请输入备注！' },
- {max: 255, message: '最大长度为 255 位'},
- ],
- initialValue: formVals.memo,
- })()}
-
-
- );
-});
-
-@connect(({ bannerList }) => ({
- // list: bannerList.list,
- // pagination: bannerList.pagination,
- ...bannerList,
-}))
-
-// 主界面
-@Form.create()
-class BannerList extends PureComponent {
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'bannerList/query',
- payload: {
- ...PaginationHelper.defaultPayload
- },
- });
- }
-
- handleModalVisible = (modalVisible, modalType, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'bannerList/setAll',
- payload: {
- modalVisible,
- modalType,
- formVals: record || {}
- },
- });
- };
-
- render() {
- // let that = this;
- const { dispatch,
- list, listLoading, searchParams, pagination,
- modalVisible, modalType, formVals,
- confirmLoading,} = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- loading: listLoading,
- confirmLoading,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- };
-
- // 添加 or 编辑表单属性
- const addOrUpdateFormProps = {
- modalVisible,
- modalType,
- formVals,
- dispatch,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default BannerList;
diff --git a/admin-web/src/pages/Promotion/BannerList.less b/admin-web/src/pages/Promotion/BannerList.less
deleted file mode 100644
index 7ad3dac3f..000000000
--- a/admin-web/src/pages/Promotion/BannerList.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
-
-.tableListForm {
- :global {
- .ant-form-item {
- display: flex;
- margin-right: 0;
- margin-bottom: 24px;
- > .ant-form-item-label {
- width: auto;
- padding-right: 8px;
- line-height: 32px;
- }
- .ant-form-item-control {
- line-height: 32px;
- }
- }
- .ant-form-item-control-wrapper {
- flex: 1;
- }
- }
- .submitButtons {
- display: block;
- margin-bottom: 24px;
- white-space: nowrap;
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .tableListForm :global(.ant-form-item) {
- margin-right: 24px;
- }
-}
\ No newline at end of file
diff --git a/admin-web/src/pages/Promotion/CouponCardTemplateList.js b/admin-web/src/pages/Promotion/CouponCardTemplateList.js
deleted file mode 100644
index d1a2906eb..000000000
--- a/admin-web/src/pages/Promotion/CouponCardTemplateList.js
+++ /dev/null
@@ -1,715 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import {
- Card,
- Form,
- Input,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Spin,
- Row,
- Col,
- Select,
- Icon,
- InputNumber,
- DatePicker, TreeSelect
-} from 'antd';
-import { checkTypeWithEnglishAndNumbers } from '../../../helpers/validator'
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './CouponCardTemplateList.less';
-import moment from "moment";
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-const SelectOption = Select.Option;
-const { TreeNode } = Tree;
-const RangePicker = DatePicker.RangePicker;
-const status = ['未知', '正常', '禁用'];
-const rangeType = {
- 10: '所有可用',
- 20: '部分商品可用',
- 21: '部分商品不可用',
- 30: '部分分类可用',
- 31: '部分分类不可用'};
-const preferentialType = ['未知', '代金卷', '折扣卷'];
-const dateType = ['未知', '固定日期', '领取日期'];
-
-// 列表
-function List ({ dataSource, loading, pagination, searchParams, dispatch,
- handleModalVisible}) {
-
- function handleStatus(record) {
- Modal.confirm({
- title: record.status === 1 ? '确认禁用' : '取消禁用',
- content: `${record.title}`,
- onOk() {
- dispatch({
- type: 'couponCardTemplateList/updateStatus',
- payload: {
- id: record.id,
- status: record.status === 1 ? 2 : 1,
- },
- });
- },
- onCancel() {},
- });
- }
-
- // function handleDelete(record) {
- // Modal.confirm({
- // title: `确认删除?`,
- // content: `${record.productSpuId}`,
- // onOk() {
- // dispatch({
- // type: 'couponCardTemplateList/delete',
- // payload: {
- // id: record.id,
- // },
- // });
- // },
- // onCancel() {},
- // });
- // }
-
- const columns = [
- {
- title: '名称',
- dataIndex: 'title',
- },
- {
- title: '类型',
- dataIndex: 'preferentialType',
- render(val) {
- return {preferentialType[val]};
- },
- },
- {
- title: '优惠内容',
- render(val, record) {
- let content;
- // priceAvailable;
- if (record.priceAvailable === 0) {
- content = '无门槛,';
- } else {
- content = '满 ' + record.priceAvailable / 100 + ' 元,';
- }
- if (record.preferentialType === 1) {
- content += '减 ' + record.priceOff / 100 + ' 元';
- } else {
- content += '打' + record.percentOff / 100.0 + '折';
- if (record.discountPriceLimit) {
- content += ', 最多减 ' + record.discountPriceLimit / 100 + ' 元';
- }
- }
- return content;
- }
- },
- {
- title: '可使用商品',
- dataIndex: 'rangeType',
- render: val => {rangeType[val]},
- },
- {
- title: '有效期',
- render(val, record) {
- let content = dateType[record.dateType] + ' ';
- // priceAvailable;
- if (record.dateType === 1) {
- content += moment(new Date(record.validStartTime)).format('YYYY-MM-DD')
- + '~' + moment(new Date(record.validEndTime)).format('YYYY-MM-DD');
- } else if (record.dateType === 2) {
- content += record.fixedStartTerm + '-' + record.fixedEndTerm + ' 天';
- }
- return content;
- }
- },
- {
- title: '已领取/剩余',
- // 已使用 TODO 芋艿
- // 支付金额(元) TODO 芋艿
- // 客单价(元) TODO 芋艿
- render(val, record) {
- // debugger;
- return `${record.statFetchNum} / ` + (record.total - record.statFetchNum);
- }
- },
- {
- title: '状态',
- dataIndex: 'status',
- render: val => {status[val]},
- },
- // {
- // title: '使用说明',
- // dataIndex: 'description',
- // },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD HH:mm')},
- },
- {
- title: '操作',
- width: 120,
- render: (text, record) => {
- const statusText = record.status === 1 ? '禁用' : '开启'; // TODO 芋艿，此处要改
- return (
-
- handleModalVisible(true, 'update', record)}>编辑
-
- handleStatus(record)}>
- {statusText}
-
- {/*{*/}
- {/* record.status === 2 ?*/}
- {/* */}
- {/* */}
- {/* handleDelete(record)}>*/}
- {/* 删除*/}
- {/* */}
- {/* : null*/}
- {/*}*/}
-
- );
- },
- },
- ];
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'couponCardTemplateList/query',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- return (
-
- )
-}
-
-// 搜索表单
-// TODO 芋艿，有没办法换成上面那种写法
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch
- } = props;
-
- function search() {
- dispatch({
- type: 'couponCardTemplateList/query',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...form.getFieldsValue()
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// 添加 or 修改 Form 表单
-const AddOrUpdateForm = Form.create()(props => {
- const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals,
- searchProductSpuList, formSpuValues, categoryTree} = props;
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- let newFields = {
- ...fields,
- priceAvailable: fields.priceAvailable ? parseInt(fields.priceAvailable * 100) : undefined,
- priceOff: fields.priceOff ? parseInt(fields.priceOff * 100) : undefined,
- discountPriceLimit: fields.discountPriceLimit ? parseInt(fields.discountPriceLimit * 100) : undefined,
- validStartTime: fields.validStartTime ? fields.validStartTime.format('YYYY-MM-DD') : undefined,
- validEndTime: fields.validEndTime ? fields.validEndTime.format('YYYY-MM-DD') : undefined,
- rangeValues: fields.rangeValues && fields.rangeValues.length > 0 ? fields.rangeValues.join(',') : undefined,
- };
- // 添加表单
- if (modalType === 'add') {
- dispatch({
- type: 'couponCardTemplateList/add',
- payload: {
- body: {
- ...newFields,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('添加成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- // 修改表单
- } else {
- dispatch({
- type: 'couponCardTemplateList/update',
- payload: {
- body: {
- id: formVals.id,
- ...newFields,
- priceAvailable: undefined,
- dateType: undefined,
- validStartTime: undefined,
- validEndTime: undefined,
- fixedStartTerm: undefined,
- fixedEndTerm: undefined,
- preferentialType: undefined,
- priceOff: undefined,
- percentOff: undefined,
- discountPriceLimit: undefined,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('更新成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- }
- });
- };
-
- function onRangeTypeChange(value) {
- formVals.rangeType = parseInt(value);
- }
-
- function onDateTypeChange(value) {
- formVals.dateType = parseInt(value);
- }
-
- function onPreferentialTypeChange(value) {
- formVals.preferentialType = parseInt(value);
- }
-
- const searchProductSpu = (value) => {
- if (!value) {
- dispatch({
- type: 'couponCardTemplateList/setAll',
- payload: {
- searchProductSpuList: [],
- },
- });
- return;
- }
- dispatch({
- type: 'couponCardTemplateList/searchProductSpu',
- payload: {
- name: value,
- },
- });
- };
-
- // 处理分类筛选
- const buildSelectTree = (list) => {
- return list.map(item => {
- let children = [];
- if (item.children) {
- children = buildSelectTree(item.children);
- }
- return {
- title: item.name,
- value: item.id,
- key: item.id,
- children,
- selectable: item.pid > 0
- };
- });
- };
- let categoryTreeSelect = buildSelectTree(categoryTree);
-
- const title = modalType === 'add' ? '新建优惠劵' : '更新优惠劵';
- return (
- handleModalVisible()}
- width={720}
- >
-
- {form.getFieldDecorator('title', {
- rules: [{ required: true, message: '请输入标题！' },
- {max: 16, min:2, message: '长度为 2-16 位'},],
- initialValue: formVals.title,
- })()}
-
-
- {form.getFieldDecorator('description', {
- rules: [{ required: false, message: '请输入使用说明！' },
- {max: 255, message: '最大长度为 255 位'},
- ],
- initialValue: formVals.description,
- })()}
-
-
- {form.getFieldDecorator('quota', {
- rules: [{ required: true, message: '请选择每人限领次数！'},
- ],
- initialValue: formVals.quota,
- })(
-
- )}
-
-
- {form.getFieldDecorator('total', {
- rules: [{ required: true, message: '请输入发放总量！' },
- {min: 1, type: 'number', message: '最小值为 1'}],
- initialValue: formVals.total,
- })()}
-
-
- {form.getFieldDecorator('priceAvailable', {
- rules: [{ required: true, message: '请输入使用金额门槛！' },],
- initialValue: formVals.priceAvailable ? formVals.priceAvailable / 100.0 : undefined,
- })()} 元
-
-
- {form.getFieldDecorator('rangeType', {
- rules: [{ required: true, message: '请选择可用范围！'}, // TODO 芋艿，需要修改
- ],
- initialValue: formVals.rangeType ? formVals.rangeType + '' : undefined,
- })(
-
- )}
-
- {/*{*/}
- {/* formVals.rangeType == 20 || formVals.rangeType == 21*/}
- {/* || formVals.rangeType == 30 || formVals.rangeType == 31 ?*/}
- {/* */}
- {/* {form.getFieldDecorator('rangeValues', {*/}
- {/* rules: [{ required: true, message: '请输入具体范围！' }, // TODO 芋艿，做成搜索*/}
- {/* {maxlength: 255, message: '最大长度为 255 位'},*/}
- {/* ],*/}
- {/* initialValue: formVals.rangeValues,*/}
- {/* })()}*/}
- {/* */}
- {/* : ''*/}
- {/*}*/}
- {
- formVals.rangeType == 20 || formVals.rangeType == 21?
-
- {form.getFieldDecorator('rangeValues', {
- rules: [{ required: true, message: '请选择商品！' },
- ],
- initialValue: formVals.rangeValues ? formVals.rangeValues.split(',') : undefined,
- })(
-
- )}
-
- : ''
- }
- {
- formVals.rangeType == 30 || formVals.rangeType == 31 ?
-
- {form.getFieldDecorator('rangeValues', {
- rules: [{ required: true, message: '请选择分类！' },
- ],
- initialValue: formVals.rangeValues ? formVals.rangeValues.split(',') : undefined,
- })(
-
- )}
-
- : ''
- }
-
- {form.getFieldDecorator('dateType', {
- rules: [{ required: true, message: '请选择可用范围！'}, // TODO 芋艿，需要修改
- ],
- initialValue: formVals.dateType ? formVals.dateType + '' : undefined,
- })(
-
- )}
-
- {
- formVals.dateType == 1 ?
-
- {form.getFieldDecorator('validStartTime', {
- rules: [{ required: true, message: '请输入固定日期！' },],
- initialValue: formVals.validStartTime ? moment(formVals.validStartTime) : undefined,
- })()}
- -
- {form.getFieldDecorator('validEndTime', {
- rules: [{ required: true, message: '请输入固定日期！' },],
- initialValue: formVals.validEndTime ? moment(formVals.validEndTime) : undefined,
- })()}
- : ''
- }
- {
- formVals.dateType == 2 ?
-
- {form.getFieldDecorator('fixedStartTerm', {
- rules: [{ required: true, message: '请输入固定日期！' },
- {min: 1, type: 'number', message: '最小值为 1'}],
- initialValue: formVals.fixedStartTerm,
- })()}
- -
- {form.getFieldDecorator('fixedEndTerm', {
- rules: [{ required: true, message: '请输入固定日期！' },
- {min: 1, type: 'number', message: '最小值为 1'}],
- initialValue: formVals.fixedEndTerm,
- })()} 天
- : ''
- }
-
-
- {form.getFieldDecorator('preferentialType', {
- rules: [{ required: true, message: '请选择优惠类型！'}, // TODO 芋艿，需要修改
- ],
- initialValue: formVals.preferentialType ? formVals.preferentialType + '' : undefined,
- })(
-
- )}
-
- {
- formVals.preferentialType == 1 ?
-
- {form.getFieldDecorator('priceOff', {
- rules: [{ required: true, message: '请输入优惠金额！' },
- {min: 0.01, type: 'number', message: '最小值为 0.01'}],
- initialValue: formVals.priceOff ? formVals.priceOff / 100.0 : undefined,
- })()}
- : ''
- }
- {
- formVals.preferentialType == 2 ?
-
-
- {form.getFieldDecorator('percentOff', {
- rules: [{ required: true, message: '请输入折扣百分比！' },
- {min: 1, max: 99, type: 'number', message: '范围为 [1, 99]'},
- ],
- initialValue: formVals.percentOff,
- })()}%
-
-
- {form.getFieldDecorator('discountPriceLimit', {
- rules: [{ required: false, message: '请输入最多优惠！' },
- {min: 0.01, type: 'number', message: '最小值为 0.01'},
- ],
- initialValue: formVals.discountPriceLimit ? formVals.discountPriceLimit / 100.0 : undefineds,
- })()}元
-
- : ''
- }
-
- );
-});
-
-@connect(({ couponCardTemplateList, productCategoryList }) => ({
- // list: productRecommend.list,
- // pagination: productRecommend.pagination,
- ...couponCardTemplateList,
- categoryTree: productCategoryList.list,
-}))
-
-// 主界面
-@Form.create()
-class CouponCardTemplateLists extends PureComponent {
-
- componentDidMount() {
- const { dispatch } = this.props;
- // 获得优惠劵列表
- dispatch({
- type: 'couponCardTemplateList/query',
- payload: {
- ...PaginationHelper.defaultPayload
- },
- });
- }
-
- handleModalVisible = (modalVisible, modalType, record) => {
- const { dispatch } = this.props;
- // 弹窗，并清空一些缓存
- dispatch({
- type: 'couponCardTemplateList/setAll',
- payload: {
- modalVisible,
- modalType,
- formVals: record || {},
- searchProductSpuList: [],
- formSpuValues: [],
- },
- });
- // 如果是指定商品，则获得商品列表
- if (record && record.rangeType &&
- (record.rangeType === 20 || record.rangeType === 21)) {
- dispatch({
- type: 'couponCardTemplateList/getProductSpuList',
- payload: {
- ids: record.rangeValues,
- },
- });
- }
- // 获得商品分类，因为后续可能使用到
- // 获得商品分类
- dispatch({
- type: 'productCategoryList/tree',
- payload: {},
- });
- };
-
- render() {
- // let that = this;
- const { dispatch,
- list, listLoading, searchParams, pagination,
- modalVisible, modalType, formVals, searchProductSpuList, formSpuValues, categoryTree,
- confirmLoading, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- loading: listLoading,
- confirmLoading,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- };
-
- // 添加 or 更新表单属性
- const addOrUpdateFormProps = {
- modalVisible,
- modalType,
- formVals,
- dispatch,
- searchProductSpuList,
- formSpuValues,
- categoryTree,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default CouponCardTemplateLists;
diff --git a/admin-web/src/pages/Promotion/CouponCardTemplateList.less b/admin-web/src/pages/Promotion/CouponCardTemplateList.less
deleted file mode 100644
index 7ad3dac3f..000000000
--- a/admin-web/src/pages/Promotion/CouponCardTemplateList.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
-
-.tableListForm {
- :global {
- .ant-form-item {
- display: flex;
- margin-right: 0;
- margin-bottom: 24px;
- > .ant-form-item-label {
- width: auto;
- padding-right: 8px;
- line-height: 32px;
- }
- .ant-form-item-control {
- line-height: 32px;
- }
- }
- .ant-form-item-control-wrapper {
- flex: 1;
- }
- }
- .submitButtons {
- display: block;
- margin-bottom: 24px;
- white-space: nowrap;
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .tableListForm :global(.ant-form-item) {
- margin-right: 24px;
- }
-}
\ No newline at end of file
diff --git a/admin-web/src/pages/Promotion/FullPrivilegeList.js b/admin-web/src/pages/Promotion/FullPrivilegeList.js
deleted file mode 100644
index 75b76a266..000000000
--- a/admin-web/src/pages/Promotion/FullPrivilegeList.js
+++ /dev/null
@@ -1,325 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber
-} from 'antd';
-const TabPane = Tabs.TabPane;
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './FullPrivilegeList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-
-const statuses = {
- 10: '未开始',
- 20: '进行中',
- 30: '已结束',
- 40: '已撤销',
- 50: '已删除',
-};
-
-const meetTypes = {
- 1: '满 N 元减/送',
- 2: '满 N 件减/送',
-};
-
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,}) {
-
- const handleTabsChange = (value) => {
- dispatch({
- type: 'fullPrivilegeList/page',
- payload: {
- ...searchParams,
- status: value,
- ...PaginationHelper.defaultPayload,
- }
- })
- };
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'fullPrivilegeList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- function formatFullPrivilegeText(activity) {
- let text = '';
- let fullPrivilege = activity.fullPrivilege;
- for (let i in fullPrivilege.privileges) {
- let privilege = fullPrivilege.privileges[i];
- if (i > 0) {
- text += ';';
- }
- if (fullPrivilege.cycled) {
- text += '每';
- }
- if (privilege.meetType === 1) {
- text += '满 ' + privilege.meetValue / 100.0 + ' 元,';
- } else if (privilege.meetType === 2) {
- text += '满 ' + privilege.meetValue + ' 件,';
- }
- if (privilege.preferentialType === 1) {
- text += '减 ' + privilege.preferentialValue / 100.0 + ' 元';
- } else if (privilege.preferentialType === 2) {
- text += '打 ' + privilege.preferentialValue / 10.0 + ' 折';
- }
- }
- return text;
- };
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '活动名称',
- dataIndex: 'title',
- },
- {
- title: '类型',
- dataIndex: 'fullPrivilege',
- render: val => meetTypes[val.privileges[0].meetType + ''],
- },
- {
- title: '活动详情',
- render: (text, record) => formatFullPrivilegeText(record),
- },
- {
- title: '活动时间',
- render: (text, record) => (
-
- {moment(record.startTime).format('YYYY-MM-DD HH:mm:ss')}
- 至
- {moment(record.endTime).format('YYYY-MM-DD HH:mm:ss')}
-
- ),
- },
- {
- title: '状态',
- dataIndex: 'status',
- render: val => statuses[val + ''],
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- width: 300,
- render: (text, record) => (
-
- {/* this.handleModalVisible(true, 'update', record)}>更新*/}
- alert('正在开发中')}>编辑
- {
- record.status === 10 || record.status === 20 ?
-
- alert('正在开发中')}>
- 撤销
-
- : undefined
- }
- {
- record.status !== 50 ?
-
- alert('正在开发中')}>
- 删除
-
- : undefined
- }
-
- ),
- },
- ];
-
- // console.log(pagination);
-
- return (
-
- )
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- } = props;
-
- function search() {
- dispatch({
- type: 'fullPrivilegeList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// fullPrivilegeList
-@connect(({ fullPrivilegeList }) => ({
- ...fullPrivilegeList,
- // list: fullPrivilegeList.list.spus,
- // loading: loading.models.fullPrivilegeList,
-}))
-
-@Form.create()
-class FullPrivilegeList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- };
-
- componentDidMount() {
- const { dispatch, searchParams } = this.props;
- // 查询初始数据
- dispatch({
- type: 'fullPrivilegeList/page',
- payload: {
- ...searchParams,
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
- handleSortModalVisible = (sortModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'fullPrivilegeList/setAll',
- payload: {
- sortModalVisible,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, formVals, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleSortModalVisible: this.handleSortModalVisible, // Func
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- return (
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default FullPrivilegeList;
diff --git a/admin-web/src/pages/Promotion/FullPrivilegeList.less b/admin-web/src/pages/Promotion/FullPrivilegeList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Promotion/FullPrivilegeList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Promotion/ProductRecommendList.js b/admin-web/src/pages/Promotion/ProductRecommendList.js
deleted file mode 100644
index 8b77d02df..000000000
--- a/admin-web/src/pages/Promotion/ProductRecommendList.js
+++ /dev/null
@@ -1,436 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import {
- Card,
- Form,
- Input,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Spin,
- Row,
- Col,
- Select,
- Icon,
- InputNumber
-} from 'antd';
-import { checkTypeWithEnglishAndNumbers } from '../../../helpers/validator'
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './BannerList.less';
-import moment from "moment";
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-const SelectOption = Select.Option;
-const { TreeNode } = Tree;
-const status = ['未知', '正常', '禁用'];
-const types = ['未知', '新品推荐', '热卖推荐'];
-
-// 列表
-function List ({ dataSource, loading, pagination, searchParams, dispatch,
- handleModalVisible}) {
-
- function handleStatus(record) {
- Modal.confirm({
- title: record.status === 1 ? '确认禁用' : '取消禁用',
- content: `${record.productSpuId}`,
- onOk() {
- dispatch({
- type: 'productRecommendList/updateStatus',
- payload: {
- id: record.id,
- status: record.status === 1 ? 2 : 1,
- },
- });
- },
- onCancel() {},
- });
- }
-
- function handleDelete(record) {
- Modal.confirm({
- title: `确认删除?`,
- content: `${record.productSpuId}`,
- onOk() {
- dispatch({
- type: 'productRecommendList/delete',
- payload: {
- id: record.id,
- },
- });
- },
- onCancel() {},
- });
- }
-
- const columns = [
- {
- title: '推荐类型',
- dataIndex: 'type',
- render(val) {
- return {types[val]}; // TODO 芋艿，此处要改
- },
- },
- {
- title: '商品',
- dataIndex: 'productSpuName',
- },
- {
- title: '排序值',
- dataIndex: 'sort',
- },
- {
- title: '状态',
- dataIndex: 'status',
- render(val) {
- return {status[val]}; // TODO 芋艿，此处要改
- },
- },
- {
- title: '备注',
- dataIndex: 'memo',
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD HH:mm')},
- },
- {
- title: '操作',
- width: 200,
- render: (text, record) => {
- const statusText = record.status === 1 ? '禁用' : '开启'; // TODO 芋艿，此处要改
- return (
-
- handleModalVisible(true, 'update', record)}>编辑
-
- handleStatus(record)}>
- {statusText}
-
- {
- record.status === 2 ?
-
-
- handleDelete(record)}>
- 删除
-
- : null
- }
-
- );
- },
- },
- ];
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'productRecommendList/query',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- return (
-
- )
-}
-
-// 搜索表单
-// TODO 芋艿，有没办法换成上面那种写法
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch
- } = props;
-
- function search() {
- dispatch({
- type: 'productRecommendList/query',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...form.getFieldsValue()
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// 添加 or 修改 Form 表单
-const AddOrUpdateForm = Form.create()(props => {
- const { dispatch, modalVisible, form, handleModalVisible, modalType, formVals,
- searchProductSpuList} = props;
- // let selectedSearchProductSpu = formVals.productSpuId ? {
- // key: formVals.productSpuId,
- // label: formVals.productSpuName,
- // } : {};
-
- const okHandle = () => {
- form.validateFields((err, fields) => {
- if (err) return;
- // 添加表单
- if (modalType === 'add') {
- dispatch({
- type: 'productRecommendList/add',
- payload: {
- body: {
- ...fields,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('添加成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- // 修改表单
- } else {
- dispatch({
- type: 'productRecommendList/update',
- payload: {
- body: {
- id: formVals.id,
- ...fields,
- },
- callback: () => {
- // 清空表单
- form.resetFields();
- // 提示
- message.success('更新成功');
- // 关闭弹窗
- handleModalVisible();
- },
- },
- });
- }
- });
- };
-
- const searchProductSpu = (value) => {
- if (!value) {
- dispatch({
- type: 'productRecommendList/setAll',
- payload: {
- searchProductSpuList: [],
- },
- });
- return;
- }
- dispatch({
- type: 'productRecommendList/searchProductSpu',
- payload: {
- name: value,
- },
- });
- };
-
- const title = modalType === 'add' ? '新建商品推荐' : '更新商品推荐';
- return (
- handleModalVisible()}
- >
-
- {form.getFieldDecorator('type', {
- rules: [{ required: true, message: '请输入推荐类型！'},
- ],
- initialValue: formVals.type,
- })(
-
- )}
-
-
- {form.getFieldDecorator('productSpuId', {
- rules: [{ required: true, message: '请输入商品！'}, // TODO 芋艿，临时先输入商品编号，后面做成搜索。
- ],
- initialValue: formVals.productSpuId,
- })(
-
- )}
-
-
- {form.getFieldDecorator('sort', {
- rules: [{ required: true, message: '请输入排序值！' }],
- initialValue: formVals.sort,
- })()}
-
-
- {form.getFieldDecorator('memo', {
- rules: [{ required: false, message: '请输入备注！' },
- {max: 255, message: '最大长度为 255 位'},
- ],
- initialValue: formVals.memo,
- })()}
-
-
- );
-});
-
-@connect(({ productRecommendList }) => ({
- // list: productRecommend.list,
- // pagination: productRecommend.pagination,
- ...productRecommendList,
-}))
-
-// 主界面
-@Form.create()
-class BannerList extends PureComponent {
-
- componentDidMount() {
- const { dispatch } = this.props;
- dispatch({
- type: 'productRecommendList/query',
- payload: {
- ...PaginationHelper.defaultPayload
- },
- });
- }
-
- handleModalVisible = (modalVisible, modalType, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'productRecommendList/setAll',
- payload: {
- modalVisible,
- modalType,
- formVals: record || {},
- searchProductSpuList: [],
- },
- });
- };
-
- render() {
- // let that = this;
- const { dispatch,
- list, listLoading, searchParams, pagination,
- modalVisible, modalType, formVals, searchProductSpuList,
- confirmLoading, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- loading: listLoading,
- confirmLoading,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- };
-
- // 添加 or 更新表单属性
- const addOrUpdateFormProps = {
- modalVisible,
- modalType,
- formVals,
- dispatch,
- searchProductSpuList,
- handleModalVisible: this.handleModalVisible, // Function
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default BannerList;
diff --git a/admin-web/src/pages/Promotion/ProductRecommendList.less b/admin-web/src/pages/Promotion/ProductRecommendList.less
deleted file mode 100644
index 7ad3dac3f..000000000
--- a/admin-web/src/pages/Promotion/ProductRecommendList.less
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
-
-.tableListForm {
- :global {
- .ant-form-item {
- display: flex;
- margin-right: 0;
- margin-bottom: 24px;
- > .ant-form-item-label {
- width: auto;
- padding-right: 8px;
- line-height: 32px;
- }
- .ant-form-item-control {
- line-height: 32px;
- }
- }
- .ant-form-item-control-wrapper {
- flex: 1;
- }
- }
- .submitButtons {
- display: block;
- margin-bottom: 24px;
- white-space: nowrap;
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .tableListForm :global(.ant-form-item) {
- margin-right: 24px;
- }
-}
\ No newline at end of file
diff --git a/admin-web/src/pages/Promotion/TimeLimitedDiscountList.js b/admin-web/src/pages/Promotion/TimeLimitedDiscountList.js
deleted file mode 100644
index 0939327a4..000000000
--- a/admin-web/src/pages/Promotion/TimeLimitedDiscountList.js
+++ /dev/null
@@ -1,290 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber
-} from 'antd';
-const TabPane = Tabs.TabPane;
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './TimeLimitedDiscountList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-
-const statuses = {
- 10: '未开始',
- 20: '进行中',
- 30: '已结束',
- 40: '已撤销',
- 50: '已删除',
-}
-
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,}) {
-
- const handleTabsChange = (value) => {
- dispatch({
- type: 'timeLimitedDiscountList/page',
- payload: {
- ...searchParams,
- status: value,
- ...PaginationHelper.defaultPayload,
- }
- })
- };
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'timeLimitedDiscountList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '活动名称',
- dataIndex: 'title',
- },
- {
- title: '活动标签', // TODO 芋艿，未来增加
-
- },
- {
- title: '活动时间',
- render: (text, record) => (
-
- {moment(record.startTime).format('YYYY-MM-DD HH:mm:ss')}
- 至
- {moment(record.endTime).format('YYYY-MM-DD HH:mm:ss')}
-
- ),
- },
- {
- title: '状态',
- dataIndex: 'status',
- render: val => statuses[val + ''],
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- render: val => {moment(val).format('YYYY-MM-DD')},
- },
- {
- title: '操作',
- width: 300,
- render: (text, record) => (
-
- {/* this.handleModalVisible(true, 'update', record)}>更新*/}
- alert('正在开发中')}>编辑
- {
- record.status === 10 || record.status === 20 ?
-
- alert('正在开发中')}>
- 撤销
-
- : undefined
- }
- {
- record.status !== 50 ?
-
- alert('正在开发中')}>
- 删除
-
- : undefined
- }
-
- ),
- },
- ];
-
- // console.log(pagination);
-
- return (
-
- )
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- } = props;
-
- function search() {
- dispatch({
- type: 'timeLimitedDiscountList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// timeLimitedDiscountList
-@connect(({ timeLimitedDiscountList }) => ({
- ...timeLimitedDiscountList,
- // list: timeLimitedDiscountList.list.spus,
- // loading: loading.models.timeLimitedDiscountList,
-}))
-
-@Form.create()
-class TimeLimitedDiscountList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- };
-
- componentDidMount() {
- const { dispatch, searchParams } = this.props;
- // 查询初始数据
- dispatch({
- type: 'timeLimitedDiscountList/page',
- payload: {
- ...searchParams,
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
- handleSortModalVisible = (sortModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'timeLimitedDiscountList/setAll',
- payload: {
- sortModalVisible,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, formVals, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleSortModalVisible: this.handleSortModalVisible, // Func
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- return (
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default TimeLimitedDiscountList;
diff --git a/admin-web/src/pages/Promotion/TimeLimitedDiscountList.less b/admin-web/src/pages/Promotion/TimeLimitedDiscountList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/Promotion/TimeLimitedDiscountList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/Result/Error.js b/admin-web/src/pages/Result/Error.js
deleted file mode 100644
index fba2da6d1..000000000
--- a/admin-web/src/pages/Result/Error.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { Fragment } from 'react';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import { Button, Icon, Card } from 'antd';
-import Result from '@/components/Result';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-const extra = (
-
-
-
-
-
-
-
-);
-
-const actions = (
-
-);
-
-export default () => (
-
-
-
-
-
-);
diff --git a/admin-web/src/pages/Result/Success.js b/admin-web/src/pages/Result/Success.js
deleted file mode 100644
index 74d19dc38..000000000
--- a/admin-web/src/pages/Result/Success.js
+++ /dev/null
@@ -1,144 +0,0 @@
-import React, { Fragment } from 'react';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import { Button, Row, Col, Icon, Steps, Card } from 'antd';
-import Result from '@/components/Result';
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-const { Step } = Steps;
-
-const desc1 = (
-
-
-
-
-
-
2016-12-12 12:32
-
-
-
-
-
-
-
-
- 23421
-
-
-
-
-
-
-
-
-
-
-
- 2016-12-12 ~ 2017-12-12
-
-
-
-
-
-
- }
- description={desc1}
- />
-
-
-
- }
- description={desc2}
- />
-
-
-
- }
- />
-
-
-
- }
- />
-
-
-);
-
-const actions = (
-
-
-
-
-
-);
-
-export default () => (
-
-
-
-
-
-);
diff --git a/admin-web/src/pages/Result/Success.test.js b/admin-web/src/pages/Result/Success.test.js
deleted file mode 100644
index 9bc9b8dff..000000000
--- a/admin-web/src/pages/Result/Success.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import Success from './Success';
-
-it('renders with Result', () => {
- const wrapper = shallow();
- expect(wrapper.find('Result').length).toBe(1);
- expect(wrapper.find('Result').prop('type')).toBe('success');
-});
diff --git a/admin-web/src/pages/Sms/SignList.js b/admin-web/src/pages/Sms/SignList.js
deleted file mode 100644
index a80441229..000000000
--- a/admin-web/src/pages/Sms/SignList.js
+++ /dev/null
@@ -1,265 +0,0 @@
-import React, { PureComponent } from 'react';
-import { Card, Divider, Table, Modal, Button } from 'antd';
-import { connect } from 'dva';
-
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import DictionaryText from '../../components/Dictionary/DictionaryText';
-import dictionary from '../../utils/dictionary';
-import styles from '../List/TableList.less';
-import SignListSearch from './SignListSearch';
-import SignListModal from './SignListModal';
-
-@connect(({ smsSignList, loading }) => ({
- smsSignList,
- loading: loading.models.smsSignList,
-}))
-class SignList extends PureComponent {
- state = {
- visible: false,
- title: '添加签名', // 添加签名 修改签名
- type: 'add', // add update
- id: '',
- sign: {},
- };
-
- componentDidMount() {
- // init page 参数
- this.current = 1;
- this.total = 0;
- this.size = 10;
- this.searchParams = {};
-
- // 查询 page
- this.queryPage();
- }
-
- queryPage = () => {
- const { dispatch } = this.props;
- const { current, total, size, searchParams } = this;
-
- dispatch({
- type: 'smsSignList/page',
- payload: {
- pageNo: current,
- total,
- pageSize: size,
- ...searchParams,
- },
- });
- };
-
- handleSearch = searchParams => {
- this.searchParams = searchParams;
- this.queryPage();
- };
-
- handleAddShow = () => {
- this.setState({
- visible: true,
- type: 'add',
- title: '添加签名',
- sign: {},
- });
- };
-
- handleUpdateShow = sign => {
- const { id } = sign;
- this.setState({
- visible: true,
- type: 'update',
- title: '更新签名',
- id,
- sign,
- });
- };
-
- handleDeleted = ({ id, sign }) => {
- const { dispatch } = this.props;
- Modal.confirm({
- title: `提示消息`,
- content: `确认删除 ${sign} 签名吗`,
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- dispatch({
- type: 'smsSignList/deleted',
- payload: {
- params: {
- id,
- },
- callback: () => {
- this.queryPage();
- },
- },
- });
- },
- onCancel() {
- console.log('Cancel');
- },
- });
- };
-
- handleCancel = () => {
- this.setState({
- visible: false,
- });
- };
-
- handleOk = fields => {
- const { dispatch } = this.props;
- const { type, id } = this.state;
-
- if (type === 'add') {
- dispatch({
- type: 'smsSignList/add',
- payload: {
- params: {
- ...fields,
- },
- callback: () => {
- this.handleCancel();
- this.queryPage();
- },
- },
- });
- } else if (type === 'update') {
- dispatch({
- type: 'smsSignList/update',
- payload: {
- params: {
- id,
- ...fields,
- },
- callback: () => {
- this.handleCancel();
- this.queryPage();
- },
- },
- });
- }
- };
-
- handleTableChange = pagination => {
- const { pageSize, current } = pagination;
- this.size = pageSize;
- this.current = current;
- this.queryPage();
- };
-
- render() {
- // props
- const { loading, smsSignList } = this.props;
- const { list, total, index, size } = smsSignList;
- const { visible, title, type, sign } = this.state;
-
- const columns = [
- {
- title: 'ID',
- dataIndex: 'id',
- key: 'id',
- },
- {
- title: '签名',
- dataIndex: 'sign',
- key: 'sign',
- },
- {
- title: '短信平台',
- dataIndex: 'platform',
- key: 'platform',
- render(platform) {
- return (
-
-
-
- );
- },
- },
- {
- title: '审核状态',
- dataIndex: 'applyStatus',
- key: 'applyStatus',
- render(applyStatus) {
- return (
-
-
-
- );
- },
- },
- {
- title: '更新时间',
- dataIndex: 'updateTime',
- key: 'updateTime',
- width: 200,
- render(updateTime) {
- return {updateTime}
;
- },
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- key: 'createTime',
- width: 200,
- render(createTime) {
- return {createTime}
;
- },
- },
- {
- title: '操作',
- render: row => {
- return (
-
- );
- },
- },
- ];
-
- const pagination = {
- total,
- index,
- pageSize: size,
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default SignList;
diff --git a/admin-web/src/pages/Sms/SignList.less b/admin-web/src/pages/Sms/SignList.less
deleted file mode 100644
index 027d7295e..000000000
--- a/admin-web/src/pages/Sms/SignList.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
diff --git a/admin-web/src/pages/Sms/SignListModal.js b/admin-web/src/pages/Sms/SignListModal.js
deleted file mode 100644
index 6cbd7bc6b..000000000
--- a/admin-web/src/pages/Sms/SignListModal.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { Form, Input, Modal } from 'antd';
-import DictionarySelect from '../../components/Dictionary/DictionarySelect';
-import dictionary from '../../utils/dictionary';
-
-/**
- * table 查询
- *
- * @type {React.ComponentClass>}
- */
-const SignListModal = Form.create()(props => {
- const { onOk, onCancel, visible, title, form, initData = {} } = props;
- const { getFieldDecorator, validateFields } = props.form;
-
- function handleOk(e) {
- e.preventDefault();
-
- validateFields((err, fields) => {
- const searchParams = fields;
- if (onOk) {
- onOk(searchParams);
- form.resetFields();
- }
- });
- }
-
- function handleCancel() {
- if (onCancel) {
- onCancel();
- }
- }
-
- const formItemLayout = {
- labelCol: { span: 4 },
- wrapperCol: { span: 18 },
- };
-
- return (
-
-
-
- );
-});
-
-export default SignListModal;
diff --git a/admin-web/src/pages/Sms/SignListSearch.js b/admin-web/src/pages/Sms/SignListSearch.js
deleted file mode 100644
index cbbc4b805..000000000
--- a/admin-web/src/pages/Sms/SignListSearch.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { Button, Col, Form, Input, Row } from 'antd';
-
-const FormItem = Form.Item;
-
-/**
- * table 查询
- *
- * @type {React.ComponentClass>}
- */
-const SignListSearch = Form.create()(props => {
- const { handleSearch } = props;
- const { getFieldDecorator, validateFields, form } = props.form;
-
- function onSubmit(e) {
- e.preventDefault();
-
- validateFields((err, fields) => {
- const searchParams = fields;
- if (handleSearch) {
- handleSearch(searchParams);
- }
- });
- }
-
- function handleFormReset() {
- form.resetFields();
- }
-
- return (
-
- );
-});
-
-export default SignListSearch;
diff --git a/admin-web/src/pages/Sms/TemplateList.js b/admin-web/src/pages/Sms/TemplateList.js
deleted file mode 100644
index c18ab2b5a..000000000
--- a/admin-web/src/pages/Sms/TemplateList.js
+++ /dev/null
@@ -1,292 +0,0 @@
-import React, { PureComponent } from 'react';
-import { Card, Divider, Table, Modal, Button } from 'antd';
-import { connect } from 'dva';
-
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-import DictionaryText from '../../components/Dictionary/DictionaryText';
-import dictionary from '../../utils/dictionary';
-import styles from '../List/TableList.less';
-import TemplateListSearch from './TemplateListSearch';
-import TemplateListModal from './TemplateListModal';
-
-@connect(({ smsSignList, smsTemplateList, loading }) => ({
- smsSignList,
- smsTemplateList,
- loading: loading.models.smsTemplateList,
-}))
-class TemplateList extends PureComponent {
- state = {
- visible: false,
- title: '添加模板', // 添加签名 修改签名
- type: 'add', // add update
- id: '',
- template: {},
- };
-
- componentDidMount() {
- // init page 参数
- this.current = 1;
- this.total = 0;
- this.size = 10;
- this.searchParams = {};
-
- // 查询 page
- this.queryPage();
-
- // 查询 sign 用于 signList
- this.querySignList();
- }
-
- querySignList = () => {
- const { dispatch } = this.props;
- dispatch({
- type: 'smsSignList/page',
- payload: {
- pageNo: 1,
- total: 0,
- pageSize: 100,
- // ...searchParams,
- },
- });
- };
-
- queryPage = () => {
- const { dispatch } = this.props;
- const { current, total, size, searchParams } = this;
-
- dispatch({
- type: 'smsTemplateList/page',
- payload: {
- pageNo: current,
- total,
- pageSize: size,
- ...searchParams,
- },
- });
- };
-
- handleSearch = searchParams => {
- this.searchParams = searchParams;
- this.queryPage();
- };
-
- handleAddShow = () => {
- this.setState({
- visible: true,
- type: 'add',
- title: '添加模板',
- template: {},
- });
- };
-
- handleUpdateShow = template => {
- const { id } = template;
- this.setState({
- visible: true,
- type: 'update',
- title: '更新模板',
- id,
- template,
- });
- };
-
- handleDeleted = ({ id, template }) => {
- const { dispatch } = this.props;
- Modal.confirm({
- title: `提示消息`,
- content: `确认删除 ${template} 签名吗`,
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- dispatch({
- type: 'smsTemplateList/deleted',
- payload: {
- params: {
- id,
- },
- callback: () => {
- this.queryPage();
- },
- },
- });
- },
- onCancel() {
- console.log('Cancel');
- },
- });
- };
-
- handleCancel = () => {
- this.setState({
- visible: false,
- });
- };
-
- handleOk = fields => {
- const { dispatch } = this.props;
- const { type, id } = this.state;
-
- if (type === 'add') {
- dispatch({
- type: 'smsTemplateList/add',
- payload: {
- params: {
- ...fields,
- },
- callback: () => {
- this.handleCancel();
- this.queryPage();
- },
- },
- });
- } else if (type === 'update') {
- dispatch({
- type: 'smsTemplateList/update',
- payload: {
- params: {
- id,
- ...fields,
- },
- callback: () => {
- this.handleCancel();
- this.queryPage();
- },
- },
- });
- }
- };
-
- handleTableChange = pagination => {
- const { pageSize, current } = pagination;
- this.size = pageSize;
- this.current = current;
- this.queryPage();
- };
-
- render() {
- // props
- const { loading, smsTemplateList, smsSignList } = this.props;
- const { list, total, index, size } = smsTemplateList;
- const { visible, title, type, template } = this.state;
-
- const columns = [
- {
- title: 'ID',
- dataIndex: 'id',
- key: 'id',
- },
- {
- title: '签名',
- dataIndex: 'sign',
- key: 'sign',
- // eslint-disable-next-line no-shadow
- render({ sign }) {
- return {sign}
;
- },
- },
- {
- title: '模板',
- dataIndex: 'template',
- key: 'template',
- },
- {
- title: '短信平台',
- dataIndex: 'platform',
- key: 'platform',
- render(platform) {
- return (
-
-
-
- );
- },
- },
- {
- title: '审核状态',
- dataIndex: 'applyStatus',
- key: 'applyStatus',
- render(applyStatus) {
- return (
-
-
-
- );
- },
- },
- {
- title: '更新时间',
- dataIndex: 'updateTime',
- key: 'updateTime',
- width: 200,
- render(updateTime) {
- return {updateTime}
;
- },
- },
- {
- title: '创建时间',
- dataIndex: 'createTime',
- key: 'createTime',
- width: 200,
- render(createTime) {
- return {createTime}
;
- },
- },
- {
- title: '操作',
- render: row => {
- return (
-
- );
- },
- },
- ];
-
- const pagination = {
- total,
- index,
- pageSize: size,
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default TemplateList;
diff --git a/admin-web/src/pages/Sms/TemplateList.less b/admin-web/src/pages/Sms/TemplateList.less
deleted file mode 100644
index 027d7295e..000000000
--- a/admin-web/src/pages/Sms/TemplateList.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
diff --git a/admin-web/src/pages/Sms/TemplateListModal.js b/admin-web/src/pages/Sms/TemplateListModal.js
deleted file mode 100644
index e12d10fe4..000000000
--- a/admin-web/src/pages/Sms/TemplateListModal.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React from 'react';
-import { Form, Input, Modal, Select } from 'antd';
-import DictionarySelect from '../../components/Dictionary/DictionarySelect';
-import dictionary from '../../utils/dictionary';
-
-/**
- * table 查询
- *
- * @type {React.ComponentClass>}
- */
-const SignListModal = Form.create()(props => {
- const { onOk, onCancel, visible, title, form, signList, initData = {} } = props;
- const { getFieldDecorator, validateFields } = props.form;
-
- function handleOk(e) {
- e.preventDefault();
-
- validateFields((err, fields) => {
- const searchParams = fields;
- if (onOk) {
- onOk(searchParams);
- form.resetFields();
- }
- });
- }
-
- function handleCancel() {
- if (onCancel) {
- onCancel();
- }
- }
-
- const formItemLayout = {
- labelCol: { span: 4 },
- wrapperCol: { span: 18 },
- };
-
- return (
-
-
-
- );
-});
-
-export default SignListModal;
diff --git a/admin-web/src/pages/Sms/TemplateListSearch.js b/admin-web/src/pages/Sms/TemplateListSearch.js
deleted file mode 100644
index 6fc984d8f..000000000
--- a/admin-web/src/pages/Sms/TemplateListSearch.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import { Button, Col, Form, Input, Row, Select } from 'antd';
-
-const FormItem = Form.Item;
-
-/**
- * table 查询
- *
- * @type {React.ComponentClass>}
- */
-const SignListSearch = Form.create()(props => {
- const { handleSearch, signList } = props;
- const { getFieldDecorator, validateFields, form } = props.form;
-
- function onSubmit(e) {
- e.preventDefault();
-
- validateFields((err, fields) => {
- const searchParams = fields;
- if (handleSearch) {
- handleSearch(searchParams);
- }
- });
- }
-
- function handleFormReset() {
- form.resetFields();
- }
-
- return (
-
- );
-});
-
-export default SignListSearch;
diff --git a/admin-web/src/pages/User/Login.js b/admin-web/src/pages/User/Login.js
deleted file mode 100644
index bb734a7c9..000000000
--- a/admin-web/src/pages/User/Login.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'dva';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import Link from 'umi/link';
-import { Checkbox, Alert, Icon } from 'antd';
-import Login from '@/components/Login';
-import styles from './Login.less';
-
-const { Tab, UserName, Password, Mobile, Captcha, Submit } = Login;
-
-@connect(({ login, loading }) => ({
- login,
- submitting: loading.effects['login/login'],
-}))
-class LoginPage extends Component {
- state = {
- type: 'account',
- autoLogin: true,
- };
-
- onTabChange = type => {
- this.setState({ type });
- };
-
- onGetCaptcha = () =>
- new Promise((resolve, reject) => {
- this.loginForm.validateFields(['username'], {}, (err, values) => {
- if (err) {
- reject(err);
- } else {
- const { dispatch } = this.props;
- dispatch({
- type: 'login/getCaptcha',
- payload: values.mobile,
- })
- .then(resolve)
- .catch(reject);
- }
- });
- });
-
- handleSubmit = (err, values) => {
- const { type } = this.state;
- if (!err) {
- const { dispatch } = this.props;
- dispatch({
- type: 'login/login',
- payload: {
- ...values,
- type,
- },
- });
- }
- };
-
- changeAutoLogin = e => {
- this.setState({
- autoLogin: e.target.checked,
- });
- };
-
- renderMessage = content => (
-
- );
-
- render() {
- const { login, submitting } = this.props;
- const { type, autoLogin } = this.state;
- return (
-
-
{
- this.loginForm = form;
- }}
- >
-
- {login.status === 'error' &&
- login.type === 'account' &&
- !submitting &&
- this.renderMessage(formatMessage({ id: 'app.login.message-invalid-credentials' }))}
-
- {
- e.preventDefault();
- this.loginForm.validateFields(this.handleSubmit);
- }}
- />
-
- {/**/}
- {/*{login.status === 'error' &&*/}
- {/*login.type === 'mobile' &&*/}
- {/*!submitting &&*/}
- {/*this.renderMessage(*/}
- {/*formatMessage({ id: 'app.login.message-invalid-verification-code' })*/}
- {/*)}*/}
- {/**/}
- {/**/}
- {/**/}
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-export default Register;
diff --git a/admin-web/src/pages/User/Register.less b/admin-web/src/pages/User/Register.less
deleted file mode 100644
index c7e225290..000000000
--- a/admin-web/src/pages/User/Register.less
+++ /dev/null
@@ -1,57 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.main {
- width: 388px;
- margin: 0 auto;
-
- :global {
- .ant-form-item {
- margin-bottom: 24px;
- }
- }
-
- h3 {
- margin-bottom: 20px;
- font-size: 16px;
- }
-
- .getCaptcha {
- display: block;
- width: 100%;
- }
-
- .submit {
- width: 50%;
- }
-
- .login {
- float: right;
- line-height: @btn-height-lg;
- }
-}
-
-.success,
-.warning,
-.error {
- transition: color 0.3s;
-}
-
-.success {
- color: @success-color;
-}
-
-.warning {
- color: @warning-color;
-}
-
-.error {
- color: @error-color;
-}
-
-.progress-pass > .progress {
- :global {
- .ant-progress-bg {
- background-color: @warning-color;
- }
- }
-}
diff --git a/admin-web/src/pages/User/RegisterResult.js b/admin-web/src/pages/User/RegisterResult.js
deleted file mode 100644
index 6e338b277..000000000
--- a/admin-web/src/pages/User/RegisterResult.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { formatMessage, FormattedMessage } from 'umi/locale';
-import { Button } from 'antd';
-import Link from 'umi/link';
-import Result from '@/components/Result';
-import styles from './RegisterResult.less';
-
-const actions = (
-
-);
-
-const RegisterResult = ({ location }) => (
-
-
-
- }
- description={formatMessage({ id: 'app.register-result.activation-email' })}
- actions={actions}
- style={{ marginTop: 56 }}
- />
-);
-
-export default RegisterResult;
diff --git a/admin-web/src/pages/User/RegisterResult.less b/admin-web/src/pages/User/RegisterResult.less
deleted file mode 100644
index a969a5eee..000000000
--- a/admin-web/src/pages/User/RegisterResult.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.registerResult {
- :global {
- .anticon {
- font-size: 64px;
- }
- }
- .title {
- margin-top: 32px;
- font-size: 20px;
- line-height: 28px;
- }
- .actions {
- margin-top: 40px;
- a + a {
- margin-left: 8px;
- }
- }
-}
diff --git a/admin-web/src/pages/User/UserList.js b/admin-web/src/pages/User/UserList.js
deleted file mode 100644
index 4330579e3..000000000
--- a/admin-web/src/pages/User/UserList.js
+++ /dev/null
@@ -1,266 +0,0 @@
-/* eslint-disable */
-
-import React, { PureComponent, Fragment } from 'react';
-import { connect } from 'dva';
-import moment from 'moment';
-import {
- Card,
- Form,
- Input,
- Row,
- Col,
- Button,
- Modal,
- message,
- Table,
- Divider,
- Tree,
- Tabs,
- TreeSelect,
- Spin,
- InputNumber, Select
-} from 'antd';
-const TabPane = Tabs.TabPane;
-import PageHeaderWrapper from '@/components/PageHeaderWrapper';
-
-import styles from './UserList.less';
-import PaginationHelper from "../../../helpers/PaginationHelper";
-
-const FormItem = Form.Item;
-
-const statuses = {
- 1: '开启',
- 2: '关闭',
-};
-
-// 列表
-function List({ dataSource, loading, pagination, searchParams, dispatch,}) {
-
- function onPageChange(page) { // 翻页
- dispatch({
- type: 'userList/page',
- payload: {
- pageNo: page.current,
- pageSize: page.pageSize,
- ...searchParams
- }
- })
- }
-
- const columns = [
- // {
- // title: 'id',
- // dataIndex: 'id',
- // render: text => {text},
- // },
- {
- title: '昵称',
- dataIndex: 'nickname',
- },
- {
- title: '手机号码',
- dataIndex: 'mobile',
- },
- {
- title: '会员卡', // TODO 芋艿，未来增加
- },
- {
- title: '累积交易次数', // TODO 芋艿，未来增加
- },
- {
- title: '累计交易额', // TODO 芋艿，未来增加
- },
- {
- title: '积分', // TODO 芋艿，未来增加
- },
- {
- title: '会员标签', // TODO 芋艿，未来增加
- },
- {
- title: '备注', // TODO 芋艿，未来增加
- },
- {
- title: '状态',
- dataIndex: 'status',
- render: val => statuses[val + ''],
- },
- {
- title: '操作',
- width: 300,
- render: (text, record) => (
-
- {/* this.handleModalVisible(true, 'update', record)}>更新*/}
- alert('正在开发中')}>编辑
-
- ),
- },
- ];
-
- // console.log(pagination);
-
- return (
-
- )
-}
-
-// 搜索表单
-const SearchForm = Form.create()(props => {
- const {
- form,
- form: { getFieldDecorator },
- dispatch,
- searchParams,
- } = props;
-
- function search() {
- dispatch({
- type: 'userList/page',
- payload: {
- ...PaginationHelper.defaultPayload,
- ...searchParams,
- ...form.getFieldsValue(),
- }
- })
- }
-
- // 提交搜索
- function handleSubmit(e) {
- // 阻止默认事件
- e.preventDefault();
- // 提交搜索
- search();
- }
-
- // 重置搜索
- function handleReset() {
- // 重置表单
- form.resetFields();
- // 执行搜索
- search();
- }
-
- return (
-
- );
-});
-
-// userList
-@connect(({ userList }) => ({
- ...userList,
- // list: userList.list.spus,
- // loading: loading.models.userList,
-}))
-
-@Form.create()
-class UserList extends PureComponent {
- state = {
- modalVisible: false,
- modalType: 'add', //add update
- initValues: {},
- };
-
- componentDidMount() {
- const { dispatch, searchParams } = this.props;
- // 查询初始数据
- dispatch({
- type: 'userList/page',
- payload: {
- ...searchParams,
- ...PaginationHelper.defaultPayload,
- },
- });
- }
-
- handleSortModalVisible = (sortModalVisible, record) => {
- const { dispatch } = this.props;
- dispatch({
- type: 'userList/setAll',
- payload: {
- sortModalVisible,
- formVals: record || {}
- },
- });
- };
-
- render() {
- const { dispatch,
- list, listLoading, searchParams, pagination,
- categoryTree, formVals, } = this.props;
-
- // 列表属性
- const listProps = {
- dataSource: list,
- pagination,
- searchParams,
- dispatch,
- categoryTree,
- loading: listLoading,
- handleSortModalVisible: this.handleSortModalVisible, // Func
- };
-
- // 搜索表单属性
- const searchFormProps = {
- dispatch,
- categoryTree,
- searchParams,
- };
-
- return (
-
-
-
-
- {/* alert('正在开发中')}*/}
- {/*>*/}
- {/* 新建会员*/}
- {/**/}
-
-
-
-
- );
- }
-}
-
-export default UserList;
diff --git a/admin-web/src/pages/User/UserList.less b/admin-web/src/pages/User/UserList.less
deleted file mode 100644
index ebb45c292..000000000
--- a/admin-web/src/pages/User/UserList.less
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-@import '~@/utils/utils.less';
-
-.tableList {
- .tableListOperator {
- margin-bottom: 16px;
- button {
- margin-right: 8px;
- }
- }
-}
-
-.tableDelete {
- color: red;
-}
diff --git a/admin-web/src/pages/User/models/register.js b/admin-web/src/pages/User/models/register.js
deleted file mode 100644
index e3e307ec8..000000000
--- a/admin-web/src/pages/User/models/register.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { fakeRegister } from '@/services/api';
-import { setAuthority } from '@/utils/authority';
-import { reloadAuthorized } from '@/utils/Authorized';
-
-export default {
- namespace: 'register',
-
- state: {
- status: undefined,
- },
-
- effects: {
- *submit({ payload }, { call, put }) {
- console.error(1);
- const response = yield call(fakeRegister, payload);
- yield put({
- type: 'registerHandle',
- payload: response,
- });
- },
- },
-
- reducers: {
- registerHandle(state, { payload }) {
- setAuthority('user');
- reloadAuthorized();
- return {
- ...state,
- status: payload.status,
- };
- },
- },
-};
diff --git a/admin-web/src/pages/document.ejs b/admin-web/src/pages/document.ejs
deleted file mode 100644
index d0d8610c5..000000000
--- a/admin-web/src/pages/document.ejs
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
- 一个商城管理平台
-
-
-
-
-
-
-
diff --git a/admin-web/src/service-worker.js b/admin-web/src/service-worker.js
deleted file mode 100644
index 48d43c254..000000000
--- a/admin-web/src/service-worker.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* globals workbox */
-/* eslint-disable no-restricted-globals */
-workbox.core.setCacheNameDetails({
- prefix: 'antd-pro',
- suffix: 'v1',
-});
-// Control all opened tabs ASAP
-workbox.clientsClaim();
-
-/**
- * Use precaching list generated by workbox in build process.
- * https://developers.google.com/web/tools/workbox/reference-docs/latest/workbox.precaching
- */
-/* eslint-disable no-underscore-dangle */
-workbox.precaching.precacheAndRoute(self.__precacheManifest || []);
-
-/**
- * Register a navigation route.
- * https://developers.google.com/web/tools/workbox/modules/workbox-routing#how_to_register_a_navigation_route
- */
-workbox.routing.registerNavigationRoute('/index.html');
-
-/**
- * Use runtime cache:
- * https://developers.google.com/web/tools/workbox/reference-docs/latest/workbox.routing#.registerRoute
- *
- * Workbox provides all common caching strategies including CacheFirst, NetworkFirst etc.
- * https://developers.google.com/web/tools/workbox/reference-docs/latest/workbox.strategies
- */
-
-/**
- * Handle API requests
- */
-workbox.routing.registerRoute(/\/api\//, workbox.strategies.networkFirst());
-
-/**
- * Handle third party requests
- */
-workbox.routing.registerRoute(
- /^https:\/\/gw.alipayobjects.com\//,
- workbox.strategies.networkFirst()
-);
-workbox.routing.registerRoute(
- /^https:\/\/cdnjs.cloudflare.com\//,
- workbox.strategies.networkFirst()
-);
-workbox.routing.registerRoute(/\/color.less/, workbox.strategies.networkFirst());
-
-/**
- * Response to client after skipping waiting with MessageChannel
- */
-addEventListener('message', event => {
- const replyPort = event.ports[0];
- const message = event.data;
- if (replyPort && message && message.type === 'skip-waiting') {
- event.waitUntil(
- self
- .skipWaiting()
- .then(
- () => replyPort.postMessage({ error: null }),
- error => replyPort.postMessage({ error })
- )
- );
- }
-});
diff --git a/admin-web/src/services/admin.js b/admin-web/src/services/admin.js
deleted file mode 100644
index 7bac2a5c0..000000000
--- a/admin-web/src/services/admin.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// admin
-
-export async function addAdmin(params) {
- return request(`/admin-api/admins/admin/add?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateAdmin(params) {
- return request(`/admin-api/admins/admin/update?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateAdminStatus(params) {
- return request(`/admin-api/admins/admin/update_status?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function deleteAdmin(params) {
- return request(`/admin-api/admins/admin/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function queryAdminRoleList(params) {
- return request(`/admin-api/admins/admin/role_list?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function adminRoleAssign(params) {
- return request(`/admin-api/admins/admin/assign_role?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-// deptment
-export async function addDeptment(params) {
- return request('/admin-api/admins/dept/add', {
- method: 'POST',
- body: {
- ...params,
- },
- });
-}
-
-export async function updateDeptment(params) {
- return request('/admin-api/admins/dept/update', {
- method: 'POST',
- body: {
- ...params,
- },
- });
-}
-
-export async function deleteDeptment(params) {
- return request(`/admin-api/admins/dept/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function deptTreePage(params) {
- return request(`/admin-api/admins/dept/tree/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function deptTreeAll() {
- return request('/admin-api/admins/dept/tree/all', {
- method: 'GET',
- });
-}
-
-
-// role
-
-
-
-
-
-
-
-// dictionary
-
-export async function dictionaryTree(params) {
- return request(`/admin-api/admins/data_dict/tree?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function dictionaryList(params) {
- return request(`/admin-api/admins/data_dict/list?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function dictionaryAdd(params) {
- return request(`/admin-api/admins/data_dict/add?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function dictionaryUpdate(params) {
- return request(`/admin-api/admins/data_dict/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function dictionaryDelete(params) {
- return request(`/admin-api/admins/data_dict/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-// file
-
-export async function fileGetQiniuToken() {
- return request(`/admin-api/admins/file/get-qiniu-token`, {
- method: 'GET',
- });
-}
-
-// export async function fileUploadQiniu(fileData) {
-// return request(`/qiniu/upload`, {
-// method: 'POST',
-// });
-// }
diff --git a/admin-web/src/services/api.js b/admin-web/src/services/api.js
deleted file mode 100644
index 379e94c9f..000000000
--- a/admin-web/src/services/api.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-export async function queryProjectNotice() {
- return request('/api/project/notice');
-}
-
-export async function queryActivities() {
- return request('/api/activities');
-}
-
-export async function queryRule(params) {
- return request(`/api/rule?${stringify(params)}`);
-}
-
-export async function removeRule(params) {
- return request('/api/rule', {
- method: 'POST',
- body: {
- ...params,
- method: 'delete',
- },
- });
-}
-
-export async function addRule(params) {
- return request('/api/rule', {
- method: 'POST',
- body: {
- ...params,
- method: 'post',
- },
- });
-}
-
-export async function updateRule(params = {}) {
- return request(`/api/rule?${stringify(params.query)}`, {
- method: 'POST',
- body: {
- ...params.body,
- method: 'update',
- },
- });
-}
-
-export async function fakeSubmitForm(params) {
- return request('/api/forms', {
- method: 'POST',
- body: params,
- });
-}
-
-export async function fakeChartData() {
- return request('/api/fake_chart_data');
-}
-
-export async function queryTags() {
- return request('/api/tags');
-}
-
-export async function queryBasicProfile(id) {
- return request(`/api/profile/basic?id=${id}`);
-}
-
-export async function queryAdvancedProfile() {
- return request('/api/profile/advanced');
-}
-
-export async function queryFakeList(params) {
- return request(`/api/fake_list?${stringify(params)}`);
-}
-
-export async function removeFakeList(params) {
- const { count = 5, ...restParams } = params;
- return request(`/api/fake_list?count=${count}`, {
- method: 'POST',
- body: {
- ...restParams,
- method: 'delete',
- },
- });
-}
-
-export async function addFakeList(params) {
- const { count = 5, ...restParams } = params;
- return request(`/api/fake_list?count=${count}`, {
- method: 'POST',
- body: {
- ...restParams,
- method: 'post',
- },
- });
-}
-
-export async function updateFakeList(params) {
- const { count = 5, ...restParams } = params;
- return request(`/api/fake_list?count=${count}`, {
- method: 'POST',
- body: {
- ...restParams,
- method: 'update',
- },
- });
-}
-
-export async function fakeAccountLogin(params) {
- return request(`/admin-api/admins/passport/login?${stringify(params)}`, {
- method: 'POST',
- body: params,
- });
-}
-
-export async function fakeRegister(params) {
- return request(`/admin-api/admins/passport/login?${stringify(params)}`, {
- method: 'POST',
- body: params,
- });
-}
-
-export async function queryNotices(params = {}) {
- return request(`/api/notices?${stringify(params)}`);
-}
-
-export async function getFakeCaptcha(mobile) {
- return request(`/api/captcha?mobile=${mobile}`);
-}
diff --git a/admin-web/src/services/error.js b/admin-web/src/services/error.js
deleted file mode 100644
index 13f2e942c..000000000
--- a/admin-web/src/services/error.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import request from '@/utils/request';
-
-export default async function queryError(code) {
- return request(`/api/${code}`);
-}
diff --git a/admin-web/src/services/geographic.js b/admin-web/src/services/geographic.js
deleted file mode 100644
index a5defd87b..000000000
--- a/admin-web/src/services/geographic.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-export async function queryProvince() {
- return request('/api/geographic/province');
-}
-
-export async function queryCity(province) {
- return request(`/api/geographic/city/${province}`);
-}
diff --git a/admin-web/src/services/order.js b/admin-web/src/services/order.js
deleted file mode 100644
index 20dcde79f..000000000
--- a/admin-web/src/services/order.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// order
-export async function orderPage(params) {
- return request(`/order-api/admins/order/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function orderItems(params) {
- return request(`/order-api/admins/order/order_items?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function getOrderRecipientInfo(params) {
- return request(`/order-api/admins/order/order_recipient_info?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function orderDeliver(params) {
- return request(`/order-api/admins/order/order_deliver`, {
- method: 'POST',
- body: {
- ...params,
- },
- });
-}
-
-export async function updateOrderItemPayAmount(params) {
- return request(`/order-api/admins/order/order_item/update_pay_amount?${stringify(params)}`, {
- method: 'PUT',
- });
-}
-
-export async function updateRemark(params) {
- return request(`/order-api/admins/order/update_remark?${stringify(params)}`, {
- method: 'PUT',
- });
-}
-
-export async function cancelOrder(params) {
- return request(`/order-api/admins/order/cancel_order?${stringify(params)}`, {
- method: 'PUT',
- });
-}
-
-export async function updateOrderItem(params) {
- return request(`/order-api/admins/order_item/update?${stringify(params)}`, {
- method: 'PUT',
- body: {
- ...params,
- },
- });
-}
-
-export async function getLogistics(params) {
- return request(`/order-api/admins/order_item/update?${stringify(params)}`, {
- method: 'PUT',
- body: {
- ...params,
- },
- });
-}
diff --git a/admin-web/src/services/orderRefunds.js b/admin-web/src/services/orderRefunds.js
deleted file mode 100644
index 94eb68b40..000000000
--- a/admin-web/src/services/orderRefunds.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// order
-export async function list(params) {
- return request(`/order-api/admins/order_return/list?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function agree(params) {
- return request(`/order-api/admins/order_return/agree?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function refuse(params) {
- return request(`/order-api/admins/order_return/refuse?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function confirmReceipt(params) {
- return request(`/order-api/admins/order_return/confirm_receipt?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function confirmRefund(params) {
- return request(`/order-api/admins/order_return/confirm_refund?${stringify(params)}`, {
- method: 'POST',
- });
-}
diff --git a/admin-web/src/services/pay.js b/admin-web/src/services/pay.js
deleted file mode 100644
index cb99c499c..000000000
--- a/admin-web/src/services/pay.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// Transaction
-
-export async function queryPayTransactionPage(params) {
- return request(`/pay-api/admins/transaction/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-// Refund
-
-export async function queryPayRefundPage(params) {
- return request(`/pay-api/admins/refund/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
diff --git a/admin-web/src/services/product.js b/admin-web/src/services/product.js
deleted file mode 100644
index 2236d74fc..000000000
--- a/admin-web/src/services/product.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// product category
-
-export async function productCategoryTree(params) {
- return request(`/product-api/admins/category/tree?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productCategoryAdd(params) {
- return request(`/product-api/admins/category/add?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productCategoryUpdate(params) {
- return request(`/product-api/admins/category/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productCategoryUpdateStatus(params) {
- return request(`/product-api/admins/category/update_status?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productCategoryDelete(params) {
- return request(`/product-api/admins/category/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-// product spu + sku
-
-export async function productSpuPage(params) {
- return request(`/product-api/admins/spu/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productSpuSearchList(params) {
- return request(`/product-api/admins/spu/search_list?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productSpuList(params) {
- return request(`/product-api/admins/spu/list?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productSpuAdd(params) {
- return request(`/product-api/admins/spu/add?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productSpuUpdate(params) {
- return request(`/product-api/admins/spu/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productSpuUpdateSort(params) {
- return request(`/product-api/admins/spu/update_sort?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productSpuInfo(params) {
- return request(`/product-api/admins/spu/info?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-// product attr + attr value
-
-export async function productAttrPage(params) {
- return request(`/product-api/admins/attr/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productAttrAdd(params) {
- return request(`/product-api/admins/attr/add?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productAttrUpdate(params) {
- return request(`/product-api/admins/attr/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productAttrUpdateStatus(params) {
- return request(`/product-api/admins/attr/update_status?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productAttrTree(params) {
- return request(`/product-api/admins/attr/tree?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productAttrValueUpdate(params) {
- return request(`/product-api/admins/attr_value/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productAttrValueUpdateStatus(params) {
- return request(`/product-api/admins/attr_value/update_status?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productAttrValueAdd(params) {
- return request(`/product-api/admins/attr_value/add?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-// product brand 2019-05-31
-
-export async function productBrandAdd(params) {
- return request(`/product-api/admins/brand/add?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productBrandUpdate(params) {
- return request(`/product-api/admins/brand/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function productBrandGet(params) {
- return request(`/product-api/admins/brand/get?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function productBrandPage(params) {
- return request(`/product-api/admins/brand/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
diff --git a/admin-web/src/services/promotion.js b/admin-web/src/services/promotion.js
deleted file mode 100644
index 81b6a003e..000000000
--- a/admin-web/src/services/promotion.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// banner
-
-export async function queryBanner(params) {
- return request(`/promotion-api/admins/banner/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function addBanner(params) {
- return request(`/promotion-api/admins/banner/add?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateBanner(params) {
- return request(`/promotion-api/admins/banner/update?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateBannerStatus(params) {
- return request(`/promotion-api/admins/banner/update_status?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function deleteBanner(params) {
- return request(`/promotion-api/admins/banner/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-// product recommend
-
-export async function queryProductRecommend(params) {
- return request(`/promotion-api/admins/product_recommend/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function addProductRecommend(params) {
- return request(`/promotion-api/admins/product_recommend/add?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateProductRecommend(params) {
- return request(`/promotion-api/admins/product_recommend/update?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateProductRecommendStatus(params) {
- return request(`/promotion-api/admins/product_recommend/update_status?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function deleteProductRecommend(params) {
- return request(`/promotion-api/admins/product_recommend/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-// coupon
-
-export async function getCouponCardTemplatePage(params) {
- return request(`/promotion-api/admins/coupon/template/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function addCouponCardTemplate(params) {
- return request(`/promotion-api/admins/coupon/template/add_card?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateCouponCardTemplate(params) {
- return request(`/promotion-api/admins/coupon/template/update_card?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateCouponCardTemplateStatus(params) {
- return request(`/promotion-api/admins/coupon/template/update_status?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-// Promotion Activity
-
-export async function getPromotionActivityPage(params) {
- return request(`/promotion-api/admins/promotion_activity/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
diff --git a/admin-web/src/services/sms.js b/admin-web/src/services/sms.js
deleted file mode 100644
index 7216143a5..000000000
--- a/admin-web/src/services/sms.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// sign
-
-export async function pageSign(params) {
- return request(`/admin-api/admins/sms/sign/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function addSign(params) {
- return request(`/admin-api/admins/sms/sign/add`, {
- method: 'POST',
- body: {
- ...params,
- },
- });
-}
-
-export async function updateSign(params) {
- return request(`/admin-api/admins/sms/sign/update`, {
- method: 'PUT',
- body: {
- ...params,
- },
- });
-}
-
-export async function deletedSign(params) {
- return request(`/admin-api/admins/sms/sign/deleted?${stringify(params)}`, {
- method: 'DELETE',
- });
-}
-
-// template
-
-export async function pageTemplate(params) {
- return request(`/admin-api/admins/sms/template/page`, {
- method: 'POST',
- body: {
- ...params,
- },
- });
-}
-
-export async function addTemplate(params) {
- return request(`/admin-api/admins/sms/template/add?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function updateTemplate(params) {
- return request(`/admin-api/admins/sms/template/update?${stringify(params)}`, {
- method: 'PUT',
- });
-}
-
-export async function deletedTemplate(params) {
- return request(`/admin-api/admins/sms/template/deleted?${stringify(params)}`, {
- method: 'DELETE',
- });
-}
diff --git a/admin-web/src/services/system.js b/admin-web/src/services/system.js
deleted file mode 100644
index b0b5ae026..000000000
--- a/admin-web/src/services/system.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import {stringify} from '@/utils/request.qs';
-import request from '@/utils/request';
-
-// ========== Passport 模块 ==========
-
-export async function passportLogin(params) {
- return request(`/management-api/passport/login?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-// ========== Authorization 模块 ==========
-
-export async function authorizationResourcePermissions(params) {
- return request(`/system-api/admins/authorization/resource-permissions`, {
- method: 'GET',
- });
-}
-
-export async function authorizationRoleResourceTree(params) {
- return request(`/system-api/admins/authorization/role_resource_tree?${stringify(params)}`, {
- method: 'GET',
- });
-}
-
-export async function authorizationRoleAssignResource(params) {
- return request(`/system-api/admins/authorization/assign_role_resource?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-// ========== Resource 模块 ==========
-
-export async function resourceTree(params) {
- return request(`/management-api/resource/tree`, {
- method: 'GET',
- });
-}
-
-export async function resourceCreate(params) {
- return request(`/management-api/resource/create?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function resourceUpdate(params) {
- return request(`/management-api/resource/update?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function resourceDelete(params) {
- return request(`/management-api/resource/delete?${stringify(params)}`, {
- method: 'POST',
- });
-}
-
-export async function resourceTreeAdminMenu() {
- return request('/management-api/resource/tree-admin-menu', {
- method: 'GET',
- });
-}
-
-// ========== Role 模块 ==========
-
-export async function rolePage(params) {
- return request(`/management-api/role/page?${stringify(params)}`);
-}
-
-export async function roleDelete(params) {
- return request(`/management-api/role/delete?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function roleCreate(params) {
- return request(`/management-api/role/create?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-export async function roleUpdate(params) {
- return request(`/management-api/role/update?${stringify(params)}`, {
- method: 'POST',
- body: {},
- });
-}
-
-// ========== Admin 模块 ==========
-
-export async function adminPage(params) {
- return request(`/management-api/admin/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
diff --git a/admin-web/src/services/user.js b/admin-web/src/services/user.js
deleted file mode 100644
index 2610164df..000000000
--- a/admin-web/src/services/user.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { stringify } from '@/utils/request.qs';
-import request from '@/utils/request';
-
-export async function query() {
- return request('/api/users');
-}
-
-export async function queryCurrent() {
- return request('/api/currentUser');
-}
-
-// User
-
-export async function queryUserPage(params) {
- return request(`/user-api/admins/user/page?${stringify(params)}`, {
- method: 'GET',
- });
-}
diff --git a/admin-web/src/utils/Authorized.js b/admin-web/src/utils/Authorized.js
deleted file mode 100644
index 8c420cbaa..000000000
--- a/admin-web/src/utils/Authorized.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import RenderAuthorized from '@/components/Authorized';
-import { getAuthority } from './authority';
-
-let Authorized = RenderAuthorized(getAuthority()); // eslint-disable-line
-
-// Reload the rights component
-const reloadAuthorized = () => {
- Authorized = RenderAuthorized(getAuthority());
-};
-
-export { reloadAuthorized };
-export default Authorized;
diff --git a/admin-web/src/utils/Yuan.js b/admin-web/src/utils/Yuan.js
deleted file mode 100644
index 434a57fb7..000000000
--- a/admin-web/src/utils/Yuan.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import { yuan } from '@/components/Charts';
-/**
- * 减少使用 dangerouslySetInnerHTML
- */
-export default class Yuan extends React.PureComponent {
- componentDidMount() {
- this.rendertoHtml();
- }
-
- componentDidUpdate() {
- this.rendertoHtml();
- }
-
- rendertoHtml = () => {
- const { children } = this.props;
- if (this.main) {
- this.main.innerHTML = yuan(children);
- }
- };
-
- render() {
- return (
- {
- this.main = ref;
- }}
- />
- );
- }
-}
diff --git a/admin-web/src/utils/authority.js b/admin-web/src/utils/authority.js
deleted file mode 100644
index 3d2e7b349..000000000
--- a/admin-web/src/utils/authority.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// use localStorage to store the authority info, which might be sent from server in actual project.
-export function getAuthority(str) {
- // return localStorage.getItem('antd-pro-authority') || ['admin', 'user'];
- const authorityString =
- typeof str === 'undefined' ? localStorage.getItem('antd-pro-authority') : str;
- // authorityString could be admin, "admin", ["admin"]
- let authority;
- try {
- authority = JSON.parse(authorityString);
- } catch (e) {
- authority = authorityString;
- }
- if (typeof authority === 'string') {
- return [authority];
- }
- return authority || ['admin'];
-}
-
-export function setAuthority(authority) {
- const proAuthority = typeof authority === 'string' ? [authority] : authority;
- return localStorage.setItem('antd-pro-authority', JSON.stringify(proAuthority));
-}
diff --git a/admin-web/src/utils/authority.test.js b/admin-web/src/utils/authority.test.js
deleted file mode 100644
index 8a6cd41f3..000000000
--- a/admin-web/src/utils/authority.test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { getAuthority } from './authority';
-
-describe('getAuthority should be strong', () => {
- it('empty', () => {
- expect(getAuthority(null)).toEqual(['admin']); // default value
- });
- it('string', () => {
- expect(getAuthority('admin')).toEqual(['admin']);
- });
- it('array with double quotes', () => {
- expect(getAuthority('"admin"')).toEqual(['admin']);
- });
- it('array with single item', () => {
- expect(getAuthority('["admin"]')).toEqual(['admin']);
- });
- it('array with multiple items', () => {
- expect(getAuthority('["admin", "guest"]')).toEqual(['admin', 'guest']);
- });
-});
diff --git a/admin-web/src/utils/cache.js b/admin-web/src/utils/cache.js
deleted file mode 100644
index 65b238a00..000000000
--- a/admin-web/src/utils/cache.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* eslint-disable */
-
-// localStorage 操作
-
-const cacheKeys = {
- ACCESS_TOKEN: 'accessToken',
- REFRESH_TOKEN: 'refreshToken',
-};
-
-///
-/// 设置 loginToken，分为 accessToken 和 refreshToken
-
-export function setLoginToken(accessToken, refreshToken) {
- setLocalStorage(cacheKeys.ACCESS_TOKEN, accessToken);
- setLocalStorage(cacheKeys.REFRESH_TOKEN, refreshToken);
-}
-
-export function getLoginToken() {
- const res = {};
- res[cacheKeys.ACCESS_TOKEN] = getLocalStorage(cacheKeys.ACCESS_TOKEN);
- res[cacheKeys.REFRESH_TOKEN] = getLocalStorage(cacheKeys.REFRESH_TOKEN);
- return res;
-}
-
-
-
-///
-/// 设置 localStorage 公共方法
-
-function setLocalStorage(key, value) {
- try {
- localStorage.setItem(key, value);
- } catch (e) {
- throw new Error(`localStorage 设置错误! ${e}`);
- }
-}
-
-function getLocalStorage(key) {
- try {
- return localStorage.getItem(key);
- } catch (e) {
- throw new Error(`localStorage 获取错误! ${e}`);
- }
-}
-
-function removeLocalStorage(key) {
- try {
- localStorage.removeItem(key);
- } catch (e) {
- throw new Error(`localStorage 设置错误! ${e}`);
- }
-}
diff --git a/admin-web/src/utils/dictionary.js b/admin-web/src/utils/dictionary.js
deleted file mode 100644
index f4460d880..000000000
--- a/admin-web/src/utils/dictionary.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// 字典定义
-
-const DictionaryConstants = {
- GENDER: 'gender',
- ORDER_STATUS: 'order_status',
- ORDER_CANCEL_REASONS: 'order_cancel_reasons',
- LOGISTICS_COMPANY: 'logistics_company',
-
- // order return
- ORDER_RETURN_STATUS: 'order_return_status',
- ORDER_RETURN_REASON: 'order_return_reason',
- ORDER_RETURN_SERVICE_TYPE: 'order_return_service_type',
-
- // sms
- SMS_TYPE: 'sms_type',
- SMS_PLATFORM: 'sms_platform',
- SMS_APPLY_STATUS: 'sms_apply_status',
-};
-
-export default DictionaryConstants;
diff --git a/admin-web/src/utils/getPageTitle.js b/admin-web/src/utils/getPageTitle.js
deleted file mode 100644
index 0dd1e6207..000000000
--- a/admin-web/src/utils/getPageTitle.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { formatMessage } from 'umi/locale';
-import pathToRegexp from 'path-to-regexp';
-import isEqual from 'lodash/isEqual';
-import memoizeOne from 'memoize-one';
-import { menu, title } from '../defaultSettings';
-
-export const matchParamsPath = (pathname, breadcrumbNameMap) => {
- const pathKey = Object.keys(breadcrumbNameMap).find(key => pathToRegexp(key).test(pathname));
- return breadcrumbNameMap[pathKey];
-};
-
-const getPageTitle = (pathname, breadcrumbNameMap) => {
- const currRouterData = matchParamsPath(pathname, breadcrumbNameMap);
- if (!currRouterData) {
- return title;
- }
- const pageName = menu.disableLocal
- ? currRouterData.name
- : formatMessage({
- id: currRouterData.locale || currRouterData.name,
- defaultMessage: currRouterData.name,
- });
-
- return `${pageName} - ${title}`;
-};
-
-export default memoizeOne(getPageTitle, isEqual);
diff --git a/admin-web/src/utils/request.js b/admin-web/src/utils/request.js
deleted file mode 100644
index c37056d3d..000000000
--- a/admin-web/src/utils/request.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import fetch from 'dva/fetch';
-import { notification } from 'antd';
-import router from 'umi/router';
-import hash from 'hash.js';
-import { isAntdPro } from './utils';
-import { getLoginToken } from './cache';
-import { setAuthority } from './authority';
-
-const codeMessage = {
- 200: '服务器成功返回请求的数据。',
- 201: '新建或修改数据成功。',
- 202: '一个请求已经进入后台排队（异步任务）。',
- 204: '删除数据成功。',
- 400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
- 401: '用户没有权限（令牌、用户名、密码错误）。',
- 403: '用户得到授权，但是访问是被禁止的。',
- 404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
- 406: '请求的格式不可得。',
- 410: '请求的资源被永久删除，且不会再得到的。',
- 422: '当创建一个对象时，发生一个验证错误。',
- 500: '服务器发生错误，请检查服务器。',
- 502: '网关错误。',
- 503: '服务不可用，服务器暂时过载或维护。',
- 504: '网关超时。',
-};
-
-// 需要调整 login 界面的 code
-const redirectLoginCode = {
- 1002001011: '访问令牌不存在',
- 1002001012: '访问令牌已过期',
- 1002001013: '访问令牌已失效',
- 1002001015: '账号未登陆',
-};
-
-function checkStatus(response) {
- if (response.status >= 200 && response.status < 300) {
- return response;
- }
- const errortext = codeMessage[response.status] || response.statusText;
- notification.warning({
- message: `请求错误 ${response.status}: ${response.url}`,
- description: errortext,
- });
-
- const error = new Error(errortext);
- error.name = response.status;
- error.response = response;
- throw error;
-}
-
-function checkCode(result) {
- if (result.code === undefined || result.code === 0) {
- return result;
- }
- notification.warning({
- message: `请求错误 ${result.code}`,
- description: result.message,
- });
-
- // 重定向到登录界面
- if (redirectLoginCode[result.code]) {
- setAuthority('');
- window.location.reload();
- }
-
- const error = new Error(result.message);
- error.result = result;
- throw error;
-}
-
-const cachedSave = (response, hashcode) => {
- /**
- * Clone a response data and store it in sessionStorage
- * Does not support data other than json, Cache only json
- */
- const contentType = response.headers.get('Content-Type');
- if (contentType && contentType.match(/application\/json/i)) {
- // All data is saved as text
- response
- .clone()
- .text()
- .then(content => {
- sessionStorage.setItem(hashcode, content);
- sessionStorage.setItem(`${hashcode}:timestamp`, Date.now());
- });
- }
- return response;
-};
-
-/**
- * Requests a URL, returning a promise.
- *
- * @param {string} url The URL we want to request
- * @param {object} [option] The options we want to pass to "fetch"
- * @return {object} An object containing either "data" or "err"
- */
-export default function request(url, option) {
- const options = {
- expirys: isAntdPro(),
- ...option,
- };
- /**
- * Produce fingerprints based on url and parameters
- * Maybe url has the same parameters
- */
- const fingerprint = url + (options.body ? JSON.stringify(options.body) : '');
- const hashcode = hash
- .sha256()
- .update(fingerprint)
- .digest('hex');
-
- const defaultOptions = {
- credentials: 'include',
- };
-
- const newOptions = { ...defaultOptions, ...options };
- if (
- newOptions.method === 'POST' ||
- newOptions.method === 'PUT' ||
- newOptions.method === 'DELETE'
- ) {
- if (!(newOptions.body instanceof FormData)) {
- newOptions.headers = {
- Accept: 'application/json',
- 'Content-Type': 'application/json; charset=utf-8',
- ...newOptions.headers,
- };
- newOptions.body = JSON.stringify(newOptions.body);
- } else {
- // newOptions.body is FormData
- newOptions.headers = {
- Accept: 'application/json',
- ...newOptions.headers,
- };
- }
- }
-
- // 将登陆的 accessToken 放到 header
- const loginToken = getLoginToken();
- if (loginToken && loginToken.accessToken
- && url.indexOf('/management-api/passport/login') === -1) { // TODO 芋艿，临时这么加，可能不是很优雅
- const headers = {
- ...newOptions.headers,
- Authorization: `Bearer ${loginToken.accessToken}`,
- };
- newOptions.headers = headers;
- }
-
- const expirys = options.expirys && 60;
- // options.expirys !== false, return the cache,
- if (options.expirys !== false) {
- const cached = sessionStorage.getItem(hashcode);
- const whenCached = sessionStorage.getItem(`${hashcode}:timestamp`);
- if (cached !== null && whenCached !== null) {
- const age = (Date.now() - whenCached) / 1000;
- if (age < expirys) {
- const response = new Response(new Blob([cached]));
- return response.json();
- }
- sessionStorage.removeItem(hashcode);
- sessionStorage.removeItem(`${hashcode}:timestamp`);
- }
- }
- return fetch(url, newOptions)
- .then(checkStatus)
- .then(response => cachedSave(response, hashcode))
- .then(response => {
- // DELETE and 204 do not return data by default
- // using .json will report an error.
- if (newOptions.method === 'DELETE' || response.status === 204) {
- return response.text();
- }
- return response.json();
- })
- .then(checkCode)
- .catch(e => {
- const status = e.name;
- if (status === 401) {
- // @HACK
- /* eslint-disable no-underscore-dangle */
- window.g_app._store.dispatch({
- type: 'login/logout',
- });
- return;
- }
- // environment should not be used
- if (status === 403) {
- router.push('/exception/403');
- return;
- }
- if (status <= 504 && status >= 500) {
- router.push('/exception/500');
- return;
- }
- if (status >= 404 && status < 422) {
- router.push('/exception/404');
- }
- });
-}
diff --git a/admin-web/src/utils/request.qs.js b/admin-web/src/utils/request.qs.js
deleted file mode 100644
index 2d277eb35..000000000
--- a/admin-web/src/utils/request.qs.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* eslint-disable */
-import qs from 'qs';
-
-/**
- * 过滤字符串为 '' 直接不传了
- *
- * @param params
- */
-function filterEmptyStr(params) {
- function filterObject(object) {
- const res = {};
- for (const key in object) {
- const val = object[key];
- if (
- new String(val).length > 0 &&
- val !== undefined &&
- val !== 'undefined' &&
- val !== null &&
- val !== 'null'
- ) {
- res[key] = val;
- }
- }
- return res;
- }
-
- if (typeof params === 'object') {
- return filterObject(params);
- } else if (params instanceof Array) {
- let res = [];
- for (const object in params) {
- res.push(filterObject(params));
- }
- }
-}
-
-export function arrayToStringParams(array) {
- let res = '';
- for (let i = 0; i < array.length; i++) {
- res += array[i];
- if (i < array.length - 1) {
- res += ',';
- }
- }
- return res;
-}
-
-export function stringify(params) {
- return qs.stringify(filterEmptyStr(params));
-}
-
-export default {
- ...qs,
- stringify,
-};
diff --git a/admin-web/src/utils/tree.utils.js b/admin-web/src/utils/tree.utils.js
deleted file mode 100644
index 179e2f5f3..000000000
--- a/admin-web/src/utils/tree.utils.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// tree 工具
-
-export function buildTreeNode(nodes, titleKey, nodeKey) {
- return nodes.map(item => {
- const res = {};
- if (item.children) {
- res.children = buildTreeNode(item.children, titleKey, nodeKey);
- }
- // res.title = `${item.id}-${item[titleKey]}`;
- res.title = `${item[titleKey]}`;
- res.key = item[nodeKey];
- return res;
- });
-}
-
-// @primary
-function findNodes(id, nodes) {
- const res = [];
- for (let i = 0; i < nodes.length; i += 1) {
- const node = nodes[i];
- if (node.key === id) {
- res.push(node.key);
- break;
- } else if (node.children) {
- const childNodes = findNodes(id, node.children);
- for (let j = 0; j < childNodes.length; j += 1) {
- res.push(childNodes[j]);
- }
- }
- }
- return res;
-}
-
-export function findAllNodes(resourceIds, nodes) {
- console.log('resourceIds', resourceIds);
-
- const findNodesArray = [];
- for (let i = 0; i < resourceIds.length; i += 1) {
- const findNodesData = findNodes(resourceIds[i], nodes);
- console.log('findNodesData', findNodesData);
- if (findNodesData) {
- for (let j = 0; j < findNodesData.length; j += 1) {
- const jD = findNodesData[j];
- if (findNodesArray.indexOf(jD) === -1) {
- findNodesArray.push(jD);
- }
- }
- }
- }
- return findNodesArray;
-}
-
-export function findCheckedKeys(nodes) {
- let res = [];
- for (let i = 0; i < nodes.length; i += 1) {
- const node = nodes[i];
- if (node.children) {
- const findChildrenNodes = findCheckedKeys(node.children);
- if (findChildrenNodes) {
- res = res.concat(findChildrenNodes);
- }
- } else if (node.assigned === true) {
- res.push(node.id);
- }
- }
- return res;
-}
diff --git a/admin-web/src/utils/utils.js b/admin-web/src/utils/utils.js
deleted file mode 100644
index 7531af679..000000000
--- a/admin-web/src/utils/utils.js
+++ /dev/null
@@ -1,194 +0,0 @@
-import moment from 'moment';
-import React from 'react';
-import nzh from 'nzh/cn';
-import { parse, stringify } from 'qs';
-
-export function fixedZero(val) {
- return val * 1 < 10 ? `0${val}` : val;
-}
-
-export function getTimeDistance(type) {
- const now = new Date();
- const oneDay = 1000 * 60 * 60 * 24;
-
- if (type === 'today') {
- now.setHours(0);
- now.setMinutes(0);
- now.setSeconds(0);
- return [moment(now), moment(now.getTime() + (oneDay - 1000))];
- }
-
- if (type === 'week') {
- let day = now.getDay();
- now.setHours(0);
- now.setMinutes(0);
- now.setSeconds(0);
-
- if (day === 0) {
- day = 6;
- } else {
- day -= 1;
- }
-
- const beginTime = now.getTime() - day * oneDay;
-
- return [moment(beginTime), moment(beginTime + (7 * oneDay - 1000))];
- }
-
- if (type === 'month') {
- const year = now.getFullYear();
- const month = now.getMonth();
- const nextDate = moment(now).add(1, 'months');
- const nextYear = nextDate.year();
- const nextMonth = nextDate.month();
-
- return [
- moment(`${year}-${fixedZero(month + 1)}-01 00:00:00`),
- moment(moment(`${nextYear}-${fixedZero(nextMonth + 1)}-01 00:00:00`).valueOf() - 1000),
- ];
- }
-
- const year = now.getFullYear();
- return [moment(`${year}-01-01 00:00:00`), moment(`${year}-12-31 23:59:59`)];
-}
-
-export function getPlainNode(nodeList, parentPath = '') {
- const arr = [];
- nodeList.forEach(node => {
- const item = node;
- item.path = `${parentPath}/${item.path || ''}`.replace(/\/+/g, '/');
- item.exact = true;
- if (item.children && !item.component) {
- arr.push(...getPlainNode(item.children, item.path));
- } else {
- if (item.children && item.component) {
- item.exact = false;
- }
- arr.push(item);
- }
- });
- return arr;
-}
-
-export function digitUppercase(n) {
- return nzh.toMoney(n);
-}
-
-function getRelation(str1, str2) {
- if (str1 === str2) {
- console.warn('Two path are equal!'); // eslint-disable-line
- }
- const arr1 = str1.split('/');
- const arr2 = str2.split('/');
- if (arr2.every((item, index) => item === arr1[index])) {
- return 1;
- }
- if (arr1.every((item, index) => item === arr2[index])) {
- return 2;
- }
- return 3;
-}
-
-function getRenderArr(routes) {
- let renderArr = [];
- renderArr.push(routes[0]);
- for (let i = 1; i < routes.length; i += 1) {
- // 去重
- renderArr = renderArr.filter(item => getRelation(item, routes[i]) !== 1);
- // 是否包含
- const isAdd = renderArr.every(item => getRelation(item, routes[i]) === 3);
- if (isAdd) {
- renderArr.push(routes[i]);
- }
- }
- return renderArr;
-}
-
-/**
- * Get router routing configuration
- * { path:{name,...param}}=>Array<{name,path ...param}>
- * @param {string} path
- * @param {routerData} routerData
- */
-export function getRoutes(path, routerData) {
- let routes = Object.keys(routerData).filter(
- routePath => routePath.indexOf(path) === 0 && routePath !== path
- );
- // Replace path to '' eg. path='user' /user/name => name
- routes = routes.map(item => item.replace(path, ''));
- // Get the route to be rendered to remove the deep rendering
- const renderArr = getRenderArr(routes);
- // Conversion and stitching parameters
- const renderRoutes = renderArr.map(item => {
- const exact = !routes.some(route => route !== item && getRelation(route, item) === 1);
- return {
- exact,
- ...routerData[`${path}${item}`],
- key: `${path}${item}`,
- path: `${path}${item}`,
- };
- });
- return renderRoutes;
-}
-
-export function getPageQuery() {
- return parse(window.location.href.split('?')[1]);
-}
-
-export function getQueryPath(path = '', query = {}) {
- const search = stringify(query);
- if (search.length) {
- return `${path}?${search}`;
- }
- return path;
-}
-
-/* eslint no-useless-escape:0 */
-const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
-
-export function isUrl(path) {
- return reg.test(path);
-}
-
-export function formatWan(val) {
- const v = val * 1;
- if (!v || Number.isNaN(v)) return '';
-
- let result = val;
- if (val > 10000) {
- result = Math.floor(val / 10000);
- result = (
-
- {result}
-
- 万
-
-
- );
- }
- return result;
-}
-
-// 给官方演示站点用，用于关闭真实开发环境不需要使用的特性
-export function isAntdPro() {
- return window.location.hostname === 'preview.pro.ant.design';
-}
-
-export const importCDN = (url, name) =>
- new Promise(resolve => {
- const dom = document.createElement('script');
- dom.src = url;
- dom.type = 'text/javascript';
- dom.onload = () => {
- resolve(window[name]);
- };
- document.head.appendChild(dom);
- });
diff --git a/admin-web/src/utils/utils.less b/admin-web/src/utils/utils.less
deleted file mode 100644
index 7be54ba58..000000000
--- a/admin-web/src/utils/utils.less
+++ /dev/null
@@ -1,50 +0,0 @@
-.textOverflow() {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- word-break: break-all;
-}
-
-.textOverflowMulti(@line: 3, @bg: #fff) {
- position: relative;
- max-height: @line * 1.5em;
- margin-right: -1em;
- padding-right: 1em;
- overflow: hidden;
- line-height: 1.5em;
- text-align: justify;
- &::before {
- position: absolute;
- right: 14px;
- bottom: 0;
- padding: 0 1px;
- background: @bg;
- content: '...';
- }
- &::after {
- position: absolute;
- right: 14px;
- width: 1em;
- height: 1em;
- margin-top: 0.2em;
- background: white;
- content: '';
- }
-}
-
-// mixins for clearfix
-// ------------------------
-.clearfix() {
- zoom: 1;
- &::before,
- &::after {
- content: ' ';
- display: table;
- }
- &::after {
- clear: both;
- height: 0;
- font-size: 0;
- visibility: hidden;
- }
-}
diff --git a/admin-web/src/utils/utils.test.js b/admin-web/src/utils/utils.test.js
deleted file mode 100644
index c97d32546..000000000
--- a/admin-web/src/utils/utils.test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { fixedZero, isUrl } from './utils';
-
-describe('fixedZero tests', () => {
- it('should not pad large numbers', () => {
- expect(fixedZero(10)).toEqual(10);
- expect(fixedZero(11)).toEqual(11);
- expect(fixedZero(15)).toEqual(15);
- expect(fixedZero(20)).toEqual(20);
- expect(fixedZero(100)).toEqual(100);
- expect(fixedZero(1000)).toEqual(1000);
- });
-
- it('should pad single digit numbers and return them as string', () => {
- expect(fixedZero(0)).toEqual('00');
- expect(fixedZero(1)).toEqual('01');
- expect(fixedZero(2)).toEqual('02');
- expect(fixedZero(3)).toEqual('03');
- expect(fixedZero(4)).toEqual('04');
- expect(fixedZero(5)).toEqual('05');
- expect(fixedZero(6)).toEqual('06');
- expect(fixedZero(7)).toEqual('07');
- expect(fixedZero(8)).toEqual('08');
- expect(fixedZero(9)).toEqual('09');
- });
-});
-
-describe('isUrl tests', () => {
- it('should return false for invalid and corner case inputs', () => {
- expect(isUrl([])).toBeFalsy();
- expect(isUrl({})).toBeFalsy();
- expect(isUrl(false)).toBeFalsy();
- expect(isUrl(true)).toBeFalsy();
- expect(isUrl(NaN)).toBeFalsy();
- expect(isUrl(null)).toBeFalsy();
- expect(isUrl(undefined)).toBeFalsy();
- expect(isUrl()).toBeFalsy();
- expect(isUrl('')).toBeFalsy();
- });
-
- it('should return false for invalid URLs', () => {
- expect(isUrl('foo')).toBeFalsy();
- expect(isUrl('bar')).toBeFalsy();
- expect(isUrl('bar/test')).toBeFalsy();
- expect(isUrl('http:/example.com/')).toBeFalsy();
- expect(isUrl('ttp://example.com/')).toBeFalsy();
- });
-
- it('should return true for valid URLs', () => {
- expect(isUrl('http://example.com/')).toBeTruthy();
- expect(isUrl('https://example.com/')).toBeTruthy();
- expect(isUrl('http://example.com/test/123')).toBeTruthy();
- expect(isUrl('https://example.com/test/123')).toBeTruthy();
- expect(isUrl('http://example.com/test/123?foo=bar')).toBeTruthy();
- expect(isUrl('https://example.com/test/123?foo=bar')).toBeTruthy();
- expect(isUrl('http://www.example.com/')).toBeTruthy();
- expect(isUrl('https://www.example.com/')).toBeTruthy();
- expect(isUrl('http://www.example.com/test/123')).toBeTruthy();
- expect(isUrl('https://www.example.com/test/123')).toBeTruthy();
- expect(isUrl('http://www.example.com/test/123?foo=bar')).toBeTruthy();
- expect(isUrl('https://www.example.com/test/123?foo=bar')).toBeTruthy();
- });
-});
diff --git a/admin-web/tests/run-tests.js b/admin-web/tests/run-tests.js
deleted file mode 100644
index 5735ada46..000000000
--- a/admin-web/tests/run-tests.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* eslint-disable no-console */
-const { spawn } = require('child_process');
-const { kill } = require('cross-port-killer');
-
-const env = Object.create(process.env);
-env.BROWSER = 'none';
-env.TEST = true;
-// flag to prevent multiple test
-let once = false;
-
-const startServer = spawn(/^win/.test(process.platform) ? 'npm.cmd' : 'npm', ['start'], {
- env,
-});
-
-startServer.stderr.on('data', data => {
- // eslint-disable-next-line
- console.log(data.toString());
-});
-
-startServer.on('exit', () => {
- kill(process.env.PORT || 8000);
-});
-
-console.log('Starting development server for e2e tests...');
-startServer.stdout.on('data', data => {
- console.log(data.toString());
- // hack code , wait umi
- if (
- (!once && data.toString().indexOf('Compiled successfully') >= 0) ||
- data.toString().indexOf('Theme generated successfully') >= 0
- ) {
- // eslint-disable-next-line
- once = true;
- console.log('Development server is started, ready to run tests.');
- const testCmd = spawn(
- /^win/.test(process.platform) ? 'npm.cmd' : 'npm',
- ['test', '--', '--maxWorkers=1', '--runInBand'],
- {
- stdio: 'inherit',
- }
- );
- testCmd.on('exit', code => {
- startServer.kill();
- process.exit(code);
- });
- }
-});
diff --git a/admin-web/tsconfig.json b/admin-web/tsconfig.json
deleted file mode 100644
index 5be308311..000000000
--- a/admin-web/tsconfig.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "compilerOptions": {
- "outDir": "build/dist",
- "module": "esnext",
- "target": "es2016",
- "lib": ["es6", "dom"],
- "sourceMap": true,
- "baseUrl": ".",
- "jsx": "react",
- "allowSyntheticDefaultImports": true,
- "moduleResolution": "node",
- "rootDirs": ["/src", "/test", "/mock","./typings"],
- "forceConsistentCasingInFileNames": true,
- "noImplicitReturns": true,
- "suppressImplicitAnyIndexErrors": true,
- "noUnusedLocals": true,
- "allowJs": true,
- "experimentalDecorators": true,
- "paths": {
- "@/*": ["./src/*"]
- }
- },
- "include": ["./src"],
- "exclude": [
- "node_modules",
- "build",
- "scripts",
- "acceptance-tests",
- "webpack",
- "jest",
- "src/setupTests.ts",
- "tslint:latest",
- "tslint-config-prettier"
- ]
-}
diff --git a/admin-web/tslint.json b/admin-web/tslint.json
deleted file mode 100644
index 125e217e4..000000000
--- a/admin-web/tslint.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": ["tslint:latest", "tslint-react", "tslint-config-prettier"],
- "rules": {
- "no-var-requires": false,
- "no-submodule-imports": false,
- "object-literal-sort-keys": false,
- "jsx-no-lambda": false,
- "no-implicit-dependencies": false,
- "no-console": false
- }
-}
diff --git a/admin-web/笔记 b/admin-web/笔记
deleted file mode 100644
index 23b4ec1a7..000000000
--- a/admin-web/笔记
+++ /dev/null
@@ -1,4 +0,0 @@
-
-登陆账号
-admin
-nicai
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/AdminController.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/AdminController.java
index e65d7d461..4332c56f7 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/AdminController.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/AdminController.java
@@ -32,8 +32,6 @@ public class AdminController {
@Autowired
private AdminManager adminManager;
- // =========== 管理员管理 API ===========
-
@ApiOperation(value = "管理员分页")
@GetMapping("/page")
@RequiresPermissions("system.admin.page")
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.http b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.http
index 0788782d3..44d32866e 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.http
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.http
@@ -39,4 +39,9 @@ GET {{baseUrl}}/resource/tree-admin-menu
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
+### /resource/list-admin-permission 成功
+GET {{baseUrl}}/resource/list-admin-permission
+Content-Type: application/x-www-form-urlencoded
+Authorization: Bearer {{accessToken}}
+
###
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.java
index b598184de..404163191 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/ResourceController.java
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
+import java.util.Set;
import static cn.iocoder.common.framework.vo.CommonResult.success;
@@ -72,10 +73,18 @@ public class ResourceController {
return success(resourceManager.treeResource());
}
+ // =========== 当前管理员相关 API ===========
+
@GetMapping("/tree-admin-menu")
@ApiOperation("获得当前登陆的管理员的菜单树")
public CommonResult> treeAdminMenu() {
return success(resourceManager.treeAdminMenu(AdminSecurityContextHolder.getAdminId()));
}
+ @GetMapping("/list-admin-permission")
+ @ApiOperation("获得当前登陆的管理员的权限列表")
+ public CommonResult> listAdminPermission() {
+ return success(resourceManager.listAdminPermission(AdminSecurityContextHolder.getAdminId()));
+ }
+
}
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceCreateDTO.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceCreateDTO.java
index 4bf6175ae..987b8e2a7 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceCreateDTO.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceCreateDTO.java
@@ -32,5 +32,7 @@ public class ResourceCreateDTO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
+ @ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
+ private String view;
}
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceUpdateDTO.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceUpdateDTO.java
index fce22ec82..c4f368802 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceUpdateDTO.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/dto/ResourceUpdateDTO.java
@@ -35,5 +35,7 @@ public class ResourceUpdateDTO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
+ @ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
+ private String view;
}
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/AdminMenuTreeNodeVO.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/AdminMenuTreeNodeVO.java
index a08dff77e..7ac663d40 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/AdminMenuTreeNodeVO.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/AdminMenuTreeNodeVO.java
@@ -20,6 +20,8 @@ public class AdminMenuTreeNodeVO {
private String route;
@ApiModelProperty(value = "菜单图标", required = true, example = "user")
private String icon;
+ @ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
+ private String view;
@ApiModelProperty(value = "父级资源编号", required = true, example = "1", notes = "如果无父资源，则值为 0")
private Integer pid;
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceTreeNodeVO.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceTreeNodeVO.java
index d33c730ee..6be673b6a 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceTreeNodeVO.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceTreeNodeVO.java
@@ -37,6 +37,8 @@ public class ResourceTreeNodeVO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
+ @ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
+ private String view;
@ApiModelProperty(value = "添加时间", required = true)
private Date createTime;
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceVO.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceVO.java
index f2f133dcc..ab1cf1b55 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceVO.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/vo/ResourceVO.java
@@ -35,6 +35,8 @@ public class ResourceVO {
private String route;
@ApiModelProperty(value = "菜单图标", example = "add")
private String icon;
+ @ApiModelProperty(value = "前端界面", example = "@/views/example/edit")
+ private String view;
@ApiModelProperty(value = "添加时间", required = true)
private Date createTime;
diff --git a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java
index 9058d9250..c9ad9e5b8 100644
--- a/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java
+++ b/management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/permission/ResourceManager.java
@@ -111,9 +111,9 @@ public class ResourceManager {
CommonResult> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId);
listAdminRoleIdsResult.checkError();
if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) {
- return null;
+ return Collections.emptyList();
}
- // 获得角色拥有的资源列表
+ // 获得角色拥有的资源（菜单）列表
CommonResult> resourceVOResult = resourceRpc.listRoleResource(
listAdminRoleIdsResult.getData(), ResourceTypeEnum.MENU.getType());
resourceVOResult.checkError();
@@ -164,4 +164,24 @@ public class ResourceManager {
return treeNodeMap.values().stream().filter(node -> node.getPid().equals(ResourceIdEnum.ROOT.getId())).collect(Collectors.toList());
}
+ /**
+ * 获得指定管理员的权限列表
+ *
+ * @param adminId 管理员编号
+ * @return 权限列表
+ */
+ public Set listAdminPermission(Integer adminId) {
+ // 获得管理员拥有的角色编号列表
+ CommonResult> listAdminRoleIdsResult = roleRpc.listAdminRoleIds(adminId);
+ listAdminRoleIdsResult.checkError();
+ if (CollectionUtils.isEmpty(listAdminRoleIdsResult.getData())) {
+ return Collections.emptySet();
+ }
+ // 获得角色拥有的资源列表
+ CommonResult> resourceVOResult = resourceRpc.listRoleResource(
+ listAdminRoleIdsResult.getData(), null);
+ resourceVOResult.checkError();
+ return CollectionUtils.convertSet(resourceVOResult.getData(), cn.iocoder.mall.systemservice.rpc.permission.vo.ResourceVO::getPermission);
+ }
+
}
diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceCreateDTO.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceCreateDTO.java
index 3d1903b3d..dbe688c72 100644
--- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceCreateDTO.java
+++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceCreateDTO.java
@@ -49,6 +49,10 @@ public class ResourceCreateDTO implements Serializable {
* 菜单图标
*/
private String icon;
+ /**
+ * 前端界面
+ */
+ private String view;
/**
* 创建管理员编号
diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceUpdateDTO.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceUpdateDTO.java
index e7f4e0918..71f02457c 100644
--- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceUpdateDTO.java
+++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/dto/ResourceUpdateDTO.java
@@ -54,5 +54,9 @@ public class ResourceUpdateDTO implements Serializable {
* 菜单图标
*/
private String icon;
+ /**
+ * 前端界面
+ */
+ private String view;
}
diff --git a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/vo/ResourceVO.java b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/vo/ResourceVO.java
index 31e8db829..d6601d136 100644
--- a/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/vo/ResourceVO.java
+++ b/system-service-project/system-service-api/src/main/java/cn/iocoder/mall/systemservice/rpc/permission/vo/ResourceVO.java
@@ -45,6 +45,10 @@ public class ResourceVO implements Serializable {
* 菜单图标
*/
private String icon;
+ /**
+ * 前端界面
+ */
+ private String view;
/**
* 添加时间
*/
diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/dataobject/permission/ResourceDO.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/dataobject/permission/ResourceDO.java
index 2999c4a3e..a46265a5a 100644
--- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/dataobject/permission/ResourceDO.java
+++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/dataobject/permission/ResourceDO.java
@@ -64,6 +64,13 @@ public class ResourceDO extends DeletableDO {
* 目前当且仅当资源类型为 {@link ResourceTypeEnum#MENU} 时，才会生效
*/
private String icon;
+ /**
+ * 前端界面
+ * 例如说，vue 框架下的 component 对应的 view 页面。
+ *
+ * 目前当且仅当资源类型为 {@link ResourceTypeEnum#MENU} 时，才会生效
+ */
+ private String view;
/**
* 创建管理员编号
diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceBO.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceBO.java
index 5e622b7bc..736069c89 100644
--- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceBO.java
+++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceBO.java
@@ -41,6 +41,10 @@ public class ResourceBO {
* 菜单图标
*/
private String icon;
+ /**
+ * 前端界面
+ */
+ private String view;
/**
* 添加时间
*/
diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceCreateBO.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceCreateBO.java
index 333882547..fd1d3cc26 100644
--- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceCreateBO.java
+++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceCreateBO.java
@@ -48,6 +48,10 @@ public class ResourceCreateBO {
* 菜单图标
*/
private String icon;
+ /**
+ * 前端界面
+ */
+ private String view;
/**
* 创建管理员编号
diff --git a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceUpdateBO.java b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceUpdateBO.java
index f0fe9d14b..03486d44c 100644
--- a/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceUpdateBO.java
+++ b/system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/permission/bo/ResourceUpdateBO.java
@@ -50,5 +50,9 @@ public class ResourceUpdateBO {
* 菜单图标
*/
private String icon;
+ /**
+ * 前端界面
+ */
+ private String view;
}
快速开始
- 
产品简介
- 
产品文档
-