Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master)

* commit '9f6f1e0565d0aa8207826be28fea6757865e5912':
  更新readme
  无JIRA 去less.config.json路径改成和以前一样
  无jira任务,cache.getItem默认值返回null,不要undefined,同原来的结果
research/test
fay-李丰豪 1 year ago
parent
commit
a19f6a015b
  1. 5
      README
  2. 0
      packages/fineui/bi.lessconfig.json
  3. 0
      packages/fineui/jsy.lessconfig.json
  4. 2
      packages/fineui/src/core/structure/cache.js
  5. 2
      packages/fineui/webpack/webpack.common.js

5
README

@ -23,9 +23,12 @@ http://fanruan.design/doc.html?post=0169cf558d
`pnpm run build` `pnpm run build`
## 自定义less变量构建 ## 自定义less变量构建
```
cross-env LESS_CONFIG_PATH=your_less_config.json && pnpm build
```
## 构建自定义的css
``` ```
cd ./packages/fineui
cross-env LESS_CONFIG_PATH=your_less_config.json LESS_FILE_NAME=your_file_name pnpm --filter @fui/core webpack:css cross-env LESS_CONFIG_PATH=your_less_config.json LESS_FILE_NAME=your_file_name pnpm --filter @fui/core webpack:css
``` ```

0
packages/fineui/lessconfig/bi.lessconfig.json → packages/fineui/bi.lessconfig.json

0
packages/fineui/lessconfig/jsy.lessconfig.json → packages/fineui/jsy.lessconfig.json

2
packages/fineui/src/core/structure/cache.js

@ -13,7 +13,7 @@ export const Cache = {
return Cache._getKeyPrefix() + (key || ""); return Cache._getKeyPrefix() + (key || "");
}, },
getItem: function (key, opt = {}) { getItem: function (key, opt = {}) {
const { defaultValue, typeConversion } = opt; const { defaultValue = null, typeConversion } = opt;
const storageKey = Cache._generateKey(key); const storageKey = Cache._generateKey(key);
let value = localStorage.getItem(storageKey); let value = localStorage.getItem(storageKey);

2
packages/fineui/webpack/webpack.common.js

@ -14,7 +14,7 @@ let lessVariables = {};
if (process.env.LESS_CONFIG_PATH) { if (process.env.LESS_CONFIG_PATH) {
const lessConfigPath = path.isAbsolute(process.env.LESS_CONFIG_PATH) const lessConfigPath = path.isAbsolute(process.env.LESS_CONFIG_PATH)
? process.env.LESS_CONFIG_PATH ? process.env.LESS_CONFIG_PATH
: path.resolve(__dirname, process.env.LESS_CONFIG_PATH); : path.resolve(__dirname, "../", process.env.LESS_CONFIG_PATH);
lessVariables = fs.existsSync(lessConfigPath) ? require(lessConfigPath) || {} : {}; lessVariables = fs.existsSync(lessConfigPath) ? require(lessConfigPath) || {} : {};
} }

Loading…
Cancel
Save