upgrade scaffold government-management-admin to @alifd/next (#1290)

upgrade scaffold  government-management-admin to @alifd/next

react-materials/scaffolds/ice-government-management-admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icedesign/government-management-admin",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "该模板内置了丰富的区块，适用于政府类风格的管理类系统，使用时需要根据需求进行删除和添加",
   "homepage": "https://unpkg.com/@icedesign/government-management-admin@latest/build/index.html",
   "files": [
@@ -14,18 +14,19 @@
     ".eslintrc"
   ],
   "dependencies": {
+    "@alifd/next": "^1.x",
+    "@alifd/theme-1": "^0.0.6",
     "@antv/data-set": "^0.9.6",
-    "@icedesign/base": "^0.2.5",
-    "@icedesign/container": "^0.1.4",
-    "@icedesign/form-binder": "^0.1.7",
-    "@icedesign/icon": "^0.1.1",
-    "@icedesign/img": "^0.1.0",
-    "@icedesign/layout": "^0.1.0",
-    "@icedesign/menu": "^0.1.0",
-    "@icedesign/skin": "^0.1.0",
+    "@icedesign/container": "^1.x",
+    "@icedesign/form-binder": "^1.x",
+    "@icedesign/foundation-symbol": "^1.0.0",
+    "@icedesign/img": "^1.x",
+    "@icedesign/label": "^1.x",
+    "@icedesign/layout": "^1.x",
+    "@icedesign/theme": "^0.1.0",
     "bizcharts": "^3.2.4",
     "classnames": "^2.2.5",
-    "foundation-symbol": "^0.1.0",
+    "moment": "^2.23.0",
     "prop-types": "^15.5.8",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
@@ -51,16 +52,13 @@
     "access": "public"
   },
   "buildConfig": {
-    "theme": "@icedesign/skin",
+    "theme": "@alifd/theme-1",
     "entry": "src/index.js",
     "localization": false,
     "output": {
       "publicPath": "./"
     }
   },
-  "themeConfig": {
-    "primaryColor": "#447eff"
-  },
   "scaffoldConfig": {
     "builder": "ice-scripts",
     "name": "ice-government-management-admin",

react-materials/scaffolds/ice-government-management-admin/src/components/ContainerTitle/index.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button } from '@icedesign/base';
+import { Button } from '@alifd/next';
 
 const ContainerTitle = ({ title, style, ...props }) => {
   return (
     <div style={{ ...styles.container, ...style }}>
       <h3 style={styles.title}>{title}</h3>
       {props.buttonText ? (
-        <Button type="primary" size="large">
+        <Button type="primary"  >
           {props.buttonText}
         </Button>
       ) : null}

react-materials/scaffolds/ice-government-management-admin/src/components/TopBar/index.js

@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Button, Icon } from '@icedesign/base';
+import { Button, Icon } from '@alifd/next';
 import PropTypes from 'prop-types';
 
 export default class TopBar extends PureComponent {
@@ -12,7 +12,7 @@ export default class TopBar extends PureComponent {
 
         {extraAfter || (
           <div style={styles.buttons}>
-            <Button size="large" type="primary">
+            <Button   type="primary">
               <Icon type="add" size="xs" style={styles.addIcon} />
               {buttonText}
             </Button>

react-materials/scaffolds/ice-government-management-admin/src/index.js

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom';
 // 载入默认全局样式 normalize 、.clearfix 和一些 mixin 方法等
-import '@icedesign/base/reset.scss';
+import '@alifd/next/reset.scss';
 import router from './router';
 
 const ICE_CONTAINER = document.getElementById('ice-container');

react-materials/scaffolds/ice-government-management-admin/src/layouts/BasicLayout/components/Aside/index.js

@@ -1,12 +1,12 @@
 /* eslint no-undef:0, no-unused-expressions:0, array-callback-return:0 */
 import React, { Component } from 'react';
-import Menu, { Item as MenuItem } from '@icedesign/menu';
+import { Nav } from '@alifd/next';
+import Icon from '@icedesign/foundation-symbol';
 import { withRouter, Link } from 'react-router-dom';
-import FoundationSymbol from 'foundation-symbol';
 import { asideMenuConfig } from '../../../../menuConfig';
+const {Item} = Nav;
 
-import './index.scss';
-
+import styleNames from './index.module.scss';
 @withRouter
 export default class BasicLayout extends Component {
   static propTypes = {};
@@ -23,28 +23,24 @@ export default class BasicLayout extends Component {
     const { pathname } = location;
 
     return (
-      <div className="ice-aside-custom">
-        <div className="ice-aside-logo">LOGO</div>
-        <Menu
-          mode="inline"
-          selectedKeys={[pathname]}
-          className="ice-menu-custom"
-        >
+      <div className={styleNames.iceAsideCustom}>
+        <div className={styleNames.iceAsideLogo}>LOGO</div>
+        <Nav
+          className={styleNames.iceNav}
+          selectedKeys={[pathname]}>
           {Array.isArray(asideMenuConfig) &&
             asideMenuConfig.length > 0 &&
             asideMenuConfig.map((nav) => {
               return (
-                <MenuItem key={nav.path}>
-                  <Link to={nav.path} className="ice-menu-link">
-                    {nav.icon ? (
-                      <FoundationSymbol size="small" type={nav.icon} />
-                    ) : null}
-                    <span className="ice-menu-item-text">{nav.name}</span>
+                <Item key={nav.path}>
+                  <Link to={nav.path} >
+                    {nav.icon ? <Icon size="small" type={nav.icon}/> : null}
+                    <span className={styleNames.iceMenuLinkText}>{nav.name}</span>
                   </Link>
-                </MenuItem>
+                </Item>
               );
             })}
-        </Menu>
+        </Nav>
       </div>
     );
   }

react-materials/scaffolds/ice-government-management-admin/src/layouts/BasicLayout/components/Aside/index.module.scss

@@ -0,0 +1,32 @@
+
+.iceNav {
+  box-shadow: none !important;
+}
+.iceAsideCustom {
+  height: 100%;
+  padding-top: 10px;
+  box-shadow: 4px 1px 12px transparentize($color-brand1-6, 0.9);
+  width: 240px;
+}
+.iceAsideLogo {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20px;
+  font-size: 36px;
+  font-weight: bold;
+  color: $color-brand1-6
+}
+.iceNavItem {
+  height: auto;
+  line-height: normal;
+}
+.iceMenuLink {
+  display: flex;
+  padding: 15px 0;
+  color: $color-text1-3;
+}
+
+.iceMenuLinkText {
+  padding-left: 1em;
+}

react-materials/scaffolds/ice-government-management-admin/src/layouts/BasicLayout/components/Footer/index.js

@@ -3,7 +3,7 @@ import Layout from '@icedesign/layout';
 import cx from 'classnames';
 import Logo from '../Logo';
 
-import './index.scss';
+import styleNames from './index.module.scss';
 
 export default class Footer extends PureComponent {
   render() {
@@ -16,16 +16,16 @@ export default class Footer extends PureComponent {
           lineHeight: '36px',
         }}
       >
-        <div className="ice-design-layout-footer-body">
+        <div className={styleNames.iceDesignLayoutFooterBody}>
           <div style={{ filter: 'grayscale(100%)', opacity: 0.3 }}>
             <Logo style={{ color: '#666' }} />
           </div>
-          <div className="copyright">
+          <div className={styleNames.copyright}>
             © 2018 Theme designed by{' '}
             <a
               href="https://github.com/alibaba/ice"
               target="_blank"
-              className="copyright-link"
+              className={styleNames.copyrightLink}
               rel="noopener noreferrer"
             >
               ICE

react-materials/scaffolds/ice-government-management-admin/src/layouts/BasicLayout/components/Footer/index.module.scss

@@ -0,0 +1,24 @@
+:global {
+  .ice-design-layout-footer {
+    background-color: transparent;
+  }
+}
+
+.iceDesignLayoutFooterBody {
+  width: 100%;
+  margin: 20px auto 0;
+  padding: 0 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+}
+.copyright {
+  color: #666;
+  line-height: 1.5;
+  font-size: 12px;
+  text-align: left;
+}
+.copyrightLink {
+  color: #666;
+}