Skip to content

Q
quantum-blocks
Commit e60201a5 authored by 郝聪敏's avatar 郝聪敏
Browse files
Options

feature: 升级组件库

parent 87d62d7a
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
app/model/pageInfo.ts
View file @ e60201a5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table, AllowNull } from 'sequelize-typescript'; import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table, AllowNull } from 'sequelize-typescript';
@Table({ @Table({
modelName: 'page_config_info', modelName: 'page_info',
freezeTableName: true freezeTableName: true
}) })
......
app/web/page/editor/component/FreedomContainer/index.ts
View file @ e60201a5
...@@ -104,12 +104,12 @@ export default class FreedomContainer extends Mixins(ContextMenuMixin, Transform ...@@ -104,12 +104,12 @@ export default class FreedomContainer extends Mixins(ContextMenuMixin, Transform
return pre; return pre;
}, {}); }, {});
this.$set(this.dots, this.curChildIndex, dots); this.$set(this.dots, this.curChildIndex, dots);
console.log('setDotsStyle', this.dots[this.curChildIndex]); // console.log('setDotsStyle', this.dots[this.curChildIndex]);
}); });
} }
getHW(index) { getHW(index) {
console.log('getHW', index); // console.log('getHW', index);
if (!this.$refs.childComponent || !this.$refs.childComponent.length) { return [0, 0]; } if (!this.$refs.childComponent || !this.$refs.childComponent.length) { return [0, 0]; }
const childComponent = this.$refs.childComponent[index]; const childComponent = this.$refs.childComponent[index];
if (!childComponent || !childComponent.$el) { return [0, 0]; } if (!childComponent || !childComponent.$el) { return [0, 0]; }
...@@ -173,6 +173,7 @@ export default class FreedomContainer extends Mixins(ContextMenuMixin, Transform ...@@ -173,6 +173,7 @@ export default class FreedomContainer extends Mixins(ContextMenuMixin, Transform
pos.height = newHeight > 0 ? newHeight : 0; pos.height = newHeight > 0 ? newHeight : 0;
pos.left = +left + (hasL ? disX : 0); pos.left = +left + (hasL ? disX : 0);
pos.top = +top + (hasT ? disY : 0); pos.top = +top + (hasT ? disY : 0);
if (!this.containerIndex && this.containerIndex !== 0 || !this.curChildIndex && this.curChildIndex !== 0) { return; }
this.updateCommonStyle({ containerIndex: this.containerIndex, childIndex: this.curChildIndex, data: pos }); this.updateCommonStyle({ containerIndex: this.containerIndex, childIndex: this.curChildIndex, data: pos });
this.setPointStyle(); this.setPointStyle();
}, 100); }, 100);
......
package-lock.json
View file @ e60201a5
...@@ -1456,9 +1456,9 @@ ...@@ -1456,9 +1456,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.0.46", "version": "0.0.47",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.46.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.47.tgz",
"integrity": "sha512-uhZH2sdGLc65TjnHiiFvkJPmp1AbYSqzQKDBFAkdYyyX6DpD5vEFIwFdRIHG+WV3enbNhep7iIvXE83qx55YUQ==", "integrity": "sha512-SWld0LQ++qtq4Tw+HDKlD1IoITbWAcJIA3j0mDS17UAlRpGaiY7pzPq/9eyqGm7aQwDiJ6NeeofMXHMvF6Sqwg==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.20.5", "@qg/cherry-ui": "^2.20.5",
......
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