Browse Source
Improve inline filter (#1315)
* Fix UI bugs.
* Improve inline filter.
master
Sebastian Stehle
3 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with
15 additions and
6 deletions
-
backend/src/Squidex.Domain.Apps.Core.Model/Contents/SquidexRichText.cs
-
frontend/package-lock.json
-
frontend/package.json
-
frontend/src/app/shared/components/search/search-form.component.ts
-
frontend/src/app/shared/state/queries.ts
-
frontend/src/app/theme/_common.scss
|
|
|
@ -14,6 +14,8 @@ public static class SquidexRichText |
|
|
|
public static class NodeTypes |
|
|
|
{ |
|
|
|
public const string ContentLink = "contentLink"; |
|
|
|
|
|
|
|
public const string PlainHtml = "plainHtml"; |
|
|
|
} |
|
|
|
|
|
|
|
private class ExtendedOptions : RichTextOptions |
|
|
|
@ -40,6 +42,7 @@ public static class SquidexRichText |
|
|
|
[ |
|
|
|
..RichTextOptions.Default.NodeTypes, |
|
|
|
NodeTypes.ContentLink, |
|
|
|
NodeTypes.PlainHtml, |
|
|
|
], |
|
|
|
MarkTypes = RichTextOptions.Default.MarkTypes, |
|
|
|
}; |
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ |
|
|
|
"mousetrap": "1.6.5", |
|
|
|
"ng2-charts": "^8.0.0", |
|
|
|
"ngx-doc-viewer": "15.0.1", |
|
|
|
"ngx-inline-filter": "^0.3.0", |
|
|
|
"ngx-inline-filter": "^0.4.4", |
|
|
|
"ngx-scrollbar": "^19.1.4", |
|
|
|
"ngx-ui-tour-core": "16.0.0", |
|
|
|
"oidc-client-ts": "^3.4.1", |
|
|
|
@ -18559,9 +18559,9 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
"node_modules/ngx-inline-filter": { |
|
|
|
"version": "0.3.0", |
|
|
|
"resolved": "https://registry.npmjs.org/ngx-inline-filter/-/ngx-inline-filter-0.3.0.tgz", |
|
|
|
"integrity": "sha512-Yb4VIt4+QrEXr5LYQSEx0nQlM/Aj0udGk1ncdGVKNYY6YwrjgCVk8UiJFk+b1WMWWJW2O3uayl/JTkBMeqsHwA==", |
|
|
|
"version": "0.4.4", |
|
|
|
"resolved": "https://registry.npmjs.org/ngx-inline-filter/-/ngx-inline-filter-0.4.4.tgz", |
|
|
|
"integrity": "sha512-QN+MKMG96tyt9tUPEO3MNlxPp5KgSveUyynVjIU2TcuR0h5EwbbfpMtbefJIuedH5Mz66lks5T04od7unTjjZA==", |
|
|
|
"dependencies": { |
|
|
|
"tslib": "^2.3.0" |
|
|
|
}, |
|
|
|
|
|
|
|
@ -50,7 +50,7 @@ |
|
|
|
"mousetrap": "1.6.5", |
|
|
|
"ng2-charts": "^8.0.0", |
|
|
|
"ngx-doc-viewer": "15.0.1", |
|
|
|
"ngx-inline-filter": "^0.3.0", |
|
|
|
"ngx-inline-filter": "^0.4.4", |
|
|
|
"ngx-scrollbar": "^19.1.4", |
|
|
|
"ngx-ui-tour-core": "16.0.0", |
|
|
|
"oidc-client-ts": "^3.4.1", |
|
|
|
|
|
|
|
@ -99,10 +99,12 @@ export class SearchFormComponent { |
|
|
|
addComparison: localizer.getOrKey('search.addFilter'), |
|
|
|
addGroup: localizer.getOrKey('search.addGroup'), |
|
|
|
addSorting: localizer.getOrKey('search.addSorting'), |
|
|
|
apply: localizer.getOrKey('common.search'), |
|
|
|
and: 'AND', |
|
|
|
not: 'NOT', |
|
|
|
noResults: ' - ', |
|
|
|
or: 'OR', |
|
|
|
reset: localizer.getOrKey('common.reset'), |
|
|
|
save: localizer.getOrKey('common.save'), |
|
|
|
searchPlaceholder: localizer.getOrKey('common.search'), |
|
|
|
searchShortcut: 'CTRL + I', |
|
|
|
|
|
|
|
@ -24,7 +24,7 @@ export interface SavedQuery { |
|
|
|
|
|
|
|
const OLDEST_FIRST: Query = { |
|
|
|
sort: [ |
|
|
|
{ path: 'lastModified', order: 'descending' }, |
|
|
|
{ path: 'lastModified', order: 'ascending' }, |
|
|
|
], |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -63,6 +63,10 @@ hr { |
|
|
|
@include no-drag; |
|
|
|
} |
|
|
|
|
|
|
|
.nf-input-dropdown-content { |
|
|
|
line-height: 1.5rem; |
|
|
|
} |
|
|
|
|
|
|
|
// |
|
|
|
// Rich editor icon. Must be placed here, because element is not created by angular. |
|
|
|
// |
|
|
|
|