diff --git a/README.md b/README.md
index 9b55afe5..a203a78b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-
+
## 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
index d9f1f0c3..ef1ca23d 100644
--- 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
index ffb22edb..e9d9d290 100644
--- a/docs/zh-CN/.vuepress/components/block/card/demo.vue
+++ b/docs/zh-CN/.vuepress/components/block/card/demo.vue
@@ -16,7 +16,7 @@
diff --git a/src/fields/image/image-view.vue b/src/fields/image/image-view.vue
index 6d6adce6..f9fe5a5b 100644
--- a/src/fields/image/image-view.vue
+++ b/src/fields/image/image-view.vue
@@ -1,7 +1,11 @@
- ![]()
+
+
@@ -11,7 +15,12 @@
import mixins from '../../ams/mixins';
export default {
- mixins: [mixins.fieldViewMixin]
+ mixins: [mixins.fieldViewMixin],
+ computed: {
+ srcList() {
+ return (this.field.props && this.field.props['preview-src-list']) || [this.viewValue];
+ }
+ },
};
@@ -19,7 +28,8 @@ export default {
.ams-field-image-view {
font-size: 50px;
display: block;
- max-width: 100px;
+ width: 100px;
+ height: 100px;
}
diff --git a/src/fields/select/select-edit.vue b/src/fields/select/select-edit.vue
index a425bdc3..9612a55c 100644
--- a/src/fields/select/select-edit.vue
+++ b/src/fields/select/select-edit.vue
@@ -11,6 +11,12 @@
:label="item.label"
v-bind="item"
:value="item.value">
+
+
+
+
+
+
全选
diff --git a/src/fields/transfer/transfer-edit.vue b/src/fields/transfer/transfer-edit.vue
index b0e1b9a3..07be144b 100644
--- a/src/fields/transfer/transfer-edit.vue
+++ b/src/fields/transfer/transfer-edit.vue
@@ -2,8 +2,24 @@
+
+
+
+
+
+
@@ -12,6 +28,22 @@
import mixins from '../../ams/mixins';
export default {
- mixins: [mixins.fieldEditMixin]
+ mixins: [mixins.fieldEditMixin],
+ computed: {
+ slots() {
+ const slots = this.field && this.field.slots || {};
+ const result = {};
+ ['left-footer', 'right-footer'].forEach(slot => {
+ result[slot] = slots[slot] || null;
+ });
+ return result;
+ }
+ }
};
+
+
diff --git a/src/index.js b/src/index.js
index 8daba6a0..9bf6116e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -70,7 +70,7 @@ import field from './operations/field';
import dropdown from './operations/dropdown';
// 版本号
-ams.version = '0.13.0';
+ams.version = '0.15.6';
// 挂载到ams上
ams.mixins = mixins;
ams.utils = utils;
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 18847f11..4087ef30 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -54,3 +54,7 @@ a:hover {
height: 0;
}
}
+
+.el-image-viewer__close{
+ color: #fff;
+}
\ No newline at end of file