Merge pull request #8 from vipshop/develop

v0.15.6
vipshop · Sep 6, 2019 · a3dab0a · a3dab0a
2 parents b0a26fa + 57d5646
commit a3dab0a
Show file tree

Hide file tree

Showing 74 changed files with 851 additions and 398 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-<p align="center"><img width="140" src="https://h5rsc.vipstatic.com/ams/ams-logo.png" alt="AMS logo"></p>
+<p align="center"><a href="https://vipshop.github.io/ams/" target="_blank" rel="noopener noreferrer"><img width="140" src="https://h5rsc.vipstatic.com/ams/ams-logo.png" alt="AMS logo"></a></p>
 
 ## AMS
 
-> AMS (Admin Materials System)，管理后台物料系统。
+> AMS (admin materiel system)，管理后台物料系统。
 
 AMS是基于 [Vue.js](https://github.com/vuejs/vue) 和 [Element组件库](https://github.com/ElemeFE/element)、通过JSON配置来快速搭建管理后台的一整套解决方案
 

diff --git a/docs/package.json b/docs/package.json
@@ -2,15 +2,14 @@
  "name": "ams-docs",
  "scripts": {
  "dev": "npm i && vuepress dev zh-CN",
- "build": "npm i && vuepress build zh-CN"
+ "build": "npm i && npm update @ams-team/ams && vuepress build zh-CN"
  },
  "private": true,
  "dependencies": {
- "@ams-team/ams": "latest",
- "@ams/block-ams-config": "latest",
- "@ams/block-calendar": "latest",
- "@ams/block-chart": "latest",
- "@ams/json-stringify": "latest",
+ "@ams-team/ams": "^0.15.6",
+ "@ams-team/block-ams-config": "latest",
+ "@ams-team/block-chart": "latest",
+ "@ams-team/json-stringify": "latest",
  "element-ui": "^2.11.1",
  "highlight.js": "^9.15.9",
  "js-beautify": "^1.10.0",

diff --git a/docs/zh-CN/.vuepress/components/block/card/demo.vue b/docs/zh-CN/.vuepress/components/block/card/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/collapse/demo.vue b/docs/zh-CN/.vuepress/components/block/collapse/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/component/demo.vue b/docs/zh-CN/.vuepress/components/block/component/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/dialog/demo.vue b/docs/zh-CN/.vuepress/components/block/dialog/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/dropdown/demo.vue b/docs/zh-CN/.vuepress/components/block/dropdown/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/error/demo.vue b/docs/zh-CN/.vuepress/components/block/error/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/form/demo.vue b/docs/zh-CN/.vuepress/components/block/form/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/grid/demo.vue b/docs/zh-CN/.vuepress/components/block/grid/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/list/block.js b/docs/zh-CN/.vuepress/components/block/list/block.js
@@ -140,6 +140,36 @@ export default {
  init: '@list'
  }
  },
+ simulatePagesList: {
+ type: 'list',
+ resource: {
+ api: {
+ prefix: 'https://easy-mock.com/mock/5a0023effbbb09615044cb82/',
+ list: 'list-pagination'
+ },
+ fields: {
+ 'id': {
+ 'type': 'text',
+ 'label': 'ID'
+ },
+ 'title': {
+ 'type': 'text',
+ 'label': '标题'
+ },
+ 'content': {
+ 'type': 'textarea',
+ 'label': '内容'
+ }
+ }
+ },
+ events: {
+ init: '@list'
+ },
+ pageSize: 10,
+ props: {
+ pagination: 'simulate' // 模拟分页
+ }
+ },
  filtersList: {
  type: 'list',
  resource: {

diff --git a/docs/zh-CN/.vuepress/components/block/list/demo.vue b/docs/zh-CN/.vuepress/components/block/list/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/router/demo.vue b/docs/zh-CN/.vuepress/components/block/router/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/steps/demo.vue b/docs/zh-CN/.vuepress/components/block/steps/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/table/demo.vue b/docs/zh-CN/.vuepress/components/block/table/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/tabs/demo.vue b/docs/zh-CN/.vuepress/components/block/tabs/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/block/title/demo.vue b/docs/zh-CN/.vuepress/components/block/title/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/changelog/logs.js b/docs/zh-CN/.vuepress/components/changelog/logs.js
@@ -1,5 +1,15 @@
 // 更新日志
 export default [
+ {
+ version: '0.14.x',
+ date: '2019.08.29',
+ log: [
+ 'feat: field-image 在 view 状态增加大图预览',
+ 'feat: block-list 增加前端分页 pagination: "simulate"',
+ 'fix: field-image 默认图片列表内容比较多时加上滚动条',
+ 'fix: block-form 在校验失败时弹出失败信息'
+ ]
+ },
  {
  version: '0.13.0',
  date: '2019.08.21',

diff --git a/docs/zh-CN/.vuepress/components/demo/start.vue b/docs/zh-CN/.vuepress/components/demo/start.vue
@@ -15,7 +15,7 @@
 
 <script>
 import demoMixins from './demo-mixin'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/entry.js b/docs/zh-CN/.vuepress/components/entry.js
@@ -17,15 +17,15 @@ import javascript from 'highlight.js/lib/languages/javascript';
 import 'highlight.js/styles/tomorrow-night-eighties.css';
 
 // 定制field
-// import editor from '@ams/field-editor';
-// import markdown from '@ams/field-markdown';
+// import editor from '@ams-team/field-editor';
+// import markdown from '@ams-team/field-markdown';
 
 // 定制block
-// import tag from '@ams/field-tag';
-import calendar from '@ams/block-calendar';
-// import card from '@ams/block-card';
-import chart from '@ams/block-chart';
-import amsConfig from '@ams/block-ams-config';
+// import tag from '@ams-team/field-tag';
+// import calendar from '@ams-team/block-calendar';
+// import card from '@ams-team/block-card';
+import chart from '@ams-team/block-chart';
+import amsConfig from '@ams-team/block-ams-config';
 
 Vue.use(ElementUI);
 Vue.use(ams);
@@ -38,7 +38,7 @@ console.log('ams init config');
 
 // 定制block
 // Vue.use(tag);
-Vue.use(calendar);
+// Vue.use(calendar);
 // Vue.use(card);
 Vue.use(chart);
 Vue.use(amsConfig);

diff --git a/docs/zh-CN/.vuepress/components/field/image/block.js b/docs/zh-CN/.vuepress/components/field/image/block.js
@@ -54,13 +54,13 @@ export default {
  type: 'image',
  tip: '范围240-640',
  successUrlKey: 'url',
- // check: { maxSizeInKB, imgMaxWidth, imgMaxHeight, imgMinWidth, imgMinHeight, imgWidth, imgHeight },
  check: {
  imgMaxWidth: 640,
  imgMaxHeight: 640,
  imgMinWidth: 240,
  imgMinHeight: 240,
  },
+ default: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
  props: {
  action: 'https://easy-mock.com/mock/5a0023effbbb09615044cb82/upload-image'
  }
@@ -75,8 +75,7 @@ export default {
  imgHeight: 640
  },
  props: {
- action:
- 'https://easy-mock.com/mock/5a0023effbbb09615044cb82/upload-image'
+ action: 'https://easy-mock.com/mock/5a0023effbbb09615044cb82/upload-image'
  }
  },
  image5: {
@@ -86,8 +85,7 @@ export default {
  successUrlKey: 'url',
  props: {
  accept: 'image/png',
- action:
- 'https://easy-mock.com/mock/5a0023effbbb09615044cb82/upload-image'
+ action: 'https://easy-mock.com/mock/5a0023effbbb09615044cb82/upload-image'
  }
  }
  }
@@ -170,5 +168,31 @@ export default {
  }
  },
  ctx: 'edit'
+ },
+ imageField5: {
+ type: 'form',
+ resource: {
+ fields: {
+ image1: {
+ label: '大图预览',
+ type: 'image'
+ },
+ image2: {
+ label: '预览列表',
+ type: 'image',
+ props: {
+ 'preview-src-list': [
+ 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
+ ]
+ }
+ }
+ }
+ },
+ ctx: 'view',
+ data: {
+ image1: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ image2: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
+ }
  }
 };
diff --git a/docs/zh-CN/.vuepress/components/field/image/demo.vue b/docs/zh-CN/.vuepress/components/field/image/demo.vue
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {

diff --git a/docs/zh-CN/.vuepress/components/try/demo-spa/demo.vue b/docs/zh-CN/.vuepress/components/try/demo-spa/demo.vue
@@ -1,5 +1,5 @@
 <template>
- <el-card shadow="hover" class="demo demo-card">
+ <el-card shadow="hover" class="demo demo-card demo-spa">
  <ams-block v-if="init" :name="blockName" class="demo-card-preview"/>
  <div :class="`demo-card-config ${showConfig ? 'open': ''}`">
  <highlight-code lang="javascript">
@@ -16,7 +16,7 @@
 <script>
 import demoMixins from '../../demo/demo-mixin'
 import block from './block'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 
 export default {
@@ -41,10 +41,10 @@ export default {
 }
 </script>
 <style>
-div.demo:nth-last-of-type(1) {
+div.demo-spa:nth-last-of-type(1) {
  z-index: 1;
 }
-div.demo:nth-last-of-type(2) {
+div.demo-spa:nth-last-of-type(2) {
  z-index: 2;
 }
 .ams-block-router .sidebar-container {

diff --git a/docs/zh-CN/.vuepress/components/try/demo-try.vue b/docs/zh-CN/.vuepress/components/try/demo-try.vue
@@ -134,7 +134,7 @@
 <script>
 import ams from '@ams-team/ams'
 import '../entry'
-import stringify from '@ams/json-stringify'
+import stringify from '@ams-team/json-stringify'
 import beautify from 'js-beautify'
 import _ from 'lodash'
 import templates from './config.js'

diff --git a/docs/zh-CN/.vuepress/components/utils/convert/config.js b/docs/zh-CN/.vuepress/components/utils/convert/config.js
@@ -169,7 +169,7 @@ export default {
  })
  })
  const res = await this.$ams.request({
- url: 'http://w3cmark.com/getBayes',
+ url: 'http://vip.com/getBayes',
  method: 'post',
  data: { data: JSON.stringify(arr) },
  withCredentials: false

diff --git a/docs/zh-CN/.vuepress/config.js b/docs/zh-CN/.vuepress/config.js
@@ -12,13 +12,6 @@ module.exports = {
  plugins: [
  'flowchart'
  ],
- configureWebpack: {
- resolve: {
- alias: {
- "@ams/ams": "@ams-team/ams"
- }
- }
- }, //设置别名
  themeConfig: {
  // lastUpdated: '最后更新',
  nav: [
@@ -27,7 +20,7 @@ module.exports = {
  { text: '区块', link: '/block/' },
  { text: '市场', link: '/market/' },
  {
- text: '0.13.0',
+ text: '0.14.0',
  items: [
  {
  text: '更新日志',