@operato/app 1.4.24 → 1.4.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/dist/src/grist-editor/ox-grist-editor-resource-code.js +3 -3
- package/dist/src/grist-editor/ox-grist-editor-resource-code.js.map +1 -1
- package/dist/src/grist-editor/ox-grist-renderer-resource-code.d.ts +1 -0
- package/dist/src/grist-editor/ox-grist-renderer-resource-code.js +29 -65
- package/dist/src/grist-editor/ox-grist-renderer-resource-code.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/grist-editor/ox-grist-editor-resource-code.ts +3 -6
- package/src/grist-editor/ox-grist-renderer-resource-code.ts +37 -81
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,15 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
### [1.4.25](https://github.com/hatiolab/operato/compare/v1.4.24...v1.4.25) (2023-08-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### :bug: Bug Fix
|
|
10
|
+
|
|
11
|
+
* resouce-code type add disp option ([61389c1](https://github.com/hatiolab/operato/commit/61389c1fdcbd7b2273e7bef5bcadd6e9c754a9d7))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
6
15
|
### [1.4.24](https://github.com/hatiolab/operato/compare/v1.4.23...v1.4.24) (2023-08-09)
|
|
7
16
|
|
|
8
17
|
|
|
@@ -5,12 +5,12 @@ import { customElement } from 'lit/decorators.js';
|
|
|
5
5
|
import { html } from 'lit';
|
|
6
6
|
export let OxGristEditorResourceCode = class OxGristEditorResourceCode extends OxGristEditor {
|
|
7
7
|
get editorTemplate() {
|
|
8
|
-
var { codes } = this.column.record || {};
|
|
8
|
+
var { codes, selectDispOpt = 'code-name' } = this.column.record || {};
|
|
9
9
|
return html `
|
|
10
10
|
<select>
|
|
11
|
-
${(codes || [
|
|
11
|
+
${(codes || []).map((code) => html `
|
|
12
12
|
<option ?selected=${code.name == this.value} value=${code.name}>
|
|
13
|
-
|
|
13
|
+
${code.name == '' ? '' : selectDispOpt.replace('name', code.description).replace('code', code.name)}
|
|
14
14
|
</option>
|
|
15
15
|
`)}
|
|
16
16
|
</select>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ox-grist-editor-resource-code.js","sourceRoot":"","sources":["../../../src/grist-editor/ox-grist-editor-resource-code.ts"],"names":[],"mappings":";AAAA,OAAO,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"ox-grist-editor-resource-code.js","sourceRoot":"","sources":["../../../src/grist-editor/ox-grist-editor-resource-code.ts"],"names":[],"mappings":";AAAA,OAAO,oBAAoB,CAAA;AAC3B,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAA;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AASnB,WAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,aAAa;IAC1D,IAAI,cAAc;QAChB,IAAI,EAAE,KAAK,EAAE,aAAa,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAA;QAErE,OAAO,IAAI,CAAA;;UAEL,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CACjB,CAAC,IAAsB,EAAE,EAAE,CAAC,IAAI,CAAA;gCACV,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,IAAI;cAC5D,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,MAAM,EAAC,IAAI,CAAC,IAAI,CAAC;;WAElG,CACF;;KAEJ,CAAA;IACH,CAAC;CACF,CAAA;AAhBY,yBAAyB;IADrC,aAAa,CAAC,+BAA+B,CAAC;GAClC,yBAAyB,CAgBrC","sourcesContent":["import '@material/mwc-icon'\nimport { OxGristEditor, RecordConfig } from '@operato/data-grist'\n\nimport { customElement } from 'lit/decorators.js'\nimport { html } from 'lit'\n\ntype CommonCodeDetail = {\n name: string\n description: string\n rank: number\n}\n\n@customElement('ox-grist-editor-resource-code')\nexport class OxGristEditorResourceCode extends OxGristEditor {\n get editorTemplate() {\n var { codes, selectDispOpt = 'code-name' } = this.column.record || {}\n\n return html`\n <select>\n ${(codes || []).map(\n (code: CommonCodeDetail) => html`\n <option ?selected=${code.name == this.value} value=${code.name}>\n ${code.name == '' ? '' : selectDispOpt.replace('name',code.description).replace('code',code.name)}\n </option>\n `\n )}\n </select>\n `\n }\n}\n"]}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { OxGristRenderer } from '@operato/data-grist';
|
|
2
2
|
export declare class OxGristRendererResourceCode extends OxGristRenderer {
|
|
3
|
+
static styles: import("lit").CSSResult;
|
|
3
4
|
connectedCallback(): Promise<void>;
|
|
4
5
|
get rendererTemplate(): import("lit-html").TemplateResult<1>;
|
|
5
6
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import gql from 'graphql-tag';
|
|
3
|
-
import { html } from 'lit';
|
|
3
|
+
import { css, html } from 'lit';
|
|
4
4
|
import { client, gqlContext } from '@operato/graphql';
|
|
5
5
|
import { customElement } from 'lit/decorators.js';
|
|
6
6
|
import { OxGristRenderer } from '@operato/data-grist';
|
|
7
|
+
import { detectOverflow } from '@operato/utils';
|
|
7
8
|
const FETCH_COMMON_CODE_GQL = (codeName) => gql `
|
|
8
9
|
{
|
|
9
10
|
commonCode(name: "${codeName}") {
|
|
@@ -15,6 +16,16 @@ const FETCH_COMMON_CODE_GQL = (codeName) => gql `
|
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
`;
|
|
19
|
+
function onmouseover(e) {
|
|
20
|
+
const element = e.target;
|
|
21
|
+
if (detectOverflow(element)) {
|
|
22
|
+
element.setAttribute('data-tooltip', element.textContent);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function onmouseout(e) {
|
|
26
|
+
const element = e.target;
|
|
27
|
+
element.removeAttribute('data-tooltip');
|
|
28
|
+
}
|
|
18
29
|
export let OxGristRendererResourceCode = class OxGristRendererResourceCode extends OxGristRenderer {
|
|
19
30
|
async connectedCallback() {
|
|
20
31
|
var { codeName, codes } = this.column.record || {};
|
|
@@ -28,7 +39,6 @@ export let OxGristRendererResourceCode = class OxGristRendererResourceCode exten
|
|
|
28
39
|
this.column.record.codes = [{ name: '', description: '' }].concat(commonCode.details.sort(function (a, b) {
|
|
29
40
|
return a.rank - b.rank;
|
|
30
41
|
}));
|
|
31
|
-
console.log(this.column.record.codes);
|
|
32
42
|
}
|
|
33
43
|
super.connectedCallback();
|
|
34
44
|
}
|
|
@@ -36,79 +46,33 @@ export let OxGristRendererResourceCode = class OxGristRendererResourceCode exten
|
|
|
36
46
|
if (!this.value) {
|
|
37
47
|
return html ``;
|
|
38
48
|
}
|
|
39
|
-
var { codes } = this.column.record || {};
|
|
49
|
+
var { codes, renderDispOpt = 'name' } = this.column.record || {};
|
|
40
50
|
if (codes) {
|
|
41
51
|
for (let idx = 0; idx < codes.length; idx++) {
|
|
42
52
|
let code = codes[idx];
|
|
43
53
|
if (code.name == this.value) {
|
|
44
|
-
return html `<span>${code.description}</span> `;
|
|
54
|
+
return html `<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${code.name == '' ? '' : renderDispOpt.replace('name', code.description).replace('code', code.name)}</span> `;
|
|
45
55
|
}
|
|
46
56
|
}
|
|
47
57
|
}
|
|
48
|
-
return html `<span>${this.value}</span> `;
|
|
58
|
+
return html `<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${this.value}</span> `;
|
|
49
59
|
}
|
|
50
60
|
};
|
|
61
|
+
OxGristRendererResourceCode.styles = css `
|
|
62
|
+
:host {
|
|
63
|
+
display: block;
|
|
64
|
+
position: relative;
|
|
65
|
+
|
|
66
|
+
width: 100%;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
span {
|
|
70
|
+
text-overflow: ellipsis;
|
|
71
|
+
display: block;
|
|
72
|
+
overflow: hidden;
|
|
73
|
+
}
|
|
74
|
+
`;
|
|
51
75
|
OxGristRendererResourceCode = __decorate([
|
|
52
76
|
customElement('ox-grist-renderer-resource-code')
|
|
53
77
|
], OxGristRendererResourceCode);
|
|
54
|
-
// type CommonCodeDetail = {
|
|
55
|
-
// name: string
|
|
56
|
-
// description: string
|
|
57
|
-
// rank: number
|
|
58
|
-
// }
|
|
59
|
-
// const FETCH_COMMON_CODE_GQL = (codeName: string) => gql`
|
|
60
|
-
// {
|
|
61
|
-
// commonCode(name: "${codeName}") {
|
|
62
|
-
// details {
|
|
63
|
-
// name
|
|
64
|
-
// description
|
|
65
|
-
// rank
|
|
66
|
-
// }
|
|
67
|
-
// }
|
|
68
|
-
// }
|
|
69
|
-
// `
|
|
70
|
-
// const codeGetterPromise = (codeName:string) => new Promise((resolve, reject) => {
|
|
71
|
-
// /* codeName으로 fetch 해와서, this.column.record.codes에 보관한다. */
|
|
72
|
-
// client.query({
|
|
73
|
-
// query: FETCH_COMMON_CODE_GQL(codeName),
|
|
74
|
-
// context: gqlContext()
|
|
75
|
-
// }).then(({ loading, error, data }) => {
|
|
76
|
-
// var commonCode = data && data.commonCode
|
|
77
|
-
// let codes:any[] = []
|
|
78
|
-
// if (commonCode) {
|
|
79
|
-
// codes = [{ name: '', description: '' }].concat(
|
|
80
|
-
// commonCode.details.sort(function (a: CommonCodeDetail, b: CommonCodeDetail) {
|
|
81
|
-
// return a.rank - b.rank
|
|
82
|
-
// })
|
|
83
|
-
// )
|
|
84
|
-
// resolve(codes)
|
|
85
|
-
// }
|
|
86
|
-
// });
|
|
87
|
-
// });
|
|
88
|
-
// export const OxGristRendererResourceCode: FieldRenderer = (value, column, record, rowIndex, field) => {
|
|
89
|
-
// if (!value) return html``
|
|
90
|
-
// var { codeName, codes } = column.record || {}
|
|
91
|
-
// if(codes){
|
|
92
|
-
// return getRenderHtml(value, codes);
|
|
93
|
-
// }
|
|
94
|
-
// if (!codes && codeName) {
|
|
95
|
-
// codeGetterPromise(codeName).then(codeList=> {
|
|
96
|
-
// console.log('getCodes')
|
|
97
|
-
// column.record.codes = codeList
|
|
98
|
-
// codes = codeList
|
|
99
|
-
// })
|
|
100
|
-
// }
|
|
101
|
-
// return getRenderHtml(value, codes);
|
|
102
|
-
// }
|
|
103
|
-
// function getRenderHtml(value:string, codes:any[]){
|
|
104
|
-
// if(codes){
|
|
105
|
-
// for(let idx = 0; idx < codes.length ; idx++){
|
|
106
|
-
// let code = codes[idx];
|
|
107
|
-
// if(code.name == value){
|
|
108
|
-
// return html`<span>${code.description}</span> `
|
|
109
|
-
// }
|
|
110
|
-
// }
|
|
111
|
-
// }
|
|
112
|
-
// return html`<span>${value}</span> `
|
|
113
|
-
// }
|
|
114
78
|
//# sourceMappingURL=ox-grist-renderer-resource-code.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ox-grist-renderer-resource-code.js","sourceRoot":"","sources":["../../../src/grist-editor/ox-grist-renderer-resource-code.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"ox-grist-renderer-resource-code.js","sourceRoot":"","sources":["../../../src/grist-editor/ox-grist-renderer-resource-code.ts"],"names":[],"mappings":"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","sourcesContent":["import gql from 'graphql-tag'\nimport { css, html } from 'lit'\nimport { client, gqlContext } from '@operato/graphql'\nimport { customElement } from 'lit/decorators.js'\n\nimport { OxGristRenderer } from '@operato/data-grist'\nimport { detectOverflow } from '@operato/utils'\n\ntype CommonCodeDetail = {\n name: string\n description: string\n rank: number\n}\n\nconst FETCH_COMMON_CODE_GQL = (codeName: string) => gql`\n{\n commonCode(name: \"${codeName}\") {\n details {\n name\n description\n rank\n }\n }\n}\n`\n\nfunction onmouseover(e: Event) {\n const element = e.target as HTMLSpanElement\n if (detectOverflow(element)) {\n element.setAttribute('data-tooltip', element.textContent!)\n }\n}\n\nfunction onmouseout(e: Event) {\n const element = e.target as HTMLSpanElement\n element.removeAttribute('data-tooltip')\n}\n\n\n@customElement('ox-grist-renderer-resource-code')\nexport class OxGristRendererResourceCode extends OxGristRenderer {\n static styles = css`\n :host {\n display: block;\n position: relative;\n\n width: 100%;\n }\n\n span {\n text-overflow: ellipsis;\n display: block;\n overflow: hidden;\n }\n `\n\n async connectedCallback(){\n var { codeName, codes } = this.column.record || {}\n\n if (!codes && codeName) {\n /* codeName으로 fetch 해와서, this.column.record.codes에 보관한다. */\n let response = await client.query({\n query: FETCH_COMMON_CODE_GQL(codeName),\n context: gqlContext()\n })\n\n var commonCode = response && response.data && response.data.commonCode\n\n this.column.record.codes = [{ name: '', description: '' }].concat(\n commonCode.details.sort(function (a: CommonCodeDetail, b: CommonCodeDetail) {\n return a.rank - b.rank\n })\n )\n }\n\n super.connectedCallback();\n }\n \n get rendererTemplate() {\n if(!this.value) {\n return html``\n }\n\n var { codes, renderDispOpt = 'name' } = this.column.record || {}\n\n if(codes){\n for(let idx = 0; idx < codes.length ; idx++){\n let code = codes[idx];\n \n if(code.name == this.value){\n return html`<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${code.name == '' ? '' : renderDispOpt.replace('name',code.description).replace('code',code.name)}</span> `\n }\n }\n }\n\n\n\n return html`<span @mouseover=${onmouseover} @mouseout=${onmouseout}>${this.value}</span> `\n }\n}"]}
|