Skip to content

Develop #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wuzebin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Develop #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6996c8
0.34.5
Oct 22, 2021
ab067f9
update doc
Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 44 additions & 8 deletions docs/zh-CN/.vuepress/components/changelog/logs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,54 @@
// 更新日志
export default [
{
version: '0.32.1',
date: '2020.06.03',
version: '0.34.5',
date: '2020.09.15',
log: [
'feat: block-mixin文件在created中，init和created生命周期调整',
'feat: array字段增加getShowState判断',
'feat: 新增timeline字段',
'feat: timeline的content支持html',
'feat: router增加tooltip配置',
'feat: tag(ams-plugin)增加后端参数',
'fix: field-tag(ams-plugin)的@clik自定义绑定事件',
]
},
{
version: '0.33.7',
date: '2020.08.06',
log: [
'feat: 点击 Logo，在首次重复路径后，将会刷新当前页面',
'feat: routerPush 在异常场景将异常信息 reject 出去',
'feat: Logo 点击跳转使用 AMS 封装的 routerPush',
'feat: 新增ams.configs.defaultBlockConfig配置，修复小问题',
'fix: 动态路由匹配和路由懒加载同时使用时报错',
'fix: 全局config.resource.api增加responseType',
'fix: ams.request修复从api的默认取值',
'fix: 修复list中获取headerSelected的时机',
'fix: 修复ams-init中的请求登录跳转问题',
'fix: 修复block-xlsx(ams-plugin)中数值为0的解析问题',
'fix: 修复init.js中过去materiel缺失问题',
'fix: Select 字段在远程搜索场景映射值错误',
]
},
{
version: '0.32.10',
date: '2020.07.30',
log: [
'feat: route配置支持componen',
'feat: 设置add/editDialogDrawer 默认为 append-to-body',
'feat: 添加addItemDrawer和editItemDrawer配置',
'feat: 点击删除的时候，显示弹窗进行二次确认',
'feat: text增加tooltip配置',
'feat: multiple的operation增加allowNoSelect配置',
'feat: list增加表头管理',
'fix: 修复表头管理设置后operation错乱，先请空触发渲染；增加缓存字段跟resource对比',
'fix: 修复远程搜索再设置了isInitEmpty:true情况下，设置额外传参报错问题',
'fix: 更改列表区块的total赋值逻辑'
'fix: 更改列表区块的total赋值逻辑',
'fix: 修复列表区块created时导致的渲染异常场景',
'fix: 修复ams.request读取config中api配置问题',
'fix: 修复list配置action的responseDataParse，导致search被清空问题',
'fix: 修复list区块在created阶段的异常',
'feat: select字段增加autoOptions配置',
'fix: 优化select字段增加autoOptions配置',
'fix: 修复图片放大时z-index导致的异常',
'fix: 修复对象字段内，子字段配置说明文案（desc）后重复渲染的问题',
'fix: 修复field-get-set中的对于file类型的判断',
]
},
{
Expand Down
30 changes: 28 additions & 2 deletions docs/zh-CN/version/cdn-script.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,33 @@

## AMS版本

[0.32.10](https://h5rsc.vipstatic.com/ams/ams@0.32.10.js)
[0.34.5](https://h5rsc.vipstatic.com/ams/ams@0.34.5.js)

[0.34.4](https://h5rsc.vipstatic.com/ams/ams@0.34.4.js)

[0.34.3](https://h5rsc.vipstatic.com/ams/ams@0.34.3.js)

[0.34.2](https://h5rsc.vipstatic.com/ams/ams@0.34.2.js)

[0.34.1](https://h5rsc.vipstatic.com/ams/ams@0.34.1.js)

[0.34.0](https://h5rsc.vipstatic.com/ams/ams@0.34.0.js)

[0.33.7](https://h5rsc.vipstatic.com/ams/ams@0.33.7.js)

[0.33.6](https://h5rsc.vipstatic.com/ams/ams@0.33.6.js)

[0.33.5](https://h5rsc.vipstatic.com/ams/ams@0.33.5.js)

[0.33.4](https://h5rsc.vipstatic.com/ams/ams@0.33.4.js)

[0.33.3](https://h5rsc.vipstatic.com/ams/ams@0.33.3.js)

[0.33.2](https://h5rsc.vipstatic.com/ams/ams@0.33.2.js)

[0.33.1](https://h5rsc.vipstatic.com/ams/ams@0.33.1.js)

[0.33.0](https://h5rsc.vipstatic.com/ams/ams@0.33.0.js)

[0.32.9](https://h5rsc.vipstatic.com/ams/ams@0.32.9.js)

Expand All @@ -26,7 +52,7 @@

[0.32.3](https://h5rsc.vipstatic.com/ams/ams@0.32.3.js)

[0.32.1](https://h5rsc.vipstatic.com/ams/ams@0.32.1.js)
[0.34.5](https://h5rsc.vipstatic.com/ams/ams@0.34.5.js)

[0.32.0](https://h5rsc.vipstatic.com/ams/ams@0.32.0.js)

Expand Down
91 changes: 91 additions & 0 deletions examples/router/src/ams-config/cases-block/list/list-tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import ams from '@ams-team/ams';

ams.block('list-tab', {
type: 'tabs',
options: {
'tabs-list1': '<i class="el-icon-date"></i> tab1标题',
'tabs-list2': '<i class="el-icon-date"></i> tab2标题'
},
data: {
active: ''
},
blocks: {
'tabs-list1': {
ctx: 'view',
type: 'list',
events: {
init: '@list'
},
resource: {
api: {
prefix: 'https://www.yournana.club/vipshop/',
list: 'list?page=1&pageSize=20&testText=a'
},
fields: {
id: {
type: 'textarea',
label: 'ID',
props: {
'class-name': 'drag-column'
}
},
testText: {
type: 'text',
label: '店铺'
}
}
},
data: {
list: [],
pageSize: 20,
pageSizes: [10, 20]
},
operations: {
multiSetHeader: {
type: 'button',
label: '设置'
}
}
},
'tabs-list2': {
ctx: 'view',
type: 'list',
events: {
init: '@list'
},
resource: {
api: {
prefix: 'https://www.yournana.club/vipshop/',
list: 'list?page=1&pageSize=20&testText=a'
},
fields: {
id: {
type: 'textarea',
label: 'ID',
props: {
'class-name': 'drag-column'
}
},
testText: {
type: 'text',
label: '店铺'
}
}
},
data: {
list: Array.from(Array(100), (v, k) => ({
id: k + 1,
testText: `标题${k + 1}`
})),
pageSize: 20,
pageSizes: [10, 20]
},
operations: {
multiSetHeader: {
type: 'button',
label: '设置'
}
}
}
}
});
78 changes: 78 additions & 0 deletions examples/router/src/ams-config/cases-block/timeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import ams from '@ams-team/ams';

ams.block('timeline', {
blocks: {
timeline1Title: {
type: 'title',
options: {
title: '基础用法'
}
},
timeline1Block: {
type: 'timeline',
props: {
reverse: true
},
data: [{
content: '活动按期开始，状态：<span class="el-tag el-tag--dark el-tag--mini el-tag--danger">异常<div>',
timestamp: '2018-04-15'
}, {
content: '通过审核',
timestamp: '2018-04-13'
}, {
content: '创建成功',
timestamp: '2018-04-11'
}],
operations: {
reverseSelect: {
slot: 'header',
type: 'field',
field: {
type: 'radio',
default: 1,
props: {
options: [
{ label: '正叙', value: 1 },
{ label: '倒叙', value: 0 }
]
}
}
}
},
actions: {
fieldChange({ path, value }) {
if (path === 'header.reverseSelect') {
this.block.props.reverse = Boolean(value);
}
}
}
},
timeline2Title: {
type: 'title',
options: {
title: '自定义节点'
}
},
timeline2Block: {
type: 'timeline',
data: [{
content: '支持使用图标',
timestamp: '2018-04-12 20:46',
size: 'large',
type: 'primary',
icon: 'el-icon-more'
}, {
content: '支持自定义颜色',
timestamp: '2018-04-03 20:46',
color: '#0bbd87'
}, {
content: '支持自定义尺寸',
timestamp: '2018-04-03 20:46',
size: 'large'
}, {
content: '默认样式的节点',
timestamp: '2018-04-03 20:46'
}]
}
}
});
4 changes: 1 addition & 3 deletions examples/router/src/ams-config/cases-field/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ ams.block('select', {
queryKey: 'requiredName',
labelKey: 'name',
params: {
params: {
a: 2
}
a: 2
},
isCache: false,
transform($field, data) {
Expand Down
4 changes: 3 additions & 1 deletion examples/router/src/ams-config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import './cases-block/list/list-pagination';
import './cases-block/list/list-drag';
import './cases-block/list/list-field-convert';
import './cases-block/list/list-simulate';
import './cases-block/list/list-tab';
import './cases-block/alert';
import './cases-block/calendar';
import './cases-block/dragimage';
Expand All @@ -71,4 +72,5 @@ import './cases-block/title';
import './cases-block/drawer';
import './cases-block/table';
import './cases-block/form/edit';
import './cases-block/form/view';
import './cases-block/form/view';
import './cases-block/timeline';
16 changes: 15 additions & 1 deletion examples/router/src/ams-config/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ams.block('router', {
}
},
router: {
// keepAlive: true, // 设置为true的话，所有菜单都会keepAlive
// mode: 'history',
// base: '/app/', // 要在history下才会发挥作用
// showMenu: false, // 隐藏所有菜单配置项，默认为true
Expand All @@ -47,7 +48,7 @@ ams.block('router', {
// textColor: '#bfcbd9', // 菜单的文字颜色（仅支持 hex 格式），默认值：#bfcbd9
// activeTextColor: '#409EFF', // 菜单的文字颜色（仅支持 hex 格式），默认值：#409EFF
// defaultBreadcrumb: false, // 默认为true，会把首个route作为默认首页加到所有面包屑，设置为false禁用此行为， 0.7.5+支持
// shwoBreadcrumb: false, // 默认为true，是否显示面包屑
// showBreadcrumb: false, // 默认为true，是否显示面包屑
routes: [
{
name: '首页',
Expand All @@ -57,6 +58,9 @@ ams.block('router', {
// redirect: '/list',
meta: {
icon: 'el-icon-menu'
},
tooltip: {
content: '首页提示文字'
}
},
{
Expand Down Expand Up @@ -232,6 +236,11 @@ ams.block('router', {
name: '前端分页',
path: 'list-simulate',
block: 'list-simulate'
},
{
name: 'tab中的list',
path: 'list-tab',
block: 'list-tab'
}
]
},
Expand Down Expand Up @@ -369,6 +378,11 @@ ams.block('router', {
name: 'Alert告警',
path: 'alert',
block: 'alert'
},
{
name: '时间线',
path: 'timeline',
block: 'timeline'
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"vue",
"element-ui"
],
"version": "0.33.0",
"version": "0.34.5",
"main": "lib/ams.common.js",
"unpkg": "lib/ams.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/block-xlsx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ams-team/block-xlsx",
"version": "0.9.3",
"version": "0.9.4",
"description": "结合ams的resources配置使用的导出导出xlsx插件",
"author": "zebin.wu <1069467662@qq.com>",
"main": "lib/block-xlsx.js",
Expand Down
Loading