@mixd-id/web-scaffold 0.1.230406278 → 0.1.230406280
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/package.json
CHANGED
package/src/components/Alert.vue
CHANGED
|
@@ -574,6 +574,12 @@ const chartToSequelizeWhere = async (chart, opt) => {
|
|
|
574
574
|
order = literal(`DATE_FORMAT(${model.name}.${field}, \"%Y-%m-%d\")`)
|
|
575
575
|
break
|
|
576
576
|
|
|
577
|
+
case 'hour':
|
|
578
|
+
attributes.push([literal(`DATE_FORMAT(${model.name}.${field}, "%H")`), xAxis[0].key])
|
|
579
|
+
group.push(literal(`DATE_FORMAT(${model.name}.${field}, "%H")`))
|
|
580
|
+
order = literal(`DATE_FORMAT(${model.name}.${field}, \"%H\")`)
|
|
581
|
+
break
|
|
582
|
+
|
|
577
583
|
default:
|
|
578
584
|
attributes.push([literal(`${model.name}.${field}`), xAxe.key])
|
|
579
585
|
group.push(literal(`${model.name}.${field}`))
|
|
@@ -20,21 +20,12 @@ const sortsFn = function(a, b, sorts, index){
|
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
const pickColumns = function(columns, keys){
|
|
23
|
-
if(!Array.isArray(columns)) return
|
|
23
|
+
if(!Array.isArray(columns)) return []
|
|
24
24
|
|
|
25
|
-
const picked =
|
|
25
|
+
const picked = JSON.parse(JSON.stringify(columns))
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
.
|
|
29
|
-
acc[column.key] = column
|
|
30
|
-
return acc
|
|
31
|
-
}, {})
|
|
32
|
-
|
|
33
|
-
for(let key of keys){
|
|
34
|
-
if(groupedColumns[key]){
|
|
35
|
-
groupedColumns[key].visible = true
|
|
36
|
-
picked.push(groupedColumns[key])
|
|
37
|
-
}
|
|
27
|
+
for(let idx in picked){
|
|
28
|
+
picked[idx].visible = keys.includes(picked[idx].key)
|
|
38
29
|
}
|
|
39
30
|
|
|
40
31
|
return picked
|
package/src/utils/wss.js
CHANGED
|
@@ -159,9 +159,7 @@ class WSS extends EventEmitter2{
|
|
|
159
159
|
data = arr.length > 0 ? JSON.parse(JSON.stringify(arr.pop())) : data
|
|
160
160
|
}
|
|
161
161
|
catch(e){
|
|
162
|
-
|
|
163
|
-
process.verbose('wss.error', e)
|
|
164
|
-
}
|
|
162
|
+
'$report' in process ? process.$report(e) : console.error(e)
|
|
165
163
|
|
|
166
164
|
status = 500
|
|
167
165
|
data = {
|
package/src/utils/wss.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div :class="$style.comp" v-if="config">
|
|
3
3
|
|
|
4
|
-
<TransitionGroup name="openltr" tag="div">
|
|
4
|
+
<TransitionGroup name="openltr" tag="div" class="flex-1 flex">
|
|
5
5
|
|
|
6
6
|
<div v-if="$route.hash.indexOf(this.editHash) < 0" key="panel1" class="flex-1 flex flex-col">
|
|
7
7
|
|
|
@@ -274,6 +274,7 @@
|
|
|
274
274
|
@change="apply()">
|
|
275
275
|
<option value="none">None</option>
|
|
276
276
|
<option value="date">Date</option>
|
|
277
|
+
<option value="hour">Hour</option>
|
|
277
278
|
</Dropdown>
|
|
278
279
|
</div>
|
|
279
280
|
<button type="button" @click="xAxis.splice(index, 1); apply()">
|