ywana-core8 0.0.519 → 0.0.522
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/dist/index.cjs +10 -1
- package/dist/index.cjs.map +1 -1
- package/dist/index.modern.js +10 -1
- package/dist/index.modern.js.map +1 -1
- package/dist/index.umd.js +10 -1
- package/dist/index.umd.js.map +1 -1
- package/package.json +1 -1
- package/src/domain/TabbedTablePage.js +22 -13
- package/src/domain/TablePage.js +8 -1
package/package.json
CHANGED
@@ -36,16 +36,16 @@ export const TabbedTablePage = (props) => {
|
|
36
36
|
const timer = useRef(null)
|
37
37
|
const [form, setForm] = useState(selected)
|
38
38
|
const [tabs, setTabs] = useState([])
|
39
|
-
|
39
|
+
|
40
40
|
useEffect(async () => {
|
41
41
|
const field = Object.values(schema).find(field => field.tab && field.tab === true)
|
42
|
-
const tabs = field.options.map(option => Object.assign({}, option, { field: field.id}))
|
42
|
+
const tabs = field.options.map(option => Object.assign({}, option, { field: field.id }))
|
43
43
|
setTabs(tabs)
|
44
44
|
context.changeTab(tabs[0])
|
45
45
|
setPageContext(context)
|
46
46
|
}, [])
|
47
|
-
|
48
|
-
useEffect(
|
47
|
+
|
48
|
+
useEffect(async () => {
|
49
49
|
if (tab) {
|
50
50
|
const filter = { [tab.field]: tab.value }
|
51
51
|
await pageContext.load(filter, [])
|
@@ -151,7 +151,7 @@ export const TabbedTablePage = (props) => {
|
|
151
151
|
}
|
152
152
|
|
153
153
|
function renderTabs() {
|
154
|
-
const selected = tab ? tab.value : null
|
154
|
+
const selected = tab ? tab.value : null
|
155
155
|
return (
|
156
156
|
<Tabs selected={selected} onChange={changeTab} fillRight={true} fillLeft={false}>
|
157
157
|
{tabs.map(tab => <Tab id={tab.value} label={tab.label} />)}
|
@@ -179,7 +179,7 @@ export const TabbedTablePage = (props) => {
|
|
179
179
|
</menu>
|
180
180
|
) : null}
|
181
181
|
<main key={id} className="table-page">
|
182
|
-
<TableEditor icon={icon} title={name} tabs={renderTabs()} schema={schema} delay={delay} editable={editable} groupBy={groupBy} filter={tableFilter} actions={tableActions} canDelete={canDelete} className={tableClassName}/>
|
182
|
+
<TableEditor icon={icon} title={name} tabs={renderTabs()} schema={schema} delay={delay} editable={editable} groupBy={groupBy} filter={tableFilter} actions={tableActions} canDelete={canDelete} className={tableClassName} />
|
183
183
|
{children ? <article>{children}</article> : null}
|
184
184
|
</main>
|
185
185
|
{renderAside()}
|
@@ -326,10 +326,10 @@ const TableFilters = (props) => {
|
|
326
326
|
|
327
327
|
const likes = useMemo(() => {
|
328
328
|
const fields = Object.values(schema)
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
329
|
+
return fields.reduce((likes, field) => {
|
330
|
+
if (field.like === true) likes.push(field.id)
|
331
|
+
return likes
|
332
|
+
}, [])
|
333
333
|
}, [schema])
|
334
334
|
|
335
335
|
useEffect(() => {
|
@@ -446,6 +446,14 @@ export const TableEditor = (props) => {
|
|
446
446
|
|
447
447
|
function renderGroups() {
|
448
448
|
const items = filter ? filter(all) : all
|
449
|
+
|
450
|
+
if (items.length === 0) return (
|
451
|
+
<div className='empty-message'>
|
452
|
+
<Icon icon="search_off" />
|
453
|
+
<Text>No Result Found</Text>
|
454
|
+
</div>
|
455
|
+
)
|
456
|
+
|
449
457
|
const groups = items.reduce((groups, item) => {
|
450
458
|
const groupName = item[groupBy]
|
451
459
|
const group = groups[groupName]
|
@@ -453,6 +461,7 @@ export const TableEditor = (props) => {
|
|
453
461
|
groups[groupName].push(item)
|
454
462
|
return groups
|
455
463
|
}, {})
|
464
|
+
|
456
465
|
return Object.keys(groups).map(groupName => {
|
457
466
|
const table = {
|
458
467
|
columns: Object.values(schema)
|
@@ -492,7 +501,7 @@ export const TableEditor = (props) => {
|
|
492
501
|
<Header title={title} >
|
493
502
|
<span className="size">{groupSize}</span>
|
494
503
|
</Header>
|
495
|
-
<DataTable {...table} onRowSelection={select} editable={editable} onCheckAll={check} className={className}/>
|
504
|
+
<DataTable {...table} onRowSelection={select} editable={editable} onCheckAll={check} className={className} />
|
496
505
|
</Fragment>
|
497
506
|
)
|
498
507
|
})
|
@@ -550,7 +559,7 @@ const TableContext = (url, field, host, urlQuery) => {
|
|
550
559
|
|
551
560
|
return filters;
|
552
561
|
}, {}) : []
|
553
|
-
|
562
|
+
|
554
563
|
if (this.tab) {
|
555
564
|
filters[this.tab.field] = this.tab.value
|
556
565
|
}
|
@@ -670,7 +679,7 @@ const TableAPI = (url, host) => {
|
|
670
679
|
}, "")
|
671
680
|
return query.concat(param)
|
672
681
|
} else {
|
673
|
-
return like.includes(key) ? query.concat(`${key}=%${filters[key]}%&`) :
|
682
|
+
return like.includes(key) ? query.concat(`${key}=%${filters[key]}%&`) : query.concat(`${key}=${filters[key]}&`)
|
674
683
|
}
|
675
684
|
}, "")
|
676
685
|
queryParams = queryParams.concat(filterQuery)
|
package/src/domain/TablePage.js
CHANGED
@@ -90,7 +90,6 @@ export const TablePage = (props) => {
|
|
90
90
|
}
|
91
91
|
|
92
92
|
async function save() {
|
93
|
-
console.log('saving.....')
|
94
93
|
await pageContext.update(form)
|
95
94
|
setPageContext(Object.assign({}, pageContext))
|
96
95
|
}
|
@@ -412,6 +411,14 @@ export const TableEditor = (props) => {
|
|
412
411
|
|
413
412
|
function renderGroups() {
|
414
413
|
const items = filter ? filter(all) : all
|
414
|
+
|
415
|
+
if (items.length === 0) return (
|
416
|
+
<div className='empty-message'>
|
417
|
+
<Icon icon="search_off" />
|
418
|
+
<Text>No Result Found</Text>
|
419
|
+
</div>
|
420
|
+
)
|
421
|
+
|
415
422
|
const groups = items.reduce((groups, item) => {
|
416
423
|
const groupName = item[groupBy]
|
417
424
|
const group = groups[groupName]
|