v0.18.4

vipshop · Oct 14, 2019 · a436026 · a436026
2 parents 0cf864f + b5c71b9
commit a436026
Show file tree

Hide file tree

Showing 180 changed files with 4,912 additions and 447 deletions.
diff --git a/build/bin/prebuild.js b/build/bin/prebuild.js
@@ -2,11 +2,20 @@
 
 let fs = require('fs');
 let path = require('path');
+let readlineSync = require('readline-sync');
+const { execSync } = require('child_process');
 
 let indexPath = path.resolve(__dirname, '../../src/index.js');
 let indexFile = fs.readFileSync(indexPath, 'utf8');
 let pkg = require('../../package.json');
 
 fs.writeFileSync(indexPath, indexFile.replace(/ams.version = '\d+\.\d+\.\d+';/, `ams.version = '${pkg.version}';`), 'utf8');
 
-console.log('update version success');
+console.log(`update version success, version is ${version}`);
+
+// 打包 theme-vipshop
+try {
+ execSync('cd ./packages/theme-vipshop && npm i && npm run build && cd ../../');
+} catch (error) {
+ console.error('打包 theme-vipshop 失败：' + error);
+}
diff --git a/build/webpack.common.js b/build/webpack.common.js
@@ -3,7 +3,7 @@ const webpack = require('webpack');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 const { VueLoaderPlugin } = require('vue-loader');
 const vueLoaderConfig = require('./vue-loader.conf');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 const config = require('./config');
 

diff --git a/build/webpack.conf.js b/build/webpack.conf.js
@@ -98,6 +98,18 @@ module.exports = {
  './lib/theme-default'
  ),
  destination: './dist/theme-default'
+ }, {
+ source: path.join(
+ process.cwd(),
+ './packages/theme-vipshop/lib'
+ ),
+ destination: './lib/theme-vipshop'
+ }, {
+ source: path.join(
+ process.cwd(),
+ './packages/theme-vipshop/lib'
+ ),
+ destination: './dist/theme-vipshop@' + pkg.version
  }],
  archive: [ // 将dist文件夹打包成ams.zip并放在dist目录
  {

diff --git a/docs/package.json b/docs/package.json
@@ -6,7 +6,7 @@
  },
  "private": true,
  "dependencies": {
- "@ams-team/ams": "latest",
+ "@ams-team/ams": "^0.15.11",
  "@ams-team/block-ams-config": "latest",
  "@ams-team/block-chart": "latest",
  "@ams-team/json-stringify": "latest",

diff --git a/docs/zh-CN/.vuepress/components/block/list/block.js b/docs/zh-CN/.vuepress/components/block/list/block.js
@@ -598,6 +598,53 @@ export default {
  }
  }
  },
+ suffixInfoList: {
+ type: 'list',
+ resource: {
+ api: {
+ prefix,
+ list: 'list-pagination'
+ },
+ fields: {
+ 'id': {
+ 'type': 'text',
+ 'label': 'ID'
+ },
+ 'title': {
+ 'type': 'text',
+ 'label': '标题',
+ props: {
+ // 'suffix-info': '我是提示', // 后缀提示
+ // 'suffix-info-warning': '我是提示warning', // 后缀警告提示
+ // 'suffix-info-danger': '我是提示danger' // 后缀错误提示
+ },
+ changeConfig(field, context) {
+ if (context) {
+ if (context.id === 2) {
+ field.props['suffix-info-warning'] = '我是提示warning';
+ } else if (context.id === 3) {
+ field.props['suffix-info-danger'] = '我是提示danger';
+ } else {
+ field.props['suffix-info'] = '我是提示';
+ }
+ }
+ return field;
+ }
+ },
+ 'content': {
+ 'type': 'textarea',
+ 'label': '内容'
+ }
+ }
+ },
+ events: {
+ init: '@list'
+ },
+ pageSize: 10,
+ props: {
+ pagination: 'simulate' // 模拟分页
+ }
+ },
  editList: {
  type: 'list',
  ctx: 'edit',