Skip to content

Commit 46bd5ed

Browse files
zahmozahmo
authored
Merge pull request #8 from zahmo/ang17-patch-17.2.x
Ang17 patch 17.2.4
2 parents 653e991 + 8c694b3 commit 46bd5ed

22 files changed

+2563
-2120
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
# AJSF (Angular JSON Schema Form)
3+
# ZAJSF (Z Angular JSON Schema Form)
44

55

66
This fork was created for anyone needing to use angular 15+ in their project.

‎demo/app/demo.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ import { Bootstrap4FrameworkModule } from '@zajsf/bootstrap4';
1616
import { JsonSchemaFormModule } from '@zajsf/core';
1717

1818

19-
import { DaisyUIFrameworkModule } from '@zajsf/daisyui';
19+
import { DUIOPTIONS, DaisyUIFrameworkModule } from '@zajsf/daisyui';
2020
import { MaterialDesignFrameworkModule } from '@zajsf/material';
2121

2222
import { Bootstrap5FrameworkModule } from '@zajsf/bootstrap5';
2323
import { CssFrameworkModule } from '@zajsf/cssframework';
24+
import { environment } from '../environments/environment';
2425
import { AceEditorDirective } from './ace-editor.directive';
2526
import { DemoRootComponent } from './demo-root.component';
2627
import { DemoComponent } from './demo.component';
2728
import { routes } from './demo.routes';
2829

2930

3031

31-
3232
@NgModule({
3333
declarations: [AceEditorDirective, DemoComponent, DemoRootComponent],
3434
imports: [
@@ -46,7 +46,7 @@ import { routes } from './demo.routes';
4646
],
4747
providers:[{ provide: REMOVE_STYLES_ON_COMPONENT_DESTROY, useValue: true }
4848
//uncomment to disable daisyui class name prefixing
49-
// ,{ provide: DUIOPTIONS, useValue: {classPrefix:true} }
49+
,{ provide: DUIOPTIONS, useValue: {classPrefix:environment.cssClassPrefix} }
5050
],
5151
bootstrap: [DemoRootComponent]
5252
})

‎demo/assets/example-schemas/ng-jsf-flex-layout.json

Lines changed: 112 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,120 @@
11
{
2-
"schema": {
3-
"type": "object",
4-
"properties": {
5-
"first_name": { "type": "string" },
6-
"last_name": { "type": "string" },
7-
"address": {
2+
"schema": {
83
"type": "object",
94
"properties": {
10-
"street_1": { "type": "string" },
11-
"street_2": { "type": "string" },
12-
"city": { "type": "string" },
13-
"state": {
14-
"type": "string",
15-
"enum": [ "AL", "AK", "AS", "AZ", "AR", "CA", "CO", "CT", "DE",
16-
"DC", "FM", "FL", "GA", "GU", "HI", "ID", "IL", "IN", "IA",
17-
"KS", "KY", "LA", "ME", "MH", "MD", "MA", "MI", "MN", "MS",
18-
"MO", "MT", "NE", "NV", "NH", "NJ", "NM", "NY", "NC", "ND",
19-
"MP", "OH", "OK", "OR", "PW", "PA", "PR", "RI", "SC", "SD",
20-
"TN", "TX", "UT", "VT", "VI", "VA", "WA", "WV", "WI", "WY" ]
21-
},
22-
"zip_code": { "type": "string" }
23-
}
24-
},
25-
"birthday": { "type": "string" },
26-
"notes": { "type": "string" },
27-
"phone_numbers": {
28-
"type": "array",
29-
"items": {
30-
"type": "object",
31-
"properties": {
32-
"type": { "type": "string", "enum": [ "cell", "home", "work" ] },
33-
"number": { "type": "string" }
34-
},
35-
"required": [ "type", "number" ]
36-
}
37-
}
5+
"first_name": { "type": "string" },
6+
"last_name": { "type": "string" },
7+
"address": {
8+
"type": "object",
9+
"properties": {
10+
"street_1": { "type": "string" },
11+
"street_2": { "type": "string" },
12+
"city": { "type": "string" },
13+
"state": {
14+
"type": "string",
15+
"enum": ["AL", "AK", "AS", "AZ", "AR", "CA", "CO", "CT", "DE",
16+
"DC", "FM", "FL", "GA", "GU", "HI", "ID", "IL", "IN", "IA",
17+
"KS", "KY", "LA", "ME", "MH", "MD", "MA", "MI", "MN", "MS",
18+
"MO", "MT", "NE", "NV", "NH", "NJ", "NM", "NY", "NC", "ND",
19+
"MP", "OH", "OK", "OR", "PW", "PA", "PR", "RI", "SC", "SD",
20+
"TN", "TX", "UT", "VT", "VI", "VA", "WA", "WV", "WI", "WY"
21+
]
22+
},
23+
"zip_code": { "type": "string" }
24+
}
25+
},
26+
"birthday": { "type": "string" },
27+
"notes": { "type": "string" },
28+
"phone_numbers": {
29+
"type": "array",
30+
"items": {
31+
"type": "object",
32+
"properties": {
33+
"type": { "type": "string", "enum": ["cell", "home", "work"] },
34+
"number": { "type": "string" }
35+
},
36+
"required": ["type", "number"]
37+
}
38+
}
39+
},
40+
"required": ["last_name"]
3841
},
39-
"required": [ "last_name" ]
40-
},
41-
"layout": [
42-
{ "type": "flex", "flex-flow": "row wrap", "items": [ "first_name", "last_name" ] },
43-
{ "key": "address.street_1", "title": "Address", "placeholder": "Street" },
44-
{ "key": "address.street_2", "notitle": true },
45-
{ "type": "div",
46-
"display": "flex",
47-
"flex-direction": "row",
48-
"items": [
49-
{ "key": "address.city", "flex": "3 3 150px",
50-
"notitle": true, "placeholder": "City"
42+
"layout": [
43+
{ "type": "flex", "flex-flow": "row wrap", "items": ["first_name", "last_name"] },
44+
{ "key": "address.street_1", "title": "Address", "placeholder": "Street" },
45+
{ "key": "address.street_2", "notitle": true },
46+
{
47+
"type": "div",
48+
"display": "flex",
49+
"flex-direction": "row",
50+
"items": [{
51+
"key": "address.city",
52+
"flex": "3 3 150px",
53+
"notitle": true,
54+
"placeholder": "City"
55+
},
56+
{
57+
"key": "address.state",
58+
"flex": "1 1 50px",
59+
"notitle": true,
60+
"placeholder": "State"
61+
},
62+
{
63+
"key": "address.zip_code",
64+
"flex": "2 2 100px",
65+
"notitle": true,
66+
"placeholder": "Zip Code"
67+
}
68+
]
5169
},
52-
{ "key": "address.state", "flex": "1 1 50px",
53-
"notitle": true, "placeholder": "State"
70+
{ "key": "birthday", "type": "date" },
71+
{
72+
"key": "phone_numbers",
73+
"display": "flex",
74+
"flex-flow": "row wrap",
75+
"type": "array",
76+
"listItems": 3,
77+
"items": [{
78+
"type": "div",
79+
"displayFlex": true,
80+
"flex-direction": "row",
81+
"items": [{
82+
"key": "phone_numbers[].type",
83+
"flex": "1 1 90px",
84+
"notitle": true,
85+
"placeholder": "Type"
86+
},
87+
{
88+
"key": "phone_numbers[].number",
89+
"flex": "4 4 200px",
90+
"notitle": true,
91+
"placeholder": "Phone Number"
92+
}
93+
]
94+
}]
5495
},
55-
{ "key": "address.zip_code", "flex": "2 2 100px",
56-
"notitle": true, "placeholder": "Zip Code"
96+
{
97+
"type": "section",
98+
"title": "Notes",
99+
"expandable": true,
100+
"expanded": false,
101+
"items": [{ "key": "notes", "type": "textarea", "notitle": true }]
57102
}
58-
]
59-
},
60-
{ "key": "birthday", "type": "date" },
61-
{ "key": "phone_numbers",
62-
"type": "array",
63-
"listItems": 3,
64-
"items": [ {
65-
"type": "div",
66-
"displayFlex": true,
67-
"flex-direction": "row",
68-
"items": [
69-
{ "key": "phone_numbers[].type", "flex": "1 1 50px",
70-
"notitle": true, "placeholder": "Type"
71-
},
72-
{ "key": "phone_numbers[].number", "flex": "4 4 200px",
73-
"notitle": true, "placeholder": "Phone Number"
74-
}
75-
]
76-
} ]
77-
},
78-
{ "type": "section",
79-
"title": "Notes",
80-
"expandable": true,
81-
"expanded": false,
82-
"items": [ { "key": "notes", "type": "textarea", "notitle": true } ]
83-
}
84-
],
85-
"data": {
86-
"first_name": "Jane",
87-
"last_name": "Doe",
88-
"address": {
89-
"street_1": "123 Main St.",
90-
"city": "Las Vegas",
91-
"state": "NV",
92-
"zip_code": "89123"
93-
},
94-
"birthday": "1999-09-21",
95-
"phone_numbers": [
96-
{ "type": "cell", "number": "702-123-4567" },
97-
{ "type": "work", "number": "702-987-6543" }
98103
],
99-
"notes": "(This is an example of an uninteresting note.)"
100-
}
101-
}
104+
"data": {
105+
"first_name": "Jane",
106+
"last_name": "Doe",
107+
"address": {
108+
"street_1": "123 Main St.",
109+
"city": "Las Vegas",
110+
"state": "NV",
111+
"zip_code": "89123"
112+
},
113+
"birthday": "1999-09-21",
114+
"phone_numbers": [
115+
{ "type": "cell", "number": "702-123-4567" },
116+
{ "type": "work", "number": "702-987-6543" }
117+
],
118+
"notes": "(This is an example of an uninteresting note.)"
119+
}
120+
}

‎demo/environments/environment.prod.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
export const environment ={"production":true,"version":"17.2.0-RC.1","angularVersion":"17.2.3","materialVersion":"17.2.1"}
2+
export const environment ={"production":true,"version":"17.2.4","angularVersion":"17.2.3","materialVersion":"17.2.1","cssClassPrefix":true}
33

‎demo/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
export const environment ={"production":false,"version":"17.2.0-RC.1","angularVersion":"17.2.3","materialVersion":"17.2.1"}
2+
export const environment ={"production":false,"version":"17.2.4","angularVersion":"17.2.3","materialVersion":"17.2.1","cssClassPrefix":true}
33

0 commit comments

Comments
 (0)