+
+
:
+ null
+ }
+ {this.props.customControls}
+
+ +
{this.props.children}
diff --git a/public/files/js/views/document/style.tsx b/public/files/js/views/document/style.tsx
index dacfac8c97..f5d9fa99d9 100644
--- a/public/files/js/views/document/style.tsx
+++ b/public/files/js/views/document/style.tsx
@@ -106,6 +106,25 @@ export const CloseableFrame = styled.section<{fixedTop?: string}>`
}
}
+ .custom-controls {
+ padding-top: 0.2em;
+ padding-bottom: 0.2em;
+
+ .buttons {
+ display: flex;
+ align-items: center;
+ }
+
+ hr {
+ margin: 0;
+ padding: 0;
+ }
+
+ a img {
+ width: 2em;
+ }
+ }
+
.contents {
flex-grow: 1;
diff --git a/public/files/js/views/searchHistory/full/fulltextForms.tsx b/public/files/js/views/searchHistory/full/fulltextForms.tsx
index 7096017de9..cb5f46183f 100644
--- a/public/files/js/views/searchHistory/full/fulltextForms.tsx
+++ b/public/files/js/views/searchHistory/full/fulltextForms.tsx
@@ -29,10 +29,13 @@ export interface ExtendedSearchForms {
fsQueryCQLProps:boolean;
fsPosattrName:string;
fsPosattrValue:string;
+ fsPosattrValueIsSub:boolean;
fsStructureName:string;
fsStructattrName:string;
fsStructattrValue:string;
+ fsStructattrValueIsSub:boolean;
fsAnyPropertyValue:string;
+ fsAnyPropertyValueIsSub:boolean;
fsCorpus:string;
fsSubcorpus:string;
}>;
@@ -40,16 +43,20 @@ export interface ExtendedSearchForms {
fsQueryCQLProps:boolean;
fsPosattrName:string;
fsPosattrValue:string;
+ fsPosattrValueIsSub:boolean;
fsStructureName:string;
fsStructattrName:string;
fsStructattrValue:string;
+ fsStructattrValueIsSub:boolean;
fsAnyPropertyValue:string;
+ fsAnyPropertyValueIsSub:boolean;
fsCorpus:string;
fsSubcorpus:string;
}>;
WListForm:React.FC<{
fsQueryCQLProps:boolean;
fsAnyPropertyValue:string;
+ fsAnyPropertyValueIsSub:boolean;
fsCorpus:string;
fsSubcorpus:string;
wlattr:string;
@@ -59,6 +66,7 @@ export interface ExtendedSearchForms {
}>;
KWordsForm:React.FC<{
fsAnyPropertyValue:string;
+ fsAnyPropertyValueIsSub:boolean;
fsQueryCQLProps:boolean;
fsCorpus:string;
fsSubcorpus:string;
@@ -66,6 +74,7 @@ export interface ExtendedSearchForms {
}>;
AnyForm:React.FC<{
fsAnyPropertyValue:string;
+ fsAnyPropertyValueIsSub:boolean;
fsCorpus:string;
fsSubcorpus:string;
}>;
@@ -86,6 +95,7 @@ export function init(
const AnyPropertyValue:React.FC<{
value:string;
+ isSubstr:boolean;
}> = (props) => {
const handleValueChange = (evt:React.ChangeEvent) => {
@@ -97,6 +107,15 @@ export function init(
);
};
+ const handleVariantChange = (evt:React.ChangeEvent) => {
+ dispatcher.dispatch(
+ Actions.SetFsAnyPropertyValueIsSub,
+ {
+ value: evt.target.value === "1"
+ }
+ );
+ };
+
const inputStyle:React.CSSProperties = {
width: '20em',
height: '1.8em',
@@ -106,7 +125,13 @@ export function init(
return (
<>
-
+ ) => {
@@ -138,9 +164,28 @@ export function init(
);
};
+ const handleSubSelChange = (evt:React.ChangeEvent) => {
+ dispatcher.dispatch(
+ Actions.SetFsPosattrValueIsSub,
+ {
+ value: evt.target.value === "1"
+ }
+ );
+ };
+
return (
<>
-
+ ) => {
@@ -196,15 +242,26 @@ export function init(
);
};
+ const handleSubSelChange = (evt:React.ChangeEvent) => {
+ dispatcher.dispatch(
+ Actions.SetFsStructattrValueIsSub,
+ {
+ value: evt.target.value === "1"
+ }
+ );
+ };
+
return (
<>
-
+ ({he.translate('qhistory__any_search_note')}) :
null
}
-
+
+
+ );
+ };
+
// -------------------- = (props) => {
+ const RecentQueriesPageList:React.FCvoid}> = (props) => {
return (
-
-
+
+
}
-
+
+
);
}
return {
- RecentQueriesPageList: Bound(RecentQueriesPageList, queryHistoryModel)
+ RecentQueriesPageList: BoundWithProps<{onCloseClick: ()=>void}, SearchHistoryModelState>(RecentQueriesPageList, queryHistoryModel)
};
}
\ No newline at end of file
diff --git a/public/files/js/views/searchHistory/full/srchFields.tsx b/public/files/js/views/searchHistory/full/srchFields.tsx
index 2efd7f2380..5c41cfdf81 100644
--- a/public/files/js/views/searchHistory/full/srchFields.tsx
+++ b/public/files/js/views/searchHistory/full/srchFields.tsx
@@ -171,27 +171,34 @@ export function init(
return {
+ const HistoryContainer:React.FC = (props) => {
- _isActiveItem(itemName) {
- return this.props.activeItem && this.props.activeItem.actionName === itemName;
- }
-
- _isActive() {
- return this._isActiveItem(MainMenuActions.ShowQueryHistory.name);
- }
+ const _isActive = () => {
+ return props.activeItem &&
+ props.activeItem.actionName === MainMenuActions.ShowQueryHistory.name;
+ };
- _handleCloseClick() {
+ const _handleCloseClick = () => {
dispatcher.dispatch({
name: MainMenuActions.ClearActiveItem.name
});
- }
-
- _renderForm() {
- if (this._isActive()) {
- return
-
- {this._renderForm()}
-
- ;
-
- } else if (this.props.isBusy) {
- return
- undefined}
- customClass="OptionsContainer busy">
-
- ;
-
- } else {
- return null;
- }
+ };
+
+ if (_isActive()) {
+ return
+ undefined}
+ customClass="OptionsContainer busy">
+
+ ;
+
+ } else {
+ return null;
}
}
diff --git a/requirements.txt b/requirements.txt
index 4ce8eba7dc..c0f2087985 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,7 @@ PyICU >= 1.5
babel >= 2.9.1
jinja2 >= 2.11.3
secure-cookie >= 0.1.0
+setuptools == 59.6.0
sanic >= 22.12.0
pyJWT >= 2.6.0
# please note that lxml package requires the following system packages:
@@ -22,7 +23,7 @@ uvloop >= 0.16.0
mysql-connector-python >= 8.4.0, < 9.0.0
aiofiles >= 0.8.0
aiocsv >= 1.2.2
-aiohttp >= 3.8.2
+aiohttp >= 3.10.2
dataclasses-json >= 0.5.7
couchdb >= 1.2
cairosvg >= 2.5.3
+
+ :
+
@@ -118,6 +143,7 @@ export function init(
const UsedPosattrs:React.FC<{
attr:string;
value:string;
+ isSubstr:boolean;
}> = (props) => {
const handleAttrChange = (evt:React.ChangeEvent
+
+ :
+
@@ -176,6 +221,7 @@ export function init(
const UsedStructattrs:React.FC<{
attr:string;
value:string;
+ isSubstr:boolean;
}> = (props) => {
const handleAttrChange = (evt:React.ChangeEvent
+
+ :
+
-
+
);
@@ -286,10 +343,13 @@ export function init(
fsQueryCQLProps:boolean;
fsPosattrName:string;
fsPosattrValue:string;
+ fsPosattrValueIsSub:boolean;
fsStructureName:string;
fsStructattrName:string;
fsStructattrValue:string;
+ fsStructattrValueIsSub:boolean;
fsAnyPropertyValue:string;
+ fsAnyPropertyValueIsSub:boolean;
fsCorpus:string;
fsSubcorpus:string;
}> = (props) => {
@@ -300,13 +360,16 @@ export function init(
+
+
@@ -720,33 +733,94 @@ export function init(
);
};
+ // --------------------
+
+
+ );
+ }
+
+ // -------------------- + Při hledání dotazů se prohledávají jejich jednotlivé části: +
-
+
- poziční atributy [A] +
- hodnoty pozičních atributů [B] +
- struktury [C] (včetně tech vybraných v sekci "Omezit hledání") +
- strukturní atributy [D] (včetně tech vybraných v sekci "Omezit hledání") +
- hodnoty strukturních atributů [E] (včetně tech vybraných v sekci "Omezit hledání") + +
+ })
+