From 7b2ba05049bcbe0c330df097c193606856196a2c Mon Sep 17 00:00:00 2001 From: eidng8 Date: Fri, 24 Apr 2020 13:13:05 +0800 Subject: [PATCH 01/13] add `--no-verify` --- scripts/release.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/release.bat b/scripts/release.bat index 02996c0..2967ef5 100644 --- a/scripts/release.bat +++ b/scripts/release.bat @@ -22,14 +22,14 @@ bash.exe -lc github_changelog_generator || goto ERR for /f "tokens=*" %%v in ('node scripts\make-release-note.js') do set VERSION=%%v git add . || goto ERR -git commit -m "Release %VERSION%" || goto ERR -git push || goto ERR +git commit --no-verify -m "Release %VERSION%" || goto ERR +git push --no-verify || goto ERR git tag --sign -m "%date%" "Release-v%VERSION%" -git push --tags || goto ERR +git push --no-verify --tags || goto ERR git checkout dev git merge master -git push +git push --no-verify goto END From 0abf8c00538acbd7458b45f6424d0432f43f419c Mon Sep 17 00:00:00 2001 From: eidng8 Date: Fri, 24 Apr 2020 16:22:08 +0800 Subject: [PATCH 02/13] add back dependencies --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4aa1533..384ea9a 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,12 @@ "lint": "vue-cli-service lint", "wba": "cross-env WBA=1 npm run build" }, + "dependencies": { + "core-js": "^3.6.4", + "vue": "^2.6.11", + "vue-class-component": "^7.2.3", + "vue-property-decorator": "^8.4.1" + }, "devDependencies": { "@bundle-analyzer/webpack-plugin": "^0.5.1", "@types/jest": "^24.0.19", @@ -48,7 +54,6 @@ "@vue/eslint-config-typescript": "^5.0.1", "@vue/test-utils": "1.0.0-beta.31", "chromedriver": "latest", - "core-js": "^3.6.4", "cross-env": "^7.0.2", "eslint": "^6.7.2", "eslint-config-prettier": "^6.10.1", @@ -67,13 +72,8 @@ "sass-loader": "^8.0.2", "typescript": "~3.7.5", "vue": "^2.6.11", - "vue-class-component": "^7.2.2", "vue-docgen-cli": "^4.16.0", - "vue-property-decorator": "^8.3.0", "vue-template-compiler": "^2.6.11", "webpack-bundle-analyzer": "^3.7.0" - }, - "peerDependencies": { - "vue": "^2.6.11" } } From da2cbce89e133f6ca508ef198fe93942fdd679da Mon Sep 17 00:00:00 2001 From: Jackey Cheung Date: Fri, 24 Apr 2020 22:02:53 +0800 Subject: [PATCH 03/13] fix #41 --- src/components/G8TreeView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/G8TreeView.vue b/src/components/G8TreeView.vue index d7d360a..5fb587a 100644 --- a/src/components/G8TreeView.vue +++ b/src/components/G8TreeView.vue @@ -51,8 +51,8 @@ :tag-label="tagLabel" :tag-hint="tagHint" @click="$emit('click', $event)" - @click.middle.stop="$emit('middle-click', $event)" - @click.right="$emit('right-click', $event)" + @middle-click="$emit('middle-click', $event)" + @right-click="$emit('right-click', $event)" @dblclick="$emit('dblclick', $event)" @state-changed="childrenStateChanged($event)" @tag-click="$emit('tag-click', $event)" From 3cab98e6d24ec07d02c4ba1e027e9312f0b28bbe Mon Sep 17 00:00:00 2001 From: eidng8 Date: Fri, 24 Apr 2020 22:13:44 +0800 Subject: [PATCH 04/13] fix #42 --- src/App.vue | 23 ++++++++++++++++++++--- src/components/G8TreeView.vue | 9 ++++++--- src/components/types.ts | 7 ++++++- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/App.vue b/src/App.vue index 995a207..d33843d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,7 +41,18 @@ @tag-dblclick=" tagDblClicked = `${$event.node.name},${$event.tag.label},${$event.index}` " - > + > + + + @@ -90,7 +101,8 @@ export default class App extends Vue { const child: G8TreeItem = { key: `key-${i}`, name: `name ${i}`, - tags: [{ label: `tag ${i}` }], + color: i % 5, + tags: [{ color: i % 5 ? '' : 'blue', label: `tag ${i}` }], children: [], }; for (let j = 1; j < total; j++) { @@ -98,7 +110,8 @@ export default class App extends Vue { child.children!.push({ key: `key-${i}.${j}`, name: `name ${i}.${j}`, - tags: [{ label: `tag ${i}.${j}` }], + + tags: [{ color: i % 5 ? '' : 'blue', label: `tag ${i}.${j}` }], }); } // eslint-disable-next-line @typescript-eslint/no-non-null-assertion @@ -137,4 +150,8 @@ span[id] { border: 1px solid; display: inline-block; } + +.blue { + color: blue; +} diff --git a/src/components/G8TreeView.vue b/src/components/G8TreeView.vue index d7d360a..690c538 100644 --- a/src/components/G8TreeView.vue +++ b/src/components/G8TreeView.vue @@ -24,7 +24,9 @@ 'g8-tree__checked_some': intermediate, }" > - {{ item[itemLabel] }} + + {{ item[itemLabel] }} + + {{ tag[tagLabel] }} +
    @@ -54,11 +57,11 @@ @click.middle.stop="$emit('middle-click', $event)" @click.right="$emit('right-click', $event)" @dblclick="$emit('dblclick', $event)" - @state-changed="childrenStateChanged($event)" @tag-click="$emit('tag-click', $event)" @tag-middle-click="$emit('tag-middle-click', $event)" @tag-right-click="$emit('tag-right-click', $event)" @tag-dblclick="$emit('tag-dblclick', $event)" + @state-changed="childrenStateChanged($event)" >
diff --git a/src/components/types.ts b/src/components/types.ts index 2c00f3d..fa6336e 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -9,7 +9,7 @@ */ export interface G8TreeItem { /** - * Just to allow accessing data via index syntax. + * Just to allow accessing data via index syntax and arbitrary data to fit in. */ [key: string]: unknown; @@ -49,6 +49,11 @@ export interface G8TreeItem { * Node tag data */ export interface G8TreeItemTag { + /** + * Just to allow accessing data via index syntax and arbitrary data to fit in. + */ + [key: string]: unknown; + /** * Tag label. */ From 029b45f900cf003d66eb6eb6974a82585b6f36a4 Mon Sep 17 00:00:00 2001 From: Jackey Cheung Date: Fri, 24 Apr 2020 22:20:10 +0800 Subject: [PATCH 05/13] fix #41 --- src/components/G8TreeView.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/G8TreeView.vue b/src/components/G8TreeView.vue index 5fb587a..87680f0 100644 --- a/src/components/G8TreeView.vue +++ b/src/components/G8TreeView.vue @@ -50,6 +50,7 @@ :children-key="childrenKey" :tag-label="tagLabel" :tag-hint="tagHint" + :handle-right-click="handleRightClick" @click="$emit('click', $event)" @middle-click="$emit('middle-click', $event)" @right-click="$emit('right-click', $event)" From b4c39164b82dc324a1f34d14eeed0941abcefeef Mon Sep 17 00:00:00 2001 From: eidng8 Date: Fri, 24 Apr 2020 22:43:51 +0800 Subject: [PATCH 06/13] fix #42 --- src/App.vue | 18 +++++++++--------- src/components/G8TreeView.vue | 9 ++++++++- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/App.vue b/src/App.vue index d33843d..b89aa91 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,14 +42,14 @@ tagDblClicked = `${$event.node.name},${$event.tag.label},${$event.index}` " > -