Commit 2f48d124 authored by 郭志伟's avatar 郭志伟

fix: 高度计算

parent a58c0053
const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'http'; const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'http';
export default { export default {
apiHost: `http://localhost:7001/`, 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-test1.liangkebang.net/',
h5Host: 'https://quantum-h5-test1.liangkebang.net', h5Host: 'https://quantum-h5-test1.liangkebang.net',
......
...@@ -68,7 +68,7 @@ export default class DynamicForm extends Vue { ...@@ -68,7 +68,7 @@ export default class DynamicForm extends Vue {
changeStyle(type) { changeStyle(type) {
const gridEle = document.querySelector('.vue-grid-layout'); const gridEle = document.querySelector('.vue-grid-layout');
gridEle.childNodes.forEach(v => { gridEle.childNodes.forEach(v => {
if (v.classList.contains('vue-grid-item') && !v.classList.contains('vue-grid-placeholder')) { if (v.classList && v.classList.contains('vue-grid-item') && !v.classList.contains('vue-grid-placeholder')) {
if (type === 'forward') { if (type === 'forward') {
const transform = getStyle(v, 'transform'); const transform = getStyle(v, 'transform');
const transformY = transform.split('(')[1].split(')')[0].split(',')[5]; const transformY = transform.split('(')[1].split(')')[0].split(',')[5];
......
...@@ -30,7 +30,7 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) { ...@@ -30,7 +30,7 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
@Watch('layout') @Watch('layout')
onLayoutChange(val) { onLayoutChange(val) {
const lastGridItemPoint = val[val.length - 1]; const lastGridItemPoint = val[val.length - 1];
if (lastGridItemPoint.w) { if (lastGridItemPoint && lastGridItemPoint.w) {
this.bottomInfo = { this.bottomInfo = {
x: 0, x: 0,
y: 0, y: 0,
......
...@@ -45,7 +45,7 @@ export default (appInfo: EggAppConfig) => { ...@@ -45,7 +45,7 @@ export default (appInfo: EggAppConfig) => {
exports.webpack = { exports.webpack = {
webpackConfigList: getWebpackConfig(), webpackConfigList: getWebpackConfig(),
browser: 'http://localhost:7001/editor/list' browser: 'http://localhost:7002/editor/list'
}; };
return exports; return exports;
......
...@@ -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.21.1-beta6", "version": "2.21.1-beta7",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta6.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta7.tgz",
"integrity": "sha512-N99UjjwYrQj1AccZ+08lNRdHWKnlb7ZnKvAn4w48KWRERQNxJ1U2LwclVmQ3FRFlc9x5FRSUDccuoJ3CAf2ZMg==", "integrity": "sha512-9CcQ7eTwQTjHnaQ4DAk18WWTCasiRMK9iKRN01/td2HXAPemjPnUbQsEnyxZJgsvGDkaJGFSkMucDjlAtUigvA==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
...@@ -1501,9 +1501,9 @@ ...@@ -1501,9 +1501,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.1.15-beta3", "version": "0.1.15-beta4",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta3.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta4.tgz",
"integrity": "sha512-TDTj991UndKulkfDn4jLwIp9vshcte2VpG1XHtJaqtqy6ypqW3VmvpuZnGp+rV5+SbFLFPriPvfcwZXxUXv0Pw==", "integrity": "sha512-DqLR4peJapLIOQrVjvDjRsWwve4qJ0/+IZczDNYSjr2b2XB2KRahf9vYNEDDjEiRwnbDFVQYRPlVrA/BKbn0uw==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.21.1-beta5", "@qg/cherry-ui": "^2.21.1-beta5",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit DEBUG=apollo APOLLO_CLUSTER=k8s NAMESPACE=qa2 egg-scripts start --port 80 --workers 1", "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit DEBUG=apollo APOLLO_CLUSTER=k8s NAMESPACE=qa2 egg-scripts start --port 80 --workers 1",
"stop": "egg-scripts stop", "stop": "egg-scripts stop",
"backend": "nohup egg-scripts start --port 7001 --workers 4", "backend": "nohup egg-scripts start --port 7001 --workers 4",
"dev": "egg-bin dev -r egg-ts-helper/register", "dev": "egg-bin dev -r egg-ts-helper/register --port 7002",
"debug": "egg-bin debug -r egg-ts-helper/register", "debug": "egg-bin debug -r egg-ts-helper/register",
"apollo": "node bin/apollo.js", "apollo": "node bin/apollo.js",
"build": "easy build --devtool", "build": "easy build --devtool",
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
"@easy-team/easywebpack-vue": "^4.0.0", "@easy-team/easywebpack-vue": "^4.0.0",
"@hubcarl/json-typescript-mapper": "^2.0.0", "@hubcarl/json-typescript-mapper": "^2.0.0",
"@qg/apollo-nodejs": "^2.1.2", "@qg/apollo-nodejs": "^2.1.2",
"@qg/cherry-ui": "2.21.1-beta6", "@qg/cherry-ui": "2.21.1-beta7",
"@qg/citrus-ui": "0.1.15-beta3", "@qg/citrus-ui": "0.1.15-beta4",
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"@types/lodash": "^4.14.117", "@types/lodash": "^4.14.117",
"@types/node": "^10.12.0", "@types/node": "^10.12.0",
......
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