Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
37510831
Commit
37510831
authored
Nov 18, 2016
by
qingwei.li
Committed by
Leopoldthecoder
Nov 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update: release script
parent
528067f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
build/release.sh
build/release.sh
+6
-3
packages/table/src/table-column.js
packages/table/src/table-column.js
+1
-0
No files found.
build/release.sh
View file @
37510831
git checkout master
git merge dev
#!/usr/bin/env sh
set
-e
echo
"Enter release version: "
...
...
@@ -25,11 +28,11 @@ then
npm version
$VERSION
--message
"[release]
$VERSION
"
# publish
git push eleme dev
git checkout master
git merge dev
git push eleme master
git push eleme refs/tags/v
$VERSION
git checkout dev
git merge master
git push eleme dev
npm publish
fi
packages/table/src/table-column.js
View file @
37510831
...
...
@@ -217,6 +217,7 @@ export default {
if
(
Object
.
prototype
.
toString
.
call
(
data
.
_self
)
===
'
[object Object]
'
)
{
for
(
let
prop
in
data
.
_self
)
{
if
(
!
data
.
hasOwnProperty
(
prop
))
{
// _self.$set(data, prop, data._self[prop]);
data
[
prop
]
=
data
.
_self
[
prop
];
}
}
...
...
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