Skip to content

Q
quantum-blocks
Commit db7ff7cd authored by 郭志伟's avatar 郭志伟
Browse files
Options

Merge branch 'feat/1.3-local' into 'feat/v1.3' 

Feat/1.3 local

See merge request !34
parents 08a2e974 b3184171
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 54 deletions
app/web/config/dev.config.ts
View file @ db7ff7cd
...@@ -3,12 +3,12 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'http'; ...@@ -3,12 +3,12 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'http';
export default { export default {
apiHost: `http://localhost:7002/`, apiHost: `http://localhost:7002/`,
// apiHost: `http://192.168.28.199:7001/`, // apiHost: `http://192.168.28.199:7001/`,
// apiHost: 'https://quantum-blocks-test1.liangkebang.net/', // apiHost: 'https://quantum-blocks-vcc2.liangkebang.net/',
h5Host: 'https://quantum-h5-test1.liangkebang.net', h5Host: 'https://quantum-h5-vcc2.liangkebang.net',
qiniuHost: `https://appsync.lkbang.net`, qiniuHost: `https://appsync.lkbang.net`,
shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`, shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
opapiHost: `https://opapi-test1.liangkebang.net`, opapiHost: `https://opapi-vcc2.liangkebang.net`,
qiniuUpHost: `${protocol}//up-z0.qiniup.com`, qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
// kdspHost: 'https://kdsp-api-test1.liangkebang.net', // kdspHost: 'https://kdsp-api-vcc2.liangkebang.net',
kdspHost: 'https://talos-test1.liangkebang.net' kdspHost: 'https://talos-vcc2.liangkebang.net'
}; };
\ No newline at end of file
app/web/config/test.config.ts
View file @ db7ff7cd
const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https'; const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
const hostMap = { const hostMap = {
apiHost: `${protocol}//quantum-blocks-test1.liangkebang.net`, apiHost: `${protocol}//quantum-blocks-vcc2.liangkebang.net`,
h5Host: `${protocol}//quantum-h5-test1.liangkebang.net`, h5Host: `${protocol}//quantum-h5-vcc2.liangkebang.net`,
opapiHost: '${protocol}//opapi-test1.liangkebang.net', opapiHost: '${protocol}//opapi-vcc2.liangkebang.net',
qiniuHost: `${protocol}//appsync.lkbang.net`, qiniuHost: `${protocol}//appsync.lkbang.net`,
shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`, shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
qiniuUpHost: `${protocol}//up-z0.qiniup.com`, qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
......
app/web/lib/config.ts
View file @ db7ff7cd
...@@ -7,18 +7,15 @@ export const basicComponents = [ ...@@ -7,18 +7,15 @@ export const basicComponents = [
coverImage: 'https://img.lkbang.net/citrus-ui/cherry-component-cover-free-container.png', coverImage: 'https://img.lkbang.net/citrus-ui/cherry-component-cover-free-container.png',
title: '自由容器', title: '自由容器',
config: [ config: [
// { {
// key: 'backgroundImage', key: 'link',
// name: '背景图片', name: '跳转链接',
// type: 'Upload' desc: '跳转链接',
// }, type: 'text'
// { }
// key: 'backgroundColor',
// name: '背景颜色',
// type: 'ColorSelector'
// },
], ],
value: { value: {
link: ''
// backgroundImage: 'http://activitystatic.q-gp.com/landing-bg.png'; // backgroundImage: 'http://activitystatic.q-gp.com/landing-bg.png';
// backgroundColor: '#fff' // backgroundColor: '#fff'
}, },
......
app/web/page/editor/component/DynamicForm/component/FormList/index.vue
View file @ db7ff7cd
...@@ -64,10 +64,5 @@ import FormList from '../mixins/formList.mixin.ts'; ...@@ -64,10 +64,5 @@ import FormList from '../mixins/formList.mixin.ts';
justify-content: space-between; justify-content: space-between;
} }
} }
&-button {
// margin-top: 20px;
// text-align: center;
}
} }
</style> </style>
\ No newline at end of file
app/web/page/editor/component/DynamicForm/component/TableModal/index.vue
View file @ db7ff7cd
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<Modal <Modal
:width="1150" :width="1150"
v-model="modal" v-model="modal"
:mask-closable="false"
@on-ok="ok" @on-ok="ok"
@on-cancel="cancel" @on-cancel="cancel"
class="table-modal-popup" class="table-modal-popup"
......
app/web/page/editor/component/DynamicForm/component/Upload/index.vue
View file @ db7ff7cd
...@@ -59,8 +59,9 @@ ...@@ -59,8 +59,9 @@
this.$emit('input', this.img); this.$emit('input', this.img);
this.$emit('change', this.img); this.$emit('change', this.img);
}, },
handleImgUrlChange() { handleImgUrlChange(val) {
this.$emit('input', this.img); this.$emit('input', this.img);
this.$emit('change', this.img);
}, },
uploadQiniu() { uploadQiniu() {
var uploader = Qiniu.uploader({ var uploader = Qiniu.uploader({
......
app/web/page/editor/component/DynamicForm/component/mixins/formList.mixin.ts
View file @ db7ff7cd
...@@ -10,7 +10,7 @@ import BaseSelect from '../BaseSelect/index.vue'; ...@@ -10,7 +10,7 @@ import BaseSelect from '../BaseSelect/index.vue';
export default class DynamicFormMixin extends Vue { export default class DynamicFormMixin extends Vue {
@Prop({ type: Array, default: () => [] }) value; @Prop({ type: Array, default: () => [] }) value;
@Prop({ type: Array, default: () => [] }) formControl; @Prop({ type: Array, default: () => [] }) formControl;
@Prop({ type: Object, default: () => [] }) formDefault; @Prop({ type: Object, default: () => ({}) }) formDefault;
@Prop(String) name; @Prop(String) name;
list: object[] = []; list: object[] = [];
......
app/web/page/editor/component/OperationPanel/component/TitlePreview/index.vue
View file @ db7ff7cd
<template> <template>
<cr-nav-bar <cr-nav-bar
class="nav-bar" class="nav-bar"
:title="tille" :title="title"
:left-arrow="false" :left-arrow="false"
left-text="" left-text=""
:fixed="false" :fixed="false"
...@@ -14,9 +14,9 @@ import { mapGetters } from 'vuex'; ...@@ -14,9 +14,9 @@ import { mapGetters } from 'vuex';
export default { export default {
name: 'TitlePreview', name: 'TitlePreview',
computed: { computed: {
...mapGetters(['pageData']), ...mapGetters(['pageData', 'pageInfo']),
tille() { title() {
return '标题'; return this.pageInfo.pageName || '标题';
}, },
titleStyle() { titleStyle() {
const { titleBgColor } = this.pageData.props; const { titleBgColor } = this.pageData.props;
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
background-color: transparent; background-color: transparent;
&__title { &__title {
color: inherit; color: inherit;
font-weight: bold;
} }
} }
......
app/web/page/editor/component/OperationPanel/index.vue
View file @ db7ff7cd
...@@ -69,7 +69,9 @@ ...@@ -69,7 +69,9 @@
width: 375px; width: 375px;
height: 667px; height: 667px;
margin: 30px auto; margin: 30px auto;
box-shadow: 2px 3px 10px rgba(0, 0, 0, 0.2); box-shadow: 2px 3px 12px rgba(0, 0, 0, 0.116);
border-radius: 6px;
overflow: hidden;
} }
width: 375px; width: 375px;
height: 619px; height: 619px;
......
app/web/page/store/modules/editor/state.ts
View file @ db7ff7cd
...@@ -85,7 +85,7 @@ export const defaultState = { ...@@ -85,7 +85,7 @@ export const defaultState = {
titleBgColor: '#fff', titleBgColor: '#fff',
showPageBottomTip: true, showPageBottomTip: true,
pageBottomTxt: '没有更多啦～', pageBottomTxt: '没有更多啦～',
pageBottomColor: '#fff', pageBottomColor: '#333',
showBackTop: true, showBackTop: true,
btAttachVal: [ btAttachVal: [
{ {
......
package-lock.json
View file @ db7ff7cd
...@@ -1491,9 +1491,9 @@ ...@@ -1491,9 +1491,9 @@
"integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg==" "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
}, },
"@qg/cherry-ui": { "@qg/cherry-ui": {
"version": "2.22.3", "version": "2.22.4",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.22.3.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.22.4.tgz",
"integrity": "sha512-8BIV5E1oc3Rr/ofvuCK7qNqcg340CKmI6n5GU0hKtPsxmly7pNcQWsu6k0AHI/cpPHdPkvEbtjpLVWGac+zBWg==", "integrity": "sha512-tvrtr3w/a0hhWu8TUuZvvyT2tXV+4rQLWfYxBFRI5PAvQ8+s6Iyo3QLZAf/JNKo0gAz1ZjK6QSK6Mn6GBLvReg==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
...@@ -1501,13 +1501,13 @@ ...@@ -1501,13 +1501,13 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.2.20", "version": "0.2.24",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.20.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.24.tgz",
"integrity": "sha512-eKyAqqsUgk34ztLfnL7XyCbariEtkVv30FltCfxm/zx9QhqzFLmB54VR6/F3lOeGQveQcT/NE9hXHsC9K+QjaQ==", "integrity": "sha512-gKcZu7HzieRmA63GVfXzy/yoiIrdq3ryr/Y+HlqQnGeJXIdE+baxqwAk2vVeQ6n0x4XkT9GElTKkgd6R6MnIng==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.21.1", "@qg/cherry-ui": "^2.21.1",
"@qg/js-bridge": "^1.1.11", "@qg/js-bridge": "^1.1.12",
"axios": "^0.21.1", "axios": "^0.21.1",
"intersection-observer": "^0.12.0", "intersection-observer": "^0.12.0",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
...@@ -1518,12 +1518,9 @@ ...@@ -1518,12 +1518,9 @@
} }
}, },
"@qg/js-bridge": { "@qg/js-bridge": {
"version": "1.1.11", "version": "1.1.12",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.12.tgz",
"integrity": "sha512-WVvkSUg2zcc2nblzYGxM/bVo+VDcANy/dw7vcbxLoW1Jega9Jm2d5FGSb7uS6m4746waghUUqcAWNJZ0Q5yeqA==", "integrity": "sha512-KhSbaGMJvGZ7CNrl6nIhD56vAKwDCx6kjwm26UeCBb8KAAb2JjgRe3pIAw/XHjC5WZXjlwfwx6hwrgslQiFyxA=="
"requires": {
"rollup": "^2.41.3"
}
}, },
"@riophae/vue-treeselect": { "@riophae/vue-treeselect": {
"version": "0.4.0", "version": "0.4.0",
...@@ -20134,14 +20131,6 @@ ...@@ -20134,14 +20131,6 @@
"resolved": "http://npmprivate.quantgroups.com/rndm/-/rndm-1.2.0.tgz", "resolved": "http://npmprivate.quantgroups.com/rndm/-/rndm-1.2.0.tgz",
"integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w=" "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
}, },
"rollup": {
"version": "2.56.2",
"resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.56.2.tgz",
"integrity": "sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ==",
"requires": {
"fsevents": "~2.3.2"
}
},
"run-async": { "run-async": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "http://npmprivate.quantgroups.com/run-async/-/run-async-2.4.1.tgz", "resolved": "http://npmprivate.quantgroups.com/run-async/-/run-async-2.4.1.tgz",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment