Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
This commit is contained in:
commit
232c6bbdf1
@ -337,11 +337,19 @@ class PureHome extends React.Component {
|
|||||||
secondaryProgressDataStoreIcon,
|
secondaryProgressDataStoreIcon,
|
||||||
itemsSelectionLength,
|
itemsSelectionLength,
|
||||||
itemsSelectionTitle,
|
itemsSelectionTitle,
|
||||||
|
refreshFiles,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
if (this.props.isHeaderVisible !== prevProps.isHeaderVisible) {
|
if (this.props.isHeaderVisible !== prevProps.isHeaderVisible) {
|
||||||
this.props.setHeaderVisible(this.props.isHeaderVisible);
|
this.props.setHeaderVisible(this.props.isHeaderVisible);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isProgressFinished !== prevProps.isProgressFinished) {
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log("render refresh", refreshFiles());
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
isProgressFinished &&
|
isProgressFinished &&
|
||||||
itemsSelectionTitle &&
|
itemsSelectionTitle &&
|
||||||
|
@ -1128,8 +1128,9 @@ class FilesStore {
|
|||||||
return newFilter;
|
return newFilter;
|
||||||
};
|
};
|
||||||
|
|
||||||
refreshFiles = () => {
|
refreshFiles = async () => {
|
||||||
return this.fetchFiles(this.selectedFolderStore.id, this.filter);
|
const res = await this.fetchFiles(this.selectedFolderStore.id, this.filter);
|
||||||
|
return res;
|
||||||
};
|
};
|
||||||
|
|
||||||
fetchFiles = (
|
fetchFiles = (
|
||||||
|
@ -179,8 +179,13 @@ public class CustomNamingPeople
|
|||||||
|
|
||||||
public string Substitute<T>(string resourceKey) where T : class
|
public string Substitute<T>(string resourceKey) where T : class
|
||||||
{
|
{
|
||||||
var text = (string)typeof(T).GetProperty(resourceKey, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic).GetValue(null, null);
|
var prop = typeof(T).GetProperty(resourceKey, BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
|
||||||
return Substitute(text);
|
if (prop != null)
|
||||||
|
{
|
||||||
|
var text = (string)prop.GetValue(null, null);
|
||||||
|
return Substitute(text);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Substitute(string text)
|
public string Substitute(string text)
|
||||||
|
Loading…
Reference in New Issue
Block a user