Skip to content

Commit

Permalink
feat: 模板升级组件依赖 @icedesign/base -> @alifd/next (#1296)
Browse files Browse the repository at this point in the history 
* chore: for new mr

* upgrade ice-contract-management-admin to alifd/next (#1305)

* feat: mod pkgjson

* feat: mod header and aside

* feat: mod style

* feat: mod userlayout

* feat: mod my contract

* Chore contract scaffold (#1309)

* chore: 优化模板

* chore: 去除注释

* chore: 优化路由写法

* chore: 格式化组件目录结构

* Upgrade ice-design-cms to fusion design (#1312)

Upgrade ice-design-cms to fusion design

* upgrade ice-application-management-admin to fusion design (#1302)

upgrade ice-application-management-admin to fusion design

* upgrade ice-creator-admin to @alifd/next (#1300)

upgrade ice-creator-admin to @alifd/next

* upgrade ice-library-management-admin to fusion design (#1308)

upgrade ice-library-management-admin to fusion design

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

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

* upgrade ice-usertrack-admin to fusion design (#1303)

upgrade ice-usertrack-admin to fusion design

* upgrade ice-voice-chat-admin to fusion design (#1310)

upgrade ice-voice-chat-admin to fusion design

* upgrade ice algorithm model admin to fusion design (#1304)

* feat: mod pkgjson

* feat: mod layout

* feat: finish ice-algorithm-model-admin

* upgrade ice-operation-admin to @alifd/next (#1297)

* temp: mod pkgjson

* feat: mod pkgjson

* feat: replace @icedesign/base

* feat: mod in admin

* feat: mod basic style

* feat: mod font style

* temp: fix a deprcated

* temp: mod code stlye

* feat: update reviews-admin to v2 (#1317)

* ice-asset-management-admin 升级基础组件 (#1318)

* feat: 重构样式

* chore: 样式调整

* chore: merge master

* feat: upgrade v2 (#1316)

* feat: upgrade material-dashboard to fusion desgin (#1363)

* feat: upgrade create-react-app to fusion design (#1362)

* feat: upgrade coreui admin to fusion design (#1361)

* feat: upgrade template to fusion design (#1359)

* upgrade light-bootstrap-dashboard to fusion design (#1356)

* feat: upgrade light bootsrap to fusion design

* fix:  style error

* upgrade ice-task-management-admin to fusion design (#1351)

* feat: upgrade pkgjson

* feat: mod layout stlye

* feat: finish task management

* feat: mod login style

* upgrade ice-customer-analysis-admin to fusion-design (#1345)

* feat: mod pkgjson

* feat: mod layout style

* feat: finish analysis

* Feat: upgrade ice builder platform to fusion design (#1341)

* feat: mod pkgjson

* feat: mod builder page

* feat: finish ice-build-platform

* upgrade ice-design-schools to fusion design (#1342)

* feat: mod pkgjson

* feat: mod style value

* feat: finish design schools

* feat: upgrade @icedesign/universal-homepage-scaffold to fusion design (#1371)

* feat: upgrade open-platform-scaffold to fusion design (#1370)

* feat: upgrade to fusion design (#1369)

* feat: upgrade ice-web-homepage to fusion design (#1367)

* feat: upgrade scroll homepage to fusion design (#1366)

* feat: upgrade yunqi page to  fusion design (#1365)

* update scaffold to @alifd/next (#1372)

* chore: replace components

* fix: icon

* fix: nav hover

* fix: ice-design-lite

* fix: ice-design-pro to @alifd/next

* fix: all pages of ice-design-pro

* .

* chore: ice-design-ecommerce to @alifd/next

* fix: update ice-monitor-dashboard to @alifd/next

* fix: update ice-design-pro form

* feat: upgrade to  fusion design (#1368)

* Feat: upgrade ice-commodity-admin to fusion design (#1382)

* feat: mod pkgjson

* feat: upgrade pages to fusion design

* Feat: upgrade ice-hr-admin to fusion design (#1381)

* feat: upgrade pkgjson  to @alifd/next

* feat: upgrade @icedesign/hr-management-admin-scaffold to fusion design

* feat: upgrade @icedesign/dashboard-scaffold to fusion design (#1380)

* chore: delete ice-design-hospital scaffold

* chore: scaffold review

* chore: review operation-admin

* chore: review design-dashboard

* chore: review homepage scaffolds

* chore: review hr-management-admin

* chore: review commodity-management-admin

* chore: review monitor-dashboard

* chore: review management-admin

* fix: Feedback.toast and Grid (#1384)

* feat: upgrade ice-order-management-admin to fusion design (#1386)

* feat: upgrade pkgjson

* feat: upgrade to fusion design

* feat: upgrade finance-dashboard (#1385)

* chore: review finance-dashboard

* chore: review application-management-admin

* chore: review cms admin

* chore: review voice-chat-admin

* chore: review contract-management-admin

* chore: review library-management-admin

* chore: review algorithm-model-admin

* chore: review usertrack-admin

* chore: review build-platfrom-admin

* chore: review school-admin

* add analysis-admin

* chore: review task-management-admin

* chore: review ecommerce admin

* chore: update version

* chore: review scaffold

* fix: tab 样式

* chore: eslint fix
  • Loading branch information
@imsobear
imsobear committed Jan 24, 2019
1 parent 94c4968 commit eae8b03
Show file tree
Hide file tree
Showing 1,007 changed files with 8,954 additions and 19,466 deletions.
10 changes: 6 additions & 4 deletions react-materials/scaffolds/create-react-app/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Create React App

This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).

Below you will find some information on how to perform common tasks.<br>
Expand Down Expand Up @@ -300,7 +302,7 @@ In the WebStorm menu `Run` select `Edit Configurations...`. Then click `+` and s
Start your app by running `npm start`, then press `^D` on macOS or `F9` on Windows and Linux or click the green debug icon to start debugging in WebStorm.

The same way you can debug your application in IntelliJ IDEA Ultimate, PhpStorm, PyCharm Pro, and RubyMine.
The same way you can debug your application in IntelliJ IDEA Ultimate, PhpStorm, PyCharm Pro, and RubyMine.

## Formatting Code Automatically

Expand Down Expand Up @@ -1675,7 +1677,7 @@ Use the following [`launch.json`](https://code.visualstudio.com/docs/editor/debu
"name": "Debug CRA Tests",
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"--runInBand",
Expand Down Expand Up @@ -1989,7 +1991,7 @@ If you’re using [Apache HTTP Server](https://httpd.apache.org/), you need to c
RewriteRule ^ index.html [QSA,L]
```
It will get copied to the `build` folder when you run `npm run build`.
It will get copied to the `build` folder when you run `npm run build`.
If you’re using [Apache Tomcat](http://tomcat.apache.org/), you need to follow [this Stack Overflow answer](https://stackoverflow.com/a/41249464/4878474).
Expand Down Expand Up @@ -2419,7 +2421,7 @@ To resolve this:
1. Open an issue on the dependency's issue tracker and ask that the package be published pre-compiled.
* Note: Create React App can consume both CommonJS and ES modules. For Node.js compatibility, it is recommended that the main entry point is CommonJS. However, they can optionally provide an ES module entry point with the `module` field in `package.json`. Note that **even if a library provides an ES Modules version, it should still precompile other ES6 features to ES5 if it intends to support older browsers**.

2. Fork the package and publish a corrected version yourself.
2. Fork the package and publish a corrected version yourself.

3. If the dependency is small enough, copy it to your `src/` folder and treat it as application code.

Expand Down
4 changes: 2 additions & 2 deletions react-materials/scaffolds/create-react-app/config-overrides.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ const rewireSass = require('./rewire-scss');

module.exports = function override(config) {
config = injectBabelPlugin(
['import', { libraryName: '@icedesign/base' }],
['import', { libraryName: '@alifd/next' }],
config
);

config.plugins.push(
new WebpackPluginImport([
{
libraryName: /^@icedesign\/base\/lib\/([^/]+)/,
libraryName: /^@alifd\/next\/lib\/([^/]+)/,
stylePath: 'style.js',
},
{
Expand Down
8 changes: 5 additions & 3 deletions react-materials/scaffolds/create-react-app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name": "@icedesign/scaffold-create-react-app",
"version": "0.1.6",
"version": "2.0.0",
"description": "该模板基于 create-react-app 创建，使用 react-app-rewired 进行自定义配置，支持按需引入 ICE 基础组件，添加区块，主要适用于 0 到 1 开始搭建项目",
"homepage": "https://alibaba.github.io/ice/scaffold-preview/create-react-app.html",
"dependencies": {
"@icedesign/skin": "^0.1.13",
"@alifd/next": "^1.x",
"@icedesign/theme": "^0.1.0",
"moment": "^2.23.0",
"react": "^16.2.0",
"react-dom": "^16.2.0"
},
Expand All @@ -28,7 +30,7 @@
"access": "public"
},
"buildConfig": {
"theme": "@icedesign/skin",
"theme": "@icedesign/theme",
"entry": "src/index.js"
},
"scaffoldConfig": {
Expand Down
34 changes: 22 additions & 12 deletions react-materials/scaffolds/create-react-app/rewire-scss.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@

/* eslint arrow-parens:0 */
const getRules = (config) =>
config.module.rules.find((rule) => Object.keys(rule).includes('oneOf')).oneOf;
const findFileLoaderRuleFn = (rule) =>
typeof rule.loader === 'string' && rule.loader.includes('file-loader');
const findStyleLoaderRuleFn = (rule) =>
rule.test.toString() === /\.css$/.toString();

const pkgJSON = require('./package.json');

function rewireSass(config, env, sassOptions = {}) {
// find the non-javascript ruleset in the webpack config
const rules = getRules(config);
Expand All @@ -25,30 +29,36 @@ function rewireSass(config, env, sassOptions = {}) {
// add regexes for scss files
styleLoaderRule.test = [...currentTests, /\.scss$/, /\.sass$/];

const theme = pkgJSON.buildConfig && pkgJSON.buildConfig.theme;
if (styleLoaderRule.loader) {
styleLoaderRule.loader.push({
loader: require.resolve('sass-loader'),
options: sassOptions,
});
styleLoaderRule.loader.push({
loader: require.resolve('ice-skin-loader'),
options: {
themeFile: require.resolve('@icedesign/skin'),
},
});

if (theme) {
styleLoaderRule.loader.push({
loader: require.resolve('ice-skin-loader'),
options: {
themeFile: require.resolve(`${theme}/variables.scss`),
},
});
}
}

if (styleLoaderRule.use) {
styleLoaderRule.use.push({
loader: require.resolve('sass-loader'),
options: sassOptions,
});
styleLoaderRule.use.push({
loader: require.resolve('ice-skin-loader'),
options: {
themeFile: require.resolve('@icedesign/skin'),
},
});
if (theme) {
styleLoaderRule.use.push({
loader: require.resolve('ice-skin-loader'),
options: {
themeFile: require.resolve(`${theme}/variables.scss`),
},
});
}
}

return config;
Expand Down
3 changes: 2 additions & 1 deletion react-materials/scaffolds/create-react-app/src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, { Component } from 'react';
import logo from './logo.svg';
import './App.css';
import './App.scss';

class App extends Component {
render() {
return (
<div className="App">

<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to React</h1>
Expand Down
3 changes: 2 additions & 1 deletion ...ls/scaffolds/create-react-app/src/App.css → ...s/scaffolds/create-react-app/src/App.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
background-color: #222;
height: 150px;
padding: 20px;
color: white;
color: $color-brand1-6;
}

.App-title {
Expand All @@ -20,6 +20,7 @@

.App-intro {
font-size: large;
color: $color-data1-3;
}

@keyframes App-logo-spin {
Expand Down
8 changes: 3 additions & 5 deletions react-materials/scaffolds/ice-algorithm-model-admin/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
- 通用组件: `src/components`
- 页面文件: `src/pages`

## 配色
## 主题包

- 主色：#447eff
- 功能主色：#5e83fb、#f7da47、#58ca9a、#ee706d
- 字体颜色：#333、#666
- @icedesign/theme

## 效果图

![screenshot](https://img.alicdn.com/tfs/TB1ZLbeyFzqK1RjSZFoXXbfcXXa-2872-1580.png)
![screenshot](https://img.alicdn.com/tfs/TB1R.aPDSzqK1RjSZFjXXblCFXa-2860-1580.png)
30 changes: 16 additions & 14 deletions react-materials/scaffolds/ice-algorithm-model-admin/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@icedesign/algorithm-model-admin-scaffold",
"version": "1.0.3",
"version": "2.0.0",
"description": "该模板适用于数据模型类的管理类后台，内置通用的介绍页和丰富的区块，使用时需要根据需求进行删除和添加",
"homepage": "https://unpkg.com/@icedesign/algorithm-model-admin-scaffold@latest/build/index.html",
"files": [
Expand All @@ -26,17 +26,18 @@
"access": "public"
},
"dependencies": {
"@alifd/next": "^1.x",
"@alifd/theme-1": "^0.0.6",
"@antv/data-set": "^0.9.6",
"@icedesign/base": "^0.2.0",
"@icedesign/container": "^0.1.4",
"@icedesign/form-binder": "^0.1.14",
"@icedesign/img": "^0.1.1",
"@icedesign/layout": "^0.1.2",
"@icedesign/menu": "^0.1.1",
"@icedesign/skin": "^0.1.0",
"@icedesign/container": "^1.x",
"@icedesign/form-binder": "^1.x",
"@icedesign/foundation-symbol": "^1.x",
"@icedesign/img": "^1.x",
"@icedesign/layout": "^1.x",
"@icedesign/theme": "^0.1.2",
"bizcharts": "^3.2.2",
"classnames": "^2.2.5",
"foundation-symbol": "^0.1.3",
"moment": "^2.23.0",
"prop-types": "^15.5.8",
"react": "^16.4.1",
"react-dom": "^16.4.1",
Expand All @@ -53,23 +54,24 @@
"ice-scripts": "^1.6.0-next.3"
},
"buildConfig": {
"theme": "@icedesign/skin",
"theme": "@icedesign/theme",
"entry": "src/index.js",
"localization": false,
"output": {
"publicPath": "./"
}
},
"themeConfig": {
"primaryColor": "#447eff"
},
"scaffoldConfig": {
"builder": "ice-scripts",
"name": "ice-algorithm-model-admin",
"title": "算法模型管理系统",
"categories": [
"行业领域"
],
"screenshot": "https://img.alicdn.com/tfs/TB1ZLbeyFzqK1RjSZFoXXbfcXXa-2872-1580.png"
"screenshot": "https://img.alicdn.com/tfs/TB1R.aPDSzqK1RjSZFjXXblCFXa-2860-1580.png",
"screenshots": [
"https://img.alicdn.com/tfs/TB1R.aPDSzqK1RjSZFjXXblCFXa-2860-1580.png",
"https://img.alicdn.com/tfs/TB1p1mTDQvoK1RjSZFNXXcxMVXa-2860-1580.png"
]
}
}
2 changes: 1 addition & 1 deletion ...-materials/scaffolds/ice-algorithm-model-admin/src/components/CustomTable/CustomTable.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { Table, Pagination } from '@icedesign/base';
import { Table, Pagination } from '@alifd/next';
import PropTypes from 'prop-types';
import './CustomTable.scss';

Expand Down
2 changes: 1 addition & 1 deletion react-materials/scaffolds/ice-algorithm-model-admin/src/index.js
View file
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
18 changes: 10 additions & 8 deletions .../scaffolds/ice-algorithm-model-admin/src/layouts/BasicLayout/components/Header/Header.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React, { Component } from 'react';
import { Link, withRouter } from 'react-router-dom';
import { Balloon, Icon } from '@icedesign/base';
import Menu, { SubMenu, Item as MenuItem } from '@icedesign/menu';
import FoundationSymbol from 'foundation-symbol';
import { Balloon, Icon, Nav } from '@alifd/next';
import FoundationSymbol from '@icedesign/foundation-symbol';
import IceImg from '@icedesign/img';
import headerMenuConfig from '../../../../menuConfig';
import Logo from '../Logo';
import './Header.scss';

const { SubNav: SubMenu, Item: MenuItem } = Nav;

@withRouter
export default class Header extends Component {
static propTypes = {};
Expand All @@ -27,12 +28,13 @@ export default class Header extends Component {
<div className="header-content">
<div className="header-navbar">
<Logo isDark />
<Menu
<Nav
className="header-navbar-menu"
onClick={this.handleNavClick}
selectedKeys={[pathname]}
defaultSelectedKeys={[pathname]}
mode="horizontal"
type="secondary"
direction="hoz"
>
{headerMenuConfig &&
headerMenuConfig.length > 0 &&
Expand Down Expand Up @@ -92,7 +94,7 @@ export default class Header extends Component {
{nav.icon ? (
<FoundationSymbol size="small" type={nav.icon} />
) : null}
{nav.name}
<span>{nav.name}</span>
</span>
</a>
</MenuItem>
Expand All @@ -106,13 +108,13 @@ export default class Header extends Component {
{nav.icon ? (
<FoundationSymbol size="small" type={nav.icon} />
) : null}
{nav.name}
<span>{nav.name}</span>
</span>
</Link>
</MenuItem>
);
})}
</Menu>
</Nav>
</div>

<Balloon
Expand Down
23 changes: 4 additions & 19 deletions ...scaffolds/ice-algorithm-model-admin/src/layouts/BasicLayout/components/Header/Header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
left: 0;
right: 0;
z-index: 999;
background: #447eff;
background: $color-brand1-6;
min-width: 1200px;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.1);
.header-content {
Expand All @@ -18,23 +18,9 @@
.header-navbar {
display: flex;
flex-direction: row;
.ice-menu {
background: transparent;
color: #fff;
.ice-menu-item-selected {
background: #3560d9;
color: #fff;
}
.ice-menu-submenu-title,
.ice-menu-item {
height: 62px;
line-height: 62px;
font-size: 14px;
&:hover,
a:hover {
color: #fff;
}
}

.header-navbar-menu {
box-shadow: none;
}
}

Expand All @@ -45,7 +31,6 @@

.user-department {
font-size: 12px;
color: #fff;
}

.ice-design-header-userpannel {
Expand Down
2 changes: 1 addition & 1 deletion ...als/scaffolds/ice-algorithm-model-admin/src/layouts/UserLayout/components/Header/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Icon } from '@icedesign/base';
import { Icon } from '@alifd/next';
import { Link } from 'react-router-dom';
import './index.scss';

Expand Down
2 changes: 1 addition & 1 deletion react-materials/scaffolds/ice-algorithm-model-admin/src/layouts/UserLayout/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { Switch, Route, Redirect } from 'react-router-dom';
import { Grid } from '@icedesign/base';
import { Grid } from '@alifd/next';
import Footer from './components/Footer';
import Intro from './components/Intro';
import routerData from '../../routerConfig';
Expand Down
Loading

0 comments on commit eae8b03

Please sign in to comment.