@operato/app 2.0.0-alpha.147 → 2.0.0-alpha.149
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 +17 -0
- package/demo/data-grist-test.html +1 -1
- package/dist/src/filter-renderer/filter-resource-select.js +9 -9
- package/dist/src/filter-renderer/filter-resource-select.js.map +1 -1
- package/dist/src/filters-form/filter-resource-select.js +10 -10
- package/dist/src/filters-form/filter-resource-select.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +12 -12
- package/src/filter-renderer/filter-resource-select.ts +53 -52
- package/src/filters-form/filter-resource-select.ts +44 -44
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@operato/app",
|
|
3
3
|
"description": "WebApplication production supporting components following open-wc recommendations",
|
|
4
4
|
"author": "heartyoh",
|
|
5
|
-
"version": "2.0.0-alpha.
|
|
5
|
+
"version": "2.0.0-alpha.149",
|
|
6
6
|
"main": "dist/src/index.js",
|
|
7
7
|
"module": "dist/src/index.js",
|
|
8
8
|
"exports": {
|
|
@@ -134,17 +134,17 @@
|
|
|
134
134
|
"@graphql-tools/delegate": "^10.0.1",
|
|
135
135
|
"@graphql-tools/wrap": "^8.5.0",
|
|
136
136
|
"@material/web": "^1.4.0",
|
|
137
|
-
"@operato/attachment": "^2.0.0-alpha.
|
|
138
|
-
"@operato/data-grist": "^2.0.0-alpha.
|
|
139
|
-
"@operato/font": "^2.0.0-alpha.
|
|
140
|
-
"@operato/form": "^2.0.0-alpha.
|
|
137
|
+
"@operato/attachment": "^2.0.0-alpha.149",
|
|
138
|
+
"@operato/data-grist": "^2.0.0-alpha.149",
|
|
139
|
+
"@operato/font": "^2.0.0-alpha.149",
|
|
140
|
+
"@operato/form": "^2.0.0-alpha.149",
|
|
141
141
|
"@operato/graphql": "^2.0.0-alpha.145",
|
|
142
|
-
"@operato/i18n": "^2.0.0-alpha.
|
|
143
|
-
"@operato/input": "^2.0.0-alpha.
|
|
144
|
-
"@operato/layout": "^2.0.0-alpha.
|
|
145
|
-
"@operato/property-editor": "^2.0.0-alpha.
|
|
146
|
-
"@operato/shell": "^2.0.0-alpha.
|
|
147
|
-
"@operato/styles": "^2.0.0-alpha.
|
|
142
|
+
"@operato/i18n": "^2.0.0-alpha.148",
|
|
143
|
+
"@operato/input": "^2.0.0-alpha.149",
|
|
144
|
+
"@operato/layout": "^2.0.0-alpha.149",
|
|
145
|
+
"@operato/property-editor": "^2.0.0-alpha.149",
|
|
146
|
+
"@operato/shell": "^2.0.0-alpha.149",
|
|
147
|
+
"@operato/styles": "^2.0.0-alpha.149",
|
|
148
148
|
"@operato/utils": "^2.0.0-alpha.145",
|
|
149
149
|
"cm6-graphql": "^0.0.14",
|
|
150
150
|
"codemirror": "^6.0.1",
|
|
@@ -186,5 +186,5 @@
|
|
|
186
186
|
"prettier --write"
|
|
187
187
|
]
|
|
188
188
|
},
|
|
189
|
-
"gitHead": "
|
|
189
|
+
"gitHead": "ae0a8ae9e4627a09783ea436f2498bd80880a736"
|
|
190
190
|
}
|
|
@@ -54,9 +54,9 @@ function openResourceSelector(column: ColumnConfig, value: any, confirmCallback:
|
|
|
54
54
|
export const FilterResourceSelect: FilterSelectRenderer = (column, value, owner: any) => {
|
|
55
55
|
const filter = column.filter as FilterConfigObject
|
|
56
56
|
const { operator = 'like' } = filter
|
|
57
|
-
var { idField = 'id', nameField = 'name', descriptionField = 'description' } = column.record.options || {}
|
|
58
|
-
const hideValue = value ? value[idField] : ''
|
|
59
|
-
const text = value ? value[nameField] : ''
|
|
57
|
+
var { idField = 'id', nameField = 'name', descriptionField = 'description' } = column.record.options || {}
|
|
58
|
+
const hideValue = value ? value[idField] : ''
|
|
59
|
+
const text = value ? value[nameField] : ''
|
|
60
60
|
|
|
61
61
|
return operator === 'like'
|
|
62
62
|
? html` <input
|
|
@@ -79,54 +79,55 @@ export const FilterResourceSelect: FilterSelectRenderer = (column, value, owner:
|
|
|
79
79
|
}}
|
|
80
80
|
/>`
|
|
81
81
|
: operator == 'in'
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
input.value = disp;
|
|
104
|
-
|
|
105
|
-
let codeInput = owner.tagName.toLowerCase() == 'ox-grid-header'
|
|
106
|
-
? owner.renderRoot.querySelector(`[name="${column.name}"]`)
|
|
107
|
-
: owner.renderRoot.querySelector(`form [name="${column.name}"]`);
|
|
108
|
-
|
|
109
|
-
const objectValue = selected ? selected[idField] : '';
|
|
110
|
-
codeInput.value = objectValue;
|
|
111
|
-
|
|
112
|
-
input.dispatchEvent(new Event('change', { bubbles: true }))
|
|
113
|
-
|
|
114
|
-
owner.dispatchEvent(
|
|
115
|
-
new CustomEvent('filter-change', {
|
|
116
|
-
bubbles: true,
|
|
117
|
-
composed: true,
|
|
118
|
-
detail: {
|
|
119
|
-
name: column.name,
|
|
120
|
-
operator,
|
|
121
|
-
value: objectValue
|
|
82
|
+
? html``
|
|
83
|
+
: operator === 'eq'
|
|
84
|
+
? html`
|
|
85
|
+
<input name="${column.name}" .value=${hideValue} type="text" hidden />
|
|
86
|
+
<input
|
|
87
|
+
type="text"
|
|
88
|
+
name="${column.name}_disp"
|
|
89
|
+
.value=${text}
|
|
90
|
+
readonly
|
|
91
|
+
@click=${(e: Event) => {
|
|
92
|
+
e.stopPropagation()
|
|
93
|
+
|
|
94
|
+
const input = e.target as HTMLInputElement
|
|
95
|
+
|
|
96
|
+
const confirmCallback = (selected?: { [field: string]: any }) => {
|
|
97
|
+
let disp = selected ? selected[idField] : ''
|
|
98
|
+
|
|
99
|
+
if (selected && nameField) {
|
|
100
|
+
disp = selected[nameField]
|
|
122
101
|
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
102
|
+
|
|
103
|
+
input.value = disp
|
|
104
|
+
|
|
105
|
+
let codeInput =
|
|
106
|
+
owner.tagName.toLowerCase() == 'ox-grid-header'
|
|
107
|
+
? owner.renderRoot.querySelector(`[name="${column.name}"]`)
|
|
108
|
+
: owner.renderRoot.querySelector(`form [name="${column.name}"]`)
|
|
109
|
+
|
|
110
|
+
const objectValue = selected ? selected[idField] : ''
|
|
111
|
+
codeInput.value = objectValue
|
|
112
|
+
|
|
113
|
+
input.dispatchEvent(new Event('change', { bubbles: true }))
|
|
114
|
+
|
|
115
|
+
owner.dispatchEvent(
|
|
116
|
+
new CustomEvent('filter-change', {
|
|
117
|
+
bubbles: true,
|
|
118
|
+
composed: true,
|
|
119
|
+
detail: {
|
|
120
|
+
name: column.name,
|
|
121
|
+
operator,
|
|
122
|
+
value: objectValue
|
|
123
|
+
}
|
|
124
|
+
})
|
|
125
|
+
)
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
openResourceSelector(column, value, confirmCallback)
|
|
129
|
+
}}
|
|
130
|
+
/>
|
|
131
|
+
`
|
|
132
|
+
: html``
|
|
132
133
|
}
|
|
@@ -75,56 +75,56 @@ export const FilterResourceSelect: FilterSelectRenderer = (filter, value, owner:
|
|
|
75
75
|
? html``
|
|
76
76
|
: operator === 'eq'
|
|
77
77
|
? html`
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
78
|
+
<input name="${name}" .value=${hideValue} type="text" hidden />
|
|
79
|
+
<input
|
|
80
|
+
type="text"
|
|
81
|
+
name="${name}_disp"
|
|
82
|
+
.value=${text}
|
|
83
|
+
readonly
|
|
84
|
+
@change=${() => false}
|
|
85
|
+
@click=${(e: Event) => {
|
|
86
|
+
e.stopPropagation()
|
|
87
87
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
88
|
+
const input = e.target as HTMLInputElement
|
|
89
|
+
const codeInput =
|
|
90
|
+
owner.tagName.toLowerCase() == 'ox-grid-header'
|
|
91
|
+
? owner.renderRoot.querySelector(`[name="${name}"]`)
|
|
92
|
+
: owner.renderRoot.querySelector(`form [name="${name}"]`)
|
|
93
93
|
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
const confirmCallback = (selected?: { [field: string]: any }) => {
|
|
95
|
+
let disp = selected ? selected[idField] : ''
|
|
96
96
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
97
|
+
if (selected && nameField) {
|
|
98
|
+
disp = selected[nameField]
|
|
99
|
+
}
|
|
100
|
+
input.value = disp
|
|
101
101
|
|
|
102
|
-
|
|
103
|
-
|
|
102
|
+
const value = selected ? selected[idField] : ''
|
|
103
|
+
codeInput.value = value
|
|
104
104
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
codeInput.dispatchEvent(
|
|
106
|
+
new Event('change', {
|
|
107
|
+
bubbles: true,
|
|
108
|
+
composed: true
|
|
109
|
+
})
|
|
110
|
+
)
|
|
111
111
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
112
|
+
owner.dispatchEvent(
|
|
113
|
+
new CustomEvent('filter-change', {
|
|
114
|
+
bubbles: true,
|
|
115
|
+
composed: true,
|
|
116
|
+
detail: {
|
|
117
|
+
name: name,
|
|
118
|
+
operator,
|
|
119
|
+
value
|
|
120
|
+
}
|
|
121
|
+
})
|
|
122
|
+
)
|
|
123
|
+
}
|
|
124
124
|
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
125
|
+
openResourceSelector(filter, codeInput.value, confirmCallback)
|
|
126
|
+
}}
|
|
127
|
+
/>
|
|
128
|
+
`
|
|
129
129
|
: html``
|
|
130
130
|
}
|