@axelor/aos-mobile-core 9.1.7 → 9.1.8
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/lib/apiProviders/File/AopFileApi.js +11 -3
- package/lib/apiProviders/File/AopFileApi.js.map +1 -1
- package/lib/apiProviders/File/utils.js +8 -3
- package/lib/apiProviders/File/utils.js.map +1 -1
- package/lib/apiProviders/index.d.ts +7 -7
- package/lib/apiProviders/index.js.map +1 -1
- package/lib/app/ContextedApplication.js +2 -0
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/components/external/WebView/WebView.d.ts +5 -1
- package/lib/components/external/WebView/WebView.js +14 -5
- package/lib/components/external/WebView/WebView.js.map +1 -1
- package/lib/components/pages/CustomFieldForm/CustomFieldForm.d.ts +2 -2
- package/lib/components/pages/CustomFieldForm/CustomFieldForm.js +23 -13
- package/lib/components/pages/CustomFieldForm/CustomFieldForm.js.map +1 -1
- package/lib/forms/studio/api.helpers.d.ts +1 -1
- package/lib/forms/studio/api.helpers.js +9 -2
- package/lib/forms/studio/api.helpers.js.map +1 -1
- package/lib/forms/studio/display.helpers.d.ts +2 -2
- package/lib/forms/studio/display.helpers.js +44 -15
- package/lib/forms/studio/display.helpers.js.map +1 -1
- package/lib/forms/studio/formula.helpers.d.ts +1 -1
- package/lib/forms/studio/formula.helpers.js +6 -5
- package/lib/forms/studio/formula.helpers.js.map +1 -1
- package/lib/tools/FileViewer.js +2 -2
- package/lib/tools/FileViewer.js.map +1 -1
- package/lib/utils/file.d.ts +1 -0
- package/lib/utils/file.js +1 -0
- package/lib/utils/file.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/lib/webViews/WebViewPreloader.d.ts +3 -0
- package/lib/webViews/WebViewPreloader.js +111 -0
- package/lib/webViews/WebViewPreloader.js.map +1 -0
- package/lib/webViews/display.helpers.d.ts +5 -0
- package/lib/webViews/display.helpers.js +5 -0
- package/lib/webViews/display.helpers.js.map +1 -1
- package/lib/webViews/menu.helper.d.ts +2 -9
- package/lib/webViews/menu.helper.js +11 -4
- package/lib/webViews/menu.helper.js.map +1 -1
- package/lib/webViews/view/WebViewScreen.d.ts +3 -1
- package/lib/webViews/view/WebViewScreen.js +14 -10
- package/lib/webViews/view/WebViewScreen.js.map +1 -1
- package/lib/webViews/webView.provider.d.ts +28 -0
- package/lib/webViews/webView.provider.js +65 -0
- package/lib/webViews/webView.provider.js.map +1 -0
- package/package.json +3 -3
|
@@ -16,7 +16,8 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import RNFS from 'react-native-fs';
|
|
19
|
-
import {
|
|
19
|
+
import { sanitizeLocalFileName, showToastMessage } from '../../utils';
|
|
20
|
+
import { i18nProvider } from '../../i18n';
|
|
20
21
|
import { getNetInfo } from '../../api/net-info-utils';
|
|
21
22
|
import { binaryImageUrl, buildCookie, downloadUrlToPath, metaFileContentUrl, metaFileDownloadUrl, openLocalFile, saveUrlToDevice, } from './utils';
|
|
22
23
|
export class AopFileApi {
|
|
@@ -49,14 +50,21 @@ export class AopFileApi {
|
|
|
49
50
|
if (this.credentials?.baseUrl == null)
|
|
50
51
|
return null;
|
|
51
52
|
const url = metaFileContentUrl(this.credentials.baseUrl, ref);
|
|
52
|
-
const path = `${RNFS.DocumentDirectoryPath}/${
|
|
53
|
+
const path = `${RNFS.DocumentDirectoryPath}/${sanitizeLocalFileName(ref.fileName)}`;
|
|
53
54
|
const saved = await downloadUrlToPath(url, path, buildCookie(this.credentials));
|
|
54
55
|
return saved != null ? { path: saved, fileName: ref.fileName } : null;
|
|
55
56
|
}
|
|
56
57
|
async openInExternalApp(ref) {
|
|
57
58
|
const local = await this.getLocalCopy(ref);
|
|
58
|
-
if (local == null)
|
|
59
|
+
if (local == null) {
|
|
60
|
+
showToastMessage({
|
|
61
|
+
type: 'error',
|
|
62
|
+
position: 'bottom',
|
|
63
|
+
text1: i18nProvider.i18n.t('Auth_Error'),
|
|
64
|
+
text2: i18nProvider.i18n.t('Auth_CannotOpenFile'),
|
|
65
|
+
});
|
|
59
66
|
return;
|
|
67
|
+
}
|
|
60
68
|
await openLocalFile(local.path);
|
|
61
69
|
}
|
|
62
70
|
async saveToDevice(ref) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AopFileApi.js","sourceRoot":"","sources":["../../../src/apiProviders/File/AopFileApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"AopFileApi.js","sourceRoot":"","sources":["../../../src/apiProviders/File/AopFileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,9 +89,14 @@ export async function openLocalFile(path, translate = defaultTranslate) {
|
|
|
89
89
|
}
|
|
90
90
|
export async function downloadUrlToPath(url, toFile, cookie) {
|
|
91
91
|
try {
|
|
92
|
-
await
|
|
93
|
-
|
|
94
|
-
|
|
92
|
+
const res = await RNFetchBlob.config({ path: toFile }).fetch('GET', url, {
|
|
93
|
+
Cookie: cookie,
|
|
94
|
+
});
|
|
95
|
+
const { status } = res.info();
|
|
96
|
+
if (status >= 200 && status < 300)
|
|
97
|
+
return toFile;
|
|
98
|
+
await RNFS.unlink(toFile).catch(() => { });
|
|
99
|
+
return null;
|
|
95
100
|
}
|
|
96
101
|
catch {
|
|
97
102
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/apiProviders/File/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/apiProviders/File/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,kBAAkB,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAK/D,MAAM,gBAAgB,GAAc,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEpE,MAAM,eAAe,GAAG,6BAA6B,CAAC;AAEtD,MAAM,UAAU,WAAW,CAAC,WAAgC;IAC1D,OAAO,cAAc,WAAW,EAAE,KAAK,KAAK,WAAW,EAAE,UAAU,EAAE,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,GAAY;IAC9D,OAAO,GAAG,CAAC,UAAU,KAAK,KAAK;QAC7B,CAAC,CAAC,GAAG,OAAO,iBAAiB,GAAG,CAAC,EAAE,EAAE;QACrC,CAAC,CAAC,GAAG,OAAO,WAAW,eAAe,IAAI,GAAG,CAAC,EAAE,mBAAmB,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe,EAAE,GAAY;IAC/D,OAAO,GAAG,CAAC,UAAU,KAAK,KAAK;QAC7B,CAAC,CAAC,GAAG,OAAO,mBAAmB,GAAG,CAAC,EAAE,EAAE;QACvC,CAAC,CAAC,GAAG,OAAO,WAAW,eAAe,IAAI,GAAG,CAAC,EAAE,mBAAmB,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,GAAmB;IACjE,MAAM,aAAa,GACjB,GAAG,CAAC,OAAO,IAAI,IAAI;QACjB,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,aAAa,GAAG,CAAC,EAAE,gBAAgB,GAAG,CAAC,KAAK,GAAG;QACjE,CAAC,CAAC,EAAE,CAAC;IACT,OAAO,GAAG,OAAO,WAAW,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,KAAK,aAAa,aAAa,YAAY,CAAC;AACrG,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB;IACxC,OAAO,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,QAAgB;IAEhB,MAAM,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,IAAI,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IAE7E,IAAI,QAAQ,GAAG,GAAG,QAAQ,IAAI,QAAQ,IAAI,SAAS,EAAE,CAAC;IACtD,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,QAAQ,GAAG,GAAG,QAAQ,IAAI,QAAQ,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,YAAuB,gBAAgB;IAEvC,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAC9C,kBAAkB,CAAC,WAAW,CAAC,sBAAsB,EACrD;YACE,KAAK,EAAE,SAAS,CAAC,gCAAgC,CAAC;YAClD,OAAO,EAAE,SAAS,CAAC,+BAA+B,CAAC;YACnD,cAAc,EAAE,SAAS,CAAC,SAAS,CAAC;YACpC,cAAc,EAAE,SAAS,CAAC,aAAa,CAAC;SACzC,CACF,CAAC;QACF,OAAO,OAAO,KAAK,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,YAAuB,gBAAgB;IAEvC,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,gBAAgB,CAAC;YACf,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;YAC9B,KAAK,EAAE,SAAS,CAAC,qBAAqB,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAW,EACX,MAAc,EACd,MAAc;IAEd,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE;YACrE,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QACH,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAE5B,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG;YAAE,OAAO,MAAM,CAAC;QAEjD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,QAAgB,EAChB,MAAc,EACd,YAAuB,gBAAgB;IAEvC,IAAI,CAAC,CAAC,MAAM,wBAAwB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACjD,gBAAgB,CAAC;YACf,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;YAC9B,KAAK,EAAE,SAAS,CAAC,+BAA+B,CAAC;SAClD,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAC,MAAM,EAAE,EAAE,EAAC,GAAG,WAAW,CAAC;IACjC,MAAM,GAAG,GACP,QAAQ,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC;IAC1E,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAEpD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC;YACvB,SAAS,EAAE,IAAI;YACf,IAAI;YACJ,iBAAiB,EAAE,IAAI;YACvB,mBAAmB,EAAE;gBACnB,kBAAkB,EAAE,IAAI;gBACxB,YAAY,EAAE,IAAI;gBAClB,KAAK,EAAE,QAAQ;gBACf,IAAI;gBACJ,WAAW,EAAE,QAAQ;gBACrB,cAAc,EAAE,IAAI;aACrB;SACF,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;QAEvC,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC,CAAC,KAAK,CACtE,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;QACJ,CAAC;QAED,gBAAgB,CAAC;YACf,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC;YAChC,KAAK,EAAE,SAAS,CACd,QAAQ,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CACrE;SACF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,gBAAgB,CAAC;YACf,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;YAC9B,KAAK,EAAE,SAAS,CAAC,sBAAsB,CAAC;SACzC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
5
|
-
export * from
|
|
6
|
-
export { apiProviderConfig, ApiProviderConfig } from
|
|
7
|
-
export { generateFetchRecordCases, generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from
|
|
1
|
+
export * from './Action';
|
|
2
|
+
export * from './File';
|
|
3
|
+
export * from './Model';
|
|
4
|
+
export * from './Standard';
|
|
5
|
+
export * from './middlewares';
|
|
6
|
+
export { apiProviderConfig, ApiProviderConfig } from './config';
|
|
7
|
+
export { generateFetchRecordCases, generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC9D,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAC5B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
|
|
@@ -30,6 +30,7 @@ import { useDispatch, useSelector } from '../redux/hooks';
|
|
|
30
30
|
import { setAppVersion } from '../features/authSlice';
|
|
31
31
|
import { MaintenanceTrigger } from '../apiProviders';
|
|
32
32
|
import { resetConfigs } from '../features/appConfigSlice';
|
|
33
|
+
import WebViewPreloader from '../webViews/WebViewPreloader';
|
|
33
34
|
const ContextedApplication = ({ modules, mainMenu, version, configuration, customLoginPage, }) => {
|
|
34
35
|
const dispatch = useDispatch();
|
|
35
36
|
const { logged } = useSelector(state => state.auth);
|
|
@@ -62,6 +63,7 @@ const ContextedApplication = ({ modules, mainMenu, version, configuration, custo
|
|
|
62
63
|
<LoadingIndicator />
|
|
63
64
|
<BlockInteractionMessage />
|
|
64
65
|
<GlobalToolBox />
|
|
66
|
+
<WebViewPreloader />
|
|
65
67
|
<RootNavigator modules={modules} mainMenu={mainMenu} onRefresh={handleAppRefresh} configuration={configuration} customLoginPage={customLoginPage}/>
|
|
66
68
|
</NavigationContainer>
|
|
67
69
|
</ErrorBoundary>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,uBAAuB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,UAAU,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,OAAO,EACL,MAAM,EACN,aAAa,EACb,cAAc,EACd,OAAO,EACP,KAAK,GACN,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,10 @@ interface WebViewProps {
|
|
|
4
4
|
baseUrl?: string;
|
|
5
5
|
path?: string;
|
|
6
6
|
queryParams?: Object;
|
|
7
|
+
injectedJavaScript?: string;
|
|
8
|
+
onMessage?: (event: any) => void;
|
|
9
|
+
onLoadEnd?: () => void;
|
|
10
|
+
onError?: () => void;
|
|
7
11
|
}
|
|
8
|
-
declare const WebView: ({ style, baseUrl, path, queryParams }: WebViewProps) => React.JSX.Element;
|
|
12
|
+
declare const WebView: ({ style, baseUrl, path, queryParams, injectedJavaScript, onMessage, onLoadEnd, onError, }: WebViewProps) => React.JSX.Element;
|
|
9
13
|
export default WebView;
|
|
@@ -19,18 +19,20 @@ import React, { useMemo } from 'react';
|
|
|
19
19
|
import { ActivityIndicator, StyleSheet } from 'react-native';
|
|
20
20
|
import { WebView as RNWebView } from 'react-native-webview';
|
|
21
21
|
import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { useOnline } from '../../../features/onlineSlice';
|
|
23
|
+
import { buildCookie } from '../../../apiProviders';
|
|
22
24
|
import { useSelector } from '../../../redux/hooks';
|
|
23
25
|
import { checkNullString } from '../../../utils';
|
|
24
|
-
const WebView = ({ style, baseUrl, path, queryParams }) => {
|
|
26
|
+
const WebView = ({ style, baseUrl, path, queryParams, injectedJavaScript, onMessage, onLoadEnd, onError, }) => {
|
|
25
27
|
const Colors = useThemeColor();
|
|
26
|
-
const {
|
|
28
|
+
const { isConnected } = useOnline();
|
|
29
|
+
const { baseUrl: AOSBaseUrl, token, jsessionId, } = useSelector(state => state.auth);
|
|
27
30
|
const formattedQueryParams = useMemo(() => {
|
|
28
31
|
let _formattedQueryParams = '';
|
|
29
32
|
if (queryParams != null) {
|
|
30
33
|
Object.entries(queryParams).map(([key, value]) => {
|
|
31
|
-
if (value == null)
|
|
34
|
+
if (value == null)
|
|
32
35
|
return;
|
|
33
|
-
}
|
|
34
36
|
const separator = checkNullString(_formattedQueryParams) ? '?' : '&';
|
|
35
37
|
const queryParam = key + '=' + value;
|
|
36
38
|
_formattedQueryParams += separator + queryParam;
|
|
@@ -39,7 +41,14 @@ const WebView = ({ style, baseUrl, path, queryParams }) => {
|
|
|
39
41
|
return _formattedQueryParams;
|
|
40
42
|
}, [queryParams]);
|
|
41
43
|
const uri = useMemo(() => (baseUrl ?? AOSBaseUrl) + path + formattedQueryParams, [AOSBaseUrl, baseUrl, formattedQueryParams, path]);
|
|
42
|
-
|
|
44
|
+
const targetsAOSInstance = useMemo(() => !checkNullString(AOSBaseUrl) &&
|
|
45
|
+
(checkNullString(baseUrl) || baseUrl.startsWith(AOSBaseUrl)), [AOSBaseUrl, baseUrl]);
|
|
46
|
+
const headers = useMemo(() => {
|
|
47
|
+
if (!targetsAOSInstance)
|
|
48
|
+
return undefined;
|
|
49
|
+
return { Cookie: buildCookie({ baseUrl: AOSBaseUrl, token, jsessionId }) };
|
|
50
|
+
}, [AOSBaseUrl, jsessionId, targetsAOSInstance, token]);
|
|
51
|
+
return (<RNWebView containerStyle={style} source={{ uri, headers }} cacheEnabled cacheMode={isConnected ? 'LOAD_DEFAULT' : 'LOAD_CACHE_ELSE_NETWORK'} domStorageEnabled sharedCookiesEnabled thirdPartyCookiesEnabled geolocationEnabled injectedJavaScript={injectedJavaScript} onMessage={onMessage} onLoadEnd={onLoadEnd} onError={onError} startInLoadingState renderLoading={() => (<ActivityIndicator style={styles.activityIndicator} size="large" color={Colors.inverseColor.background}/>)}/>);
|
|
43
52
|
};
|
|
44
53
|
const styles = StyleSheet.create({
|
|
45
54
|
activityIndicator: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebView.js","sourceRoot":"","sources":["../../../../src/components/external/WebView/WebView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebView.js","sourceRoot":"","sources":["../../../../src/components/external/WebView/WebView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ interface CustomFieldFormProps {
|
|
|
9
9
|
style?: any;
|
|
10
10
|
model: string;
|
|
11
11
|
modelId: number;
|
|
12
|
-
fieldType?: string;
|
|
12
|
+
fieldType?: string | string[];
|
|
13
13
|
additionalActions?: JsonAction[];
|
|
14
14
|
readonly?: boolean;
|
|
15
15
|
readonlyButton?: boolean;
|
|
16
16
|
hideButtonBackground?: boolean;
|
|
17
17
|
hideFormBackground?: boolean;
|
|
18
18
|
}
|
|
19
|
-
declare const CustomFieldForm: ({ style, model: modelName, modelId, fieldType, additionalActions, readonly, readonlyButton, hideButtonBackground, hideFormBackground, }: CustomFieldFormProps) => React.JSX.Element;
|
|
19
|
+
declare const CustomFieldForm: ({ style, model: modelName, modelId, fieldType: _fieldType, additionalActions, readonly, readonlyButton, hideButtonBackground, hideFormBackground, }: CustomFieldFormProps) => React.JSX.Element;
|
|
20
20
|
export default CustomFieldForm;
|
|
@@ -23,12 +23,22 @@ import { useSelector } from '../../../redux/hooks';
|
|
|
23
23
|
import { fetchJsonFieldsOfModel, fetchObject, fetchSelectionMap, formConfigsProvider, getAttrsValue, mapFormToStudioFields, mapStudioFields, mapStudioFieldsWithFormula, updateJsonFieldsObject, useFieldPermitter, useRoleFilter, } from '../../../forms';
|
|
24
24
|
import { FormView } from '../../pages';
|
|
25
25
|
const FORM_KEY = 'customField-form';
|
|
26
|
-
const
|
|
26
|
+
const FIELD_TYPE_SEPARATOR = ',';
|
|
27
|
+
const CustomFieldForm = ({ style, model: modelName, modelId, fieldType: _fieldType, additionalActions = [], readonly = false, readonlyButton = false, hideButtonBackground, hideFormBackground, }) => {
|
|
27
28
|
const Colors = useThemeColor();
|
|
28
29
|
const { userId } = useSelector(state => state.auth);
|
|
29
30
|
const [_fields, setFields] = useState();
|
|
30
31
|
const [object, setObject] = useState();
|
|
31
32
|
const [selectionMap, setSelectionMap] = useState();
|
|
33
|
+
const fieldTypeKey = Array.isArray(_fieldType)
|
|
34
|
+
? _fieldType.join(FIELD_TYPE_SEPARATOR)
|
|
35
|
+
: _fieldType;
|
|
36
|
+
const fieldType = useMemo(() => {
|
|
37
|
+
const fieldTypes = fieldTypeKey?.split(FIELD_TYPE_SEPARATOR);
|
|
38
|
+
return fieldTypes != null && fieldTypes.length > 1
|
|
39
|
+
? fieldTypes
|
|
40
|
+
: fieldTypeKey;
|
|
41
|
+
}, [fieldTypeKey]);
|
|
32
42
|
const userRoleIds = useRoleFilter();
|
|
33
43
|
const removeUnauthorizedFields = useFieldPermitter({ modelName });
|
|
34
44
|
useEffect(() => {
|
|
@@ -55,9 +65,16 @@ const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, addition
|
|
|
55
65
|
const authorizedFields = Array.isArray(_fields)
|
|
56
66
|
? _fields.map(removeUnauthorizedFields)
|
|
57
67
|
: _fields;
|
|
58
|
-
return mapStudioFields(mapStudioFieldsWithFormula(authorizedFields, object), Colors, selectionMap);
|
|
59
|
-
}, [
|
|
60
|
-
|
|
68
|
+
return mapStudioFields(mapStudioFieldsWithFormula(authorizedFields, object), Colors, selectionMap, Array.isArray(fieldType) ? fieldType : undefined);
|
|
69
|
+
}, [
|
|
70
|
+
Colors,
|
|
71
|
+
_fields,
|
|
72
|
+
fieldType,
|
|
73
|
+
object,
|
|
74
|
+
removeUnauthorizedFields,
|
|
75
|
+
selectionMap,
|
|
76
|
+
]);
|
|
77
|
+
const formKey = useMemo(() => `${FORM_KEY}_${fieldTypeKey}_${readonly}`, [fieldTypeKey, readonly]);
|
|
61
78
|
useEffect(() => {
|
|
62
79
|
formConfigsProvider.registerForm(formKey, { readonlyIf: () => readonly, fields, panels, modelName }, { replaceOld: true });
|
|
63
80
|
}, [fields, formKey, modelName, panels, readonly]);
|
|
@@ -73,7 +90,7 @@ const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, addition
|
|
|
73
90
|
modelName,
|
|
74
91
|
id: object?.id,
|
|
75
92
|
version: object?.version,
|
|
76
|
-
values: mapFormToStudioFields(_fields, objectState),
|
|
93
|
+
values: mapFormToStudioFields(_fields, objectState, object),
|
|
77
94
|
},
|
|
78
95
|
action: 'Base_SliceAction_UpdateJsonFieldsObject',
|
|
79
96
|
getState: () => ({ auth: { userId } }),
|
|
@@ -90,14 +107,7 @@ const CustomFieldForm = ({ style, model: modelName, modelId, fieldType, addition
|
|
|
90
107
|
}
|
|
91
108
|
else
|
|
92
109
|
return _action;
|
|
93
|
-
}), [
|
|
94
|
-
_fields,
|
|
95
|
-
additionalActions,
|
|
96
|
-
modelName,
|
|
97
|
-
object?.id,
|
|
98
|
-
object?.version,
|
|
99
|
-
userId,
|
|
100
|
-
]);
|
|
110
|
+
}), [_fields, additionalActions, modelName, object, userId]);
|
|
101
111
|
return (<FormView style={[styles.formView, style]} styleScreen={hideFormBackground && styles.screen} hideButtonBackground={hideButtonBackground} actions={_additionalActions} formKey={formKey} isCustom={true} defaultValue={attrsValues == null ? { ...defaults } : attrsValues} floatingTools={readonlyButton}/>);
|
|
102
112
|
};
|
|
103
113
|
const styles = StyleSheet.create({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CustomFieldForm.js","sourceRoot":"","sources":["../../../../src/components/pages/CustomFieldForm/CustomFieldForm.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAEL,sBAAsB,EACtB,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,qBAAqB,EACrB,eAAe,EACf,0BAA0B,EAC1B,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,GACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC,MAAM,QAAQ,GAAG,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"CustomFieldForm.js","sourceRoot":"","sources":["../../../../src/components/pages/CustomFieldForm/CustomFieldForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { JSONObject } from '../types';
|
|
|
7
7
|
export declare function clearModelMetaCaches(modelName?: string): void;
|
|
8
8
|
export declare function fetchJsonFieldsOfModel({ modelName, type, userRoleIds, }: {
|
|
9
9
|
modelName: string;
|
|
10
|
-
type?: string;
|
|
10
|
+
type?: string | string[];
|
|
11
11
|
userRoleIds?: number[] | null;
|
|
12
12
|
}): Promise<any>;
|
|
13
13
|
export declare function fetchObject({ modelName, id, }: {
|
|
@@ -67,7 +67,10 @@ const createJsonFieldsOfModelCriteria = (modelName, type) => {
|
|
|
67
67
|
{ fieldName: 'model', operator: '=', value: modelName },
|
|
68
68
|
{ fieldName: 'isVisibleInMobileApp', operator: '=', value: true },
|
|
69
69
|
];
|
|
70
|
-
if (type
|
|
70
|
+
if (Array.isArray(type)) {
|
|
71
|
+
criteria.push({ fieldName: 'modelField', operator: 'in', value: type });
|
|
72
|
+
}
|
|
73
|
+
else if (type != null) {
|
|
71
74
|
criteria.push({ fieldName: 'modelField', operator: '=', value: type });
|
|
72
75
|
}
|
|
73
76
|
return criteria;
|
|
@@ -81,7 +84,11 @@ export async function fetchJsonFieldsOfModel({ modelName, type, userRoleIds, })
|
|
|
81
84
|
return null;
|
|
82
85
|
const isFiltered = Array.isArray(userRoleIds);
|
|
83
86
|
const hasRoles = isFiltered && userRoleIds.length > 0;
|
|
84
|
-
return cachedRequest('jsonFieldsOfModel', [
|
|
87
|
+
return cachedRequest('jsonFieldsOfModel', [
|
|
88
|
+
modelName,
|
|
89
|
+
[type ?? ''].flat().join('-'),
|
|
90
|
+
isFiltered ? userRoleIds.join('-') : 'all',
|
|
91
|
+
].join(CACHE_KEY_SEPARATOR), () => createStandardSearch({
|
|
85
92
|
model: 'com.axelor.meta.db.MetaJsonField',
|
|
86
93
|
criteria: createJsonFieldsOfModelCriteria(modelName, type),
|
|
87
94
|
domain: !isFiltered
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/api.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EAEpB,YAAY,EACZ,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAG5B,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAqC,CAAC;AAErE;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CACpB,SAAiB,EACjB,GAAW,EACX,OAA2B,EACb,EAAE;IAChB,IAAI,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAE3C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;QAClB,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IAElC,MAAM,MAAM,GAAG,KAAK,CAAC;IAErB,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACtC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,SAAkB;IACrD,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC9B,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACtB,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;YACvB,IACE,GAAG,KAAK,SAAS;gBACjB,GAAG,CAAC,UAAU,CAAC,SAAS,GAAG,mBAAmB,CAAC,EAC/C,CAAC;gBACD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,+BAA+B,GAAG,
|
|
1
|
+
{"version":3,"file":"api.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/api.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ThemeColors } from '@axelor/aos-mobile-ui';
|
|
2
2
|
import { Field, JSONObject, Panel } from '../types';
|
|
3
|
-
export declare const mapStudioFields: (items: any[], Colors: ThemeColors, selectionMap?: JSONObject<any[]
|
|
3
|
+
export declare const mapStudioFields: (items: any[], Colors: ThemeColors, selectionMap?: JSONObject<any[]>, modelFieldsOrder?: string[]) => {
|
|
4
4
|
panels: JSONObject<Panel>;
|
|
5
5
|
fields: JSONObject<Field>;
|
|
6
6
|
defaults: any;
|
|
7
7
|
};
|
|
8
|
-
export declare const mapFormToStudioFields: (fields: any[], formValues: any) => JSONObject<string>;
|
|
8
|
+
export declare const mapFormToStudioFields: (fields: any[], formValues: any, object?: any) => JSONObject<string>;
|
|
@@ -19,26 +19,48 @@ import { checkNullString, HorizontalRule, Label, } from '@axelor/aos-mobile-ui';
|
|
|
19
19
|
import { DEFAULT_COLSPAN, } from '../types';
|
|
20
20
|
import { CustomButton, CustomPicker, CustomSearchBar, CustomTagList, } from '../../components';
|
|
21
21
|
import { combinedFormula, createFormulaFunction, manageDependsOnFormula, reverseFormula, } from './formula.helpers';
|
|
22
|
-
|
|
22
|
+
const getSortedModelFields = (metaJsonFields, modelFieldsOrder = []) => {
|
|
23
|
+
const getRank = (modelField) => {
|
|
24
|
+
const rank = modelFieldsOrder.indexOf(modelField);
|
|
25
|
+
return rank === -1 ? modelFieldsOrder.length : rank;
|
|
26
|
+
};
|
|
27
|
+
return metaJsonFields
|
|
28
|
+
.map(_item => _item.modelField)
|
|
29
|
+
.filter((item, index, self) => self.indexOf(item) === index)
|
|
30
|
+
.sort((a, b) => getRank(a) - getRank(b) || a.localeCompare(b));
|
|
31
|
+
};
|
|
32
|
+
const getMaxSequence = (metaJsonFields, modelField) => Math.max(0, ...metaJsonFields
|
|
33
|
+
.filter(_item => _item.modelField === modelField)
|
|
34
|
+
.map(_item => _item.sequence ?? 0));
|
|
35
|
+
export const mapStudioFields = (items, Colors, selectionMap = {}, modelFieldsOrder) => {
|
|
23
36
|
let formFields = {};
|
|
24
37
|
let formPanels = {};
|
|
25
38
|
let defaults = {};
|
|
26
39
|
if (Array.isArray(items)) {
|
|
27
40
|
const metaJsonFields = [...items];
|
|
28
|
-
const modelFields = metaJsonFields
|
|
29
|
-
|
|
30
|
-
.filter((item, index, self) => self.indexOf(item) === index)
|
|
31
|
-
.sort();
|
|
41
|
+
const modelFields = getSortedModelFields(metaJsonFields, modelFieldsOrder);
|
|
42
|
+
let orderOffset = 0;
|
|
32
43
|
for (const modelField of modelFields) {
|
|
33
|
-
const { _fields, _panels, _defaults } = manageContentOfModel(metaJsonFields, modelField, Colors, selectionMap);
|
|
44
|
+
const { _fields, _panels, _defaults } = manageContentOfModel(metaJsonFields, modelField, Colors, selectionMap, orderOffset);
|
|
34
45
|
formFields = { ...formFields, ..._fields };
|
|
35
46
|
formPanels = { ...formPanels, ..._panels };
|
|
36
47
|
defaults = { ...defaults, ..._defaults };
|
|
48
|
+
orderOffset += getMaxSequence(metaJsonFields, modelField) + 1;
|
|
37
49
|
}
|
|
38
50
|
}
|
|
39
51
|
return { fields: formFields, panels: formPanels, defaults };
|
|
40
52
|
};
|
|
41
|
-
|
|
53
|
+
const parseStudioValues = (value) => {
|
|
54
|
+
if (value == null || typeof value !== 'string')
|
|
55
|
+
return value ?? {};
|
|
56
|
+
try {
|
|
57
|
+
return JSON.parse(value) ?? {};
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
return {};
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
export const mapFormToStudioFields = (fields, formValues, object) => {
|
|
42
64
|
let items = {};
|
|
43
65
|
if (Array.isArray(fields)) {
|
|
44
66
|
const metaJsonFields = [...fields];
|
|
@@ -57,7 +79,13 @@ export const mapFormToStudioFields = (fields, formValues) => {
|
|
|
57
79
|
panelValues[fieldKey] = formValues[fieldKey];
|
|
58
80
|
}
|
|
59
81
|
});
|
|
60
|
-
items = {
|
|
82
|
+
items = {
|
|
83
|
+
...items,
|
|
84
|
+
[modelField]: JSON.stringify({
|
|
85
|
+
...parseStudioValues(object?.[modelField]),
|
|
86
|
+
...panelValues,
|
|
87
|
+
}),
|
|
88
|
+
};
|
|
61
89
|
}
|
|
62
90
|
}
|
|
63
91
|
return items;
|
|
@@ -157,7 +185,7 @@ const hasPanelTitle = (widgetAttrs) => {
|
|
|
157
185
|
isPanelTab(widgetAttrs) ||
|
|
158
186
|
!widgetAttrs?.showTitle);
|
|
159
187
|
};
|
|
160
|
-
const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap) => {
|
|
188
|
+
const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap, orderOffset = 0) => {
|
|
161
189
|
const formFields = {};
|
|
162
190
|
const formPanels = {};
|
|
163
191
|
const defaults = {};
|
|
@@ -167,12 +195,13 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
|
|
|
167
195
|
.sort((a, b) => a.sequence - b.sequence)
|
|
168
196
|
.forEach(item => {
|
|
169
197
|
const widgetAttrs = getWidgetAttrs(item);
|
|
198
|
+
const order = orderOffset + (item.sequence ?? 0);
|
|
170
199
|
switch (item.type) {
|
|
171
200
|
case 'panel':
|
|
172
201
|
lastPanel = item.name;
|
|
173
202
|
formPanels[item.name] = {
|
|
174
203
|
titleKey: hasPanelTitle(widgetAttrs) ? item.title : null,
|
|
175
|
-
order
|
|
204
|
+
order,
|
|
176
205
|
colSpan: getColSpan(widgetAttrs) ?? DEFAULT_COLSPAN,
|
|
177
206
|
direction: 'row',
|
|
178
207
|
isCollapsible: isPanelCollapsible(widgetAttrs),
|
|
@@ -184,7 +213,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
|
|
|
184
213
|
case 'spacer':
|
|
185
214
|
formPanels[item.name] = {
|
|
186
215
|
titleKey: item.title,
|
|
187
|
-
order
|
|
216
|
+
order,
|
|
188
217
|
colSpan: getColSpan(widgetAttrs) ?? DEFAULT_COLSPAN,
|
|
189
218
|
direction: 'row',
|
|
190
219
|
};
|
|
@@ -193,7 +222,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
|
|
|
193
222
|
formFields[item.name] = {
|
|
194
223
|
titleKey: item.title,
|
|
195
224
|
type: 'string',
|
|
196
|
-
order
|
|
225
|
+
order,
|
|
197
226
|
colSpan: getColSpan(widgetAttrs),
|
|
198
227
|
parentPanel: lastPanel,
|
|
199
228
|
widget: 'custom',
|
|
@@ -209,7 +238,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
|
|
|
209
238
|
formFields[item.name] = {
|
|
210
239
|
titleKey: item.title,
|
|
211
240
|
type: 'string',
|
|
212
|
-
order
|
|
241
|
+
order,
|
|
213
242
|
parentPanel: lastPanel,
|
|
214
243
|
widget: 'custom',
|
|
215
244
|
hideIf: () => item.hidden,
|
|
@@ -226,7 +255,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
|
|
|
226
255
|
formFields[item.name] = {
|
|
227
256
|
titleKey: item.title,
|
|
228
257
|
type: 'object',
|
|
229
|
-
order
|
|
258
|
+
order,
|
|
230
259
|
colSpan: getColSpan(widgetAttrs),
|
|
231
260
|
parentPanel: lastPanel,
|
|
232
261
|
widget: 'custom',
|
|
@@ -252,7 +281,7 @@ const manageContentOfModel = (metaJsonFields, modelField, Colors, selectionMap)
|
|
|
252
281
|
hideIf: item.hidden
|
|
253
282
|
? () => true
|
|
254
283
|
: createFormulaFunction(combinedFormula('||', item.hideIf, reverseFormula(item.showIf))),
|
|
255
|
-
order
|
|
284
|
+
order,
|
|
256
285
|
colSpan: getColSpan(widgetAttrs),
|
|
257
286
|
parentPanel: lastPanel,
|
|
258
287
|
widget: widget,
|