Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zeroing-editor
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
劳工
zeroing-editor
Commits
b01812b1
Commit
b01812b1
authored
Jun 05, 2020
by
rockyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复
parent
16b86c82
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
21 deletions
+9
-21
none.png
src/assets/none.png
+0
-0
zh-CN.json
src/locales/zh-CN.json
+2
-1
project.js
src/store/modules/project.js
+5
-18
SelectDesignModeDialog.vue
src/views/Editor/Views/SelectDesignModeDialog.vue
+2
-2
No files found.
src/assets/none.png
0 → 100644
View file @
b01812b1
689 Bytes
src/locales/zh-CN.json
View file @
b01812b1
...
...
@@ -459,8 +459,9 @@
}
},
"designCutModes"
:
{
"none"
:
"不裁剪"
,
"top"
:
"顶部裁剪"
,
"center"
:
"上下裁剪"
,
"bottom"
:
"底部裁剪"
}
}
\ No newline at end of file
}
src/store/modules/project.js
View file @
b01812b1
...
...
@@ -31,7 +31,6 @@ import events from "@/global-events.js"
const
storeName
=
'project'
;
const
psStoreName
=
'pack-history'
;
const
offsetAll
=
172
;
const
defaultOptions
=
{
behaviorEditor
:
'builtin'
,
...
...
@@ -330,7 +329,7 @@ export const projectStore = {
// 如果left\right top\bottom组合同时存在
// 则根据数值,计算width height
// if (newView.properties.left && newView.properties.right) {
// //
// //
// }
// if (newView.properties.top && newView.properties.bottom) {
...
...
@@ -814,7 +813,7 @@ export const projectStore = {
// debugger;
console
.
log
(
"resetScrollType"
,
data
)
resetScrollType
(
data
.
data
)
let
getTopView
=
node
=>
{
// console.log("node",node)
if
(
node
.
parent
&&
!
node
.
parent
.
parent
)
{
...
...
@@ -845,7 +844,7 @@ export const projectStore = {
commit
(
'activeComponent'
,
data
.
data
);
},
/**
* 修改属性
*/
...
...
@@ -868,7 +867,7 @@ export const projectStore = {
}
nodeUUidCatch
=
state
.
activeComponent
.
uuid
//console.log("nodeUUidCatch",nodeUUidCatch)
/*if (hasAssetsDep) {
commit('updateAssetDep');
}*/
...
...
@@ -933,19 +932,7 @@ export const projectStore = {
})
},
async
importPsd
({
commit
},
{
file
,
action
,
mode
})
{
let
offset
=
{};
switch
(
mode
){
case
'top'
:
offset
.
y
=
offsetAll
;
break
;
case
'center'
:
offset
.
y
=
offsetAll
/
2
;
break
;
case
'bottom'
:
break
;
}
const
result
=
await
toZeroing
(
file
,
{
offset
});
const
result
=
await
toZeroing
(
file
,
{
mode
});
let
viewFile
=
new
File
([
result
],
'view.json'
);
const
{
view
,
assets
}
=
await
editorApi
.
uploadView
(
viewFile
);
switch
(
action
)
{
...
...
src/views/Editor/Views/SelectDesignModeDialog.vue
View file @
b01812b1
...
...
@@ -33,7 +33,7 @@
return
{
visible
:
false
,
designCutMode
:
'
top
'
,
designCutMode
:
'
none
'
,
designCutModes
,
images
,
}
...
...
@@ -62,4 +62,4 @@
<
style
scoped
>
</
style
>
\ No newline at end of file
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment