@visns-studio/visns-components 3.6.5 → 3.6.7
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.
|
@@ -106,6 +106,7 @@ const DataGrid = forwardRef(
|
|
|
106
106
|
(
|
|
107
107
|
{
|
|
108
108
|
ajaxSetting,
|
|
109
|
+
api,
|
|
109
110
|
columns,
|
|
110
111
|
form,
|
|
111
112
|
gridHeight,
|
|
@@ -2384,6 +2385,7 @@ const DataGrid = forwardRef(
|
|
|
2384
2385
|
>
|
|
2385
2386
|
<Form
|
|
2386
2387
|
ajaxSetting={ajaxSetting}
|
|
2388
|
+
api={api}
|
|
2387
2389
|
closeModal={modalClose}
|
|
2388
2390
|
columnId={formId}
|
|
2389
2391
|
fetchTable={handleReload}
|
package/components/crm/Field.jsx
CHANGED
|
@@ -21,6 +21,7 @@ import 'react-toggle/style.css';
|
|
|
21
21
|
import 'react-datepicker/dist/react-datepicker.css';
|
|
22
22
|
|
|
23
23
|
function Field({
|
|
24
|
+
api,
|
|
24
25
|
autocompleteCallback,
|
|
25
26
|
childDropdownCallback,
|
|
26
27
|
fetchData,
|
|
@@ -995,6 +996,8 @@ function Field({
|
|
|
995
996
|
apiKey={
|
|
996
997
|
userProfile?.settings?.api?.tinymce
|
|
997
998
|
? userProfile.settings.api.tinymce
|
|
999
|
+
: api.tinymce
|
|
1000
|
+
? api.tinymce
|
|
998
1001
|
: ''
|
|
999
1002
|
}
|
|
1000
1003
|
onEditorChange={(value, e) => {
|
package/components/crm/Form.jsx
CHANGED
|
@@ -18,6 +18,7 @@ import Table from './DataGrid';
|
|
|
18
18
|
|
|
19
19
|
function Form({
|
|
20
20
|
ajaxSetting,
|
|
21
|
+
api,
|
|
21
22
|
closeModal,
|
|
22
23
|
columnId,
|
|
23
24
|
formType,
|
|
@@ -1084,6 +1085,7 @@ function Form({
|
|
|
1084
1085
|
default:
|
|
1085
1086
|
return (
|
|
1086
1087
|
<Field
|
|
1088
|
+
api={api}
|
|
1087
1089
|
autocompleteCallback={
|
|
1088
1090
|
autocompleteSelect
|
|
1089
1091
|
}
|
|
@@ -1195,6 +1197,7 @@ function Form({
|
|
|
1195
1197
|
}
|
|
1196
1198
|
return (
|
|
1197
1199
|
<Field
|
|
1200
|
+
api={api}
|
|
1198
1201
|
autocompleteCallback={
|
|
1199
1202
|
autocompleteSelect
|
|
1200
1203
|
}
|
|
@@ -359,6 +359,7 @@ const GenericDynamic = ({
|
|
|
359
359
|
Object.entries(activeForm).forEach(([key, field]) => {
|
|
360
360
|
if (
|
|
361
361
|
field.required === true &&
|
|
362
|
+
field.type !== 'dynamicdata' &&
|
|
362
363
|
(field.value === null || field.value === '')
|
|
363
364
|
) {
|
|
364
365
|
error += `<p>${field.label} is required</p>`;
|
|
@@ -366,7 +367,6 @@ const GenericDynamic = ({
|
|
|
366
367
|
});
|
|
367
368
|
|
|
368
369
|
if (error === '') {
|
|
369
|
-
console.info(setting);
|
|
370
370
|
const res = await CustomFetch(setting.save, 'POST', {
|
|
371
371
|
[primaryKey]: data.id,
|
|
372
372
|
form_data: {
|
|
@@ -423,10 +423,6 @@ const GenericDynamic = ({
|
|
|
423
423
|
}
|
|
424
424
|
}, [data, type]);
|
|
425
425
|
|
|
426
|
-
useEffect(() => {
|
|
427
|
-
console.info(activeForm);
|
|
428
|
-
}, [activeForm]);
|
|
429
|
-
|
|
430
426
|
return (
|
|
431
427
|
<>
|
|
432
428
|
<div className="formSplit">
|
package/package.json
CHANGED