Skip to content

Commit

Permalink
juijs-grid 버전 변경에 따른 코드 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
seogi1004 committed Mar 19, 2021
1 parent 0ce9e39 commit 79f534e
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 27 deletions.
2 changes: 1 addition & 1 deletion bundles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ window.vm = new Vue({
activeIndex: 0,
columns: [
{ key: null, name: "", width: "30px" },
{ key: "name", name: "이름", width: "200px" },
{ key: "name", name: "이름", width: "200px", sort: true },
{ key: "age", name: "나이", edit: true, active: true },
{ key: "location", name: "지역", active: false },
],
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-sheets.base.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-sheets.classic.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-sheets.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-sheets.dark.js

Large diffs are not rendered by default.

28 changes: 21 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-sheets",
"version": "1.1.11",
"version": "1.2.0",
"description": "Vue components based on the JUI grids available in Vue.js",
"main": "src/main.js",
"files": [
Expand Down Expand Up @@ -72,8 +72,8 @@
},
"dependencies": {
"jquery": "^3.4.1",
"juijs-grid": "^2.5.8",
"juijs-ui": "^2.3.5",
"juijs-grid": "^2.6.1",
"juijs-ui": "^2.3.6",
"vue": "^2.6.10"
}
}
8 changes: 4 additions & 4 deletions src/base/methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ export default {
setSortEffect: function(column) {
$(column.element).parent().find("i").remove();

let $icon = $("<i class='icon-arrow3'></i>");
let $icon = $("<i class='icon-asc'></i>");
if(column.order == "desc") {
$icon = $("<i class='icon-arrow1'></i>");
$icon = $("<i class='icon-desc'></i>");
}

$icon.attr(this.$options._scopeId, true);
Expand All @@ -68,9 +68,9 @@ export default {

let $icon = null;
if(column.order == "desc") {
$icon = $("<i class='icon-arrow1'></i>");
$icon = $("<i class='icon-desc'></i>");
} else if(column.order == "asc") {
$icon = $("<i class='icon-arrow3'></i>");
$icon = $("<i class='icon-asc'></i>");
}

if($icon != null) {
Expand Down
2 changes: 0 additions & 2 deletions src/components/table.classic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
@import "~juijs-grid/src/styles/table.theme.less";
@import "~juijs-grid/src/styles/theme/classic.less";
@import "~juijs-ui/src/styles/base/mixins.less";
@import "~juijs-ui/src/styles/icon.less";
@import "~juijs-ui/src/styles/icon.theme.less";
@import "~juijs-ui/src/styles/dropdown.less";
@import "~juijs-ui/src/styles/dropdown.theme.less";
@import "~juijs-ui/src/styles/theme/classic.less";
Expand Down
2 changes: 0 additions & 2 deletions src/components/table.dark.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
@import "~juijs-grid/src/styles/table.theme.less";
@import "~juijs-grid/src/styles/theme/dark.less";
@import "~juijs-ui/src/styles/base/mixins.less";
@import "~juijs-ui/src/styles/icon.less";
@import "~juijs-ui/src/styles/icon.theme.less";
@import "~juijs-ui/src/styles/dropdown.less";
@import "~juijs-ui/src/styles/dropdown.theme.less";
@import "~juijs-ui/src/styles/theme/dark.less";
Expand Down
2 changes: 0 additions & 2 deletions src/components/xtable.classic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
@import "~juijs-grid/src/styles/xtable.theme.less";
@import "~juijs-grid/src/styles/theme/classic.less";
@import "~juijs-ui/src/styles/base/mixins.less";
@import "~juijs-ui/src/styles/icon.less";
@import "~juijs-ui/src/styles/icon.theme.less";
@import "~juijs-ui/src/styles/dropdown.less";
@import "~juijs-ui/src/styles/dropdown.theme.less";
@import "~juijs-ui/src/styles/theme/classic.less";
Expand Down
2 changes: 0 additions & 2 deletions src/components/xtable.dark.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
@import "~juijs-grid/src/styles/xtable.theme.less";
@import "~juijs-grid/src/styles/theme/dark.less";
@import "~juijs-ui/src/styles/base/mixins.less";
@import "~juijs-ui/src/styles/icon.less";
@import "~juijs-ui/src/styles/icon.theme.less";
@import "~juijs-ui/src/styles/dropdown.less";
@import "~juijs-ui/src/styles/dropdown.theme.less";
@import "~juijs-ui/src/styles/theme/dark.less";
Expand Down

0 comments on commit 79f534e

Please sign in to comment.