datastake-daf 0.6.751 → 0.6.752

package/dist/components/index.js

@@ -9667,28 +9667,30 @@ const handleSectionChildren = _ref => {
   });
 };
 
-const handleArrayChildren = ({
-  value,
-  config,
-  label,
-  level,
-  t,
-  rootForm,
-  allData,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
+const handleArrayChildren = _ref => {
+  let {
+    value,
+    config,
+    label,
+    level,
+    t,
+    rootForm,
+    allData,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
   if (!Array.isArray(value)) {
     return null;
   }
   return value.map((item, itemIndex) => /*#__PURE__*/jsxRuntime.jsx("div", {
     className: "array-item",
     children: Object.keys(config.inputs).sort((a, b) => {
-      const positionA = config.inputs[a]?.position || 0;
-      const positionB = config.inputs[b]?.position || 0;
+      var _config$inputs$a, _config$inputs$b;
+      const positionA = ((_config$inputs$a = config.inputs[a]) === null || _config$inputs$a === void 0 ? void 0 : _config$inputs$a.position) || 0;
+      const positionB = ((_config$inputs$b = config.inputs[b]) === null || _config$inputs$b === void 0 ? void 0 : _config$inputs$b.position) || 0;
       return positionA - positionB;
     }).map(subInputKey => {
       const subInputConfig = config.inputs[subInputKey];
@@ -9706,9 +9708,9 @@ const handleArrayChildren = ({
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, `${itemIndex}-${subInputKey}`);
+      }, "".concat(itemIndex, "-").concat(subInputKey));
     })
-  }, `${itemIndex}`));
+  }, "".concat(itemIndex)));
 };
 
 const noDafApps = ['tif', 'cukura']; //PACKAGE_CHANGE_LATER (remove sbg)
@@ -10068,42 +10070,37 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
   }
 };
 
-const handleDataLinkWithTableKeys = _ref => {
-  var _inputConfig$meta, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
-  let {
-    inputConfig,
-    inputKey,
-    value,
-    level,
-    t,
-    rootForm,
-    allData,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
-  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
+const handleDataLinkWithTableKeys = ({
+  inputConfig,
+  inputKey,
+  value,
+  level,
+  t,
+  rootForm,
+  allData,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
+  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const isAjaxModal = React.useMemo(() => {
-    var _inputConfig$meta2;
-    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
-  }, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
-    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
+    namespace: inputConfig?.meta?.namespace,
+    skipFetch: inputConfig?.meta?.skipFetch,
     isAjaxModal,
-    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
+    formScope: inputConfig?.meta?.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
+  const dataLinkForm = ajaxModalValues?.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10116,20 +10113,19 @@ const handleDataLinkWithTableKeys = _ref => {
     };
     const isUploadFieldEmpty = (fieldKey, itemToCheck) => {
       if (uploadTypeFields.includes(fieldKey)) {
-        const itemValue = itemToCheck === null || itemToCheck === void 0 ? void 0 : itemToCheck[fieldKey];
+        const itemValue = itemToCheck?.[fieldKey];
         return itemValue === undefined || itemValue === null || Array.isArray(itemValue) && itemValue.length === 0;
       }
       return false;
     };
     const processedTableKeys = processConditionalTableKeys(tableKeys, item);
     processedTableKeys.filter(tableKey => tableKey !== 'datastakeId').filter(tableKey => !isUploadFieldEmpty(tableKey, item)).forEach(tableKey => {
-      var _dataLinkForm$identif;
-      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
+      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
       if (formInputConfig) {
-        var _item$linking, _formInputConfig$meta, _formInputConfig$tabl;
-        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[tableKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10137,7 +10133,7 @@ const handleDataLinkWithTableKeys = _ref => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10145,17 +10141,16 @@ const handleDataLinkWithTableKeys = _ref => {
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$meta = formInputConfig.meta) === null || _formInputConfig$meta === void 0 ? void 0 : _formInputConfig$meta.onNewSetValueKey] || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl = formInputConfig.tableLabel) === null || _formInputConfig$tabl === void 0 ? void 0 : _formInputConfig$tabl.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item[formInputConfig?.meta?.onNewSetValueKey] || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[tableKey];
       } else {
-        var _item$linking2;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
+          type: inputConfig?.type
         };
-        values[tableKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
       }
     });
-    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => {
         if (uploadTypeFields.includes(fieldKey)) {
           return !isUploadFieldEmpty(fieldKey, item);
@@ -10165,11 +10160,11 @@ const handleDataLinkWithTableKeys = _ref => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
-        var _item$linking3, _formInputConfig$tabl2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[fieldKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10177,7 +10172,7 @@ const handleDataLinkWithTableKeys = _ref => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10185,7 +10180,7 @@ const handleDataLinkWithTableKeys = _ref => {
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = (item === null || item === void 0 || (_item$linking3 = item.linking) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3.SCL) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking3 === void 0 ? void 0 : _item$linking3.name) || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl2 = formInputConfig.tableLabel) === null || _formInputConfig$tabl2 === void 0 ? void 0 : _formInputConfig$tabl2.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
+        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[fieldKey];
       });
     }
     return {
@@ -10195,7 +10190,7 @@ const handleDataLinkWithTableKeys = _ref => {
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      const datastakeIdValue = item === null || item === void 0 ? void 0 : item.datastakeId;
+      const datastakeIdValue = item?.datastakeId;
       const {
         inputs,
         values
@@ -10204,9 +10199,9 @@ const handleDataLinkWithTableKeys = _ref => {
         return null;
       }
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
         config: {
-          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
           type: 'custom-datalink',
           inputs: inputs
         },
@@ -10220,10 +10215,10 @@ const handleDataLinkWithTableKeys = _ref => {
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, "".concat(inputKey, "-").concat(itemIndex));
+      }, `${inputKey}-${itemIndex}`);
     });
   } else {
-    const datastakeIdValue = value === null || value === void 0 ? void 0 : value.datastakeId;
+    const datastakeIdValue = value?.datastakeId;
     const {
       inputs,
       values
@@ -10248,7 +10243,7 @@ const handleDataLinkWithTableKeys = _ref => {
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, "".concat(inputKey, "-single"));
+    }, `${inputKey}-single`);
   }
 };
 
@@ -39907,20 +39902,27 @@ function DynamicForm(_ref) {
     }
   }, [data]);
 
-  // Initialize default values for hidden fields
+  // Initialize default values for hidden and disabled fields
   React.useEffect(() => {
     if (Object.keys(form).length > 0) {
       const updatedValues = _objectSpread2({}, values);
       let hasChanges = false;
+      const isEditMode = data && (data.id || data._id);
 
-      // Process all form fields to set default values for hidden fields
+      // Process all form fields to set default values for hidden and disabled fields
       Object.keys(form).forEach(formKey => {
         Object.keys(form[formKey]).forEach(fieldKey => {
-          var _field$meta, _field$meta2;
+          var _field$meta, _field$meta2, _field$meta3, _field$meta4, _field$meta5, _field$meta6;
           const field = form[formKey][fieldKey];
-          if ((field === null || field === void 0 || (_field$meta = field.meta) === null || _field$meta === void 0 ? void 0 : _field$meta.hidden) === true && (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.defaultValue) !== undefined) {
-            const fieldId = field.dataId || fieldKey;
-            if (!propHasValue(updatedValues[fieldId])) {
+          const fieldId = field.dataId || fieldKey;
+
+          // Check if field is disabled
+          const isDisabled = field !== null && field !== void 0 && (_field$meta = field.meta) !== null && _field$meta !== void 0 && _field$meta.disableEdit && typeof (field === null || field === void 0 || (_field$meta2 = field.meta) === null || _field$meta2 === void 0 ? void 0 : _field$meta2.disableEdit) === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field === null || field === void 0 || (_field$meta3 = field.meta) === null || _field$meta3 === void 0 || (_field$meta3 = _field$meta3.disableEdit) === null || _field$meta3 === void 0 ? void 0 : _field$meta3.edit) && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field === null || field === void 0 || (_field$meta4 = field.meta) === null || _field$meta4 === void 0 || (_field$meta4 = _field$meta4.disableEdit) === null || _field$meta4 === void 0 ? void 0 : _field$meta4.edit) && isEditMode : field === null || field === void 0 || (_field$meta5 = field.meta) === null || _field$meta5 === void 0 ? void 0 : _field$meta5.disableEdit;
+
+          // Set default value for hidden fields or disabled fields with default values
+          if ((field === null || field === void 0 || (_field$meta6 = field.meta) === null || _field$meta6 === void 0 ? void 0 : _field$meta6.defaultValue) !== undefined && !propHasValue(updatedValues[fieldId])) {
+            var _field$meta7;
+            if ((field === null || field === void 0 || (_field$meta7 = field.meta) === null || _field$meta7 === void 0 ? void 0 : _field$meta7.hidden) === true || isDisabled) {
               updatedValues[fieldId] = field.meta.defaultValue;
               hasChanges = true;
             }
@@ -39933,7 +39935,7 @@ function DynamicForm(_ref) {
         MainForm.setFieldsValue(updatedValues);
       }
     }
-  }, [form]);
+  }, [form, data, isModal]);
   const setSelectedForm = id => {
     setForms(Forms.map(form => {
       id === form.id ? form.selected = true : form.selected = false;
@@ -39970,7 +39972,7 @@ function DynamicForm(_ref) {
     }).every(key => key);
   };
   const getData = (name, input, value, commentValue, path, disabledPath) => {
-    var _input$meta, _input$meta2, _input$meta3, _input$meta4, _input$meta5, _input$meta6, _input$meta7, _input$meta8, _input$meta9, _input$meta10, _input$meta11, _input$meta12;
+    var _input$meta, _input$meta2, _input$meta3, _input$meta4, _input$meta5, _input$meta6, _input$meta7, _input$meta9, _input$meta10, _input$meta11, _input$meta12;
     const props = {
       // placeholder: input.labelHint ? input.labelHint : getInputLabel(input, values, true),
       placeholder: input.labelHint,
@@ -40007,11 +40009,16 @@ function DynamicForm(_ref) {
       }
       value = fileList;
     }
-    // Handle default values for hidden fields
-    if ((input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.hidden) === true && (input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.defaultValue) !== undefined && !propHasValue(value)) {
-      value = input.meta.defaultValue;
-      if (typeof path === 'string') {
-        dot__default["default"].str(path, value, values);
+    // Handle default values for hidden fields and disabled fields
+    if ((input === null || input === void 0 || (_input$meta7 = input.meta) === null || _input$meta7 === void 0 ? void 0 : _input$meta7.defaultValue) !== undefined && !propHasValue(value)) {
+      var _input$meta8;
+      const isFieldHidden = (input === null || input === void 0 || (_input$meta8 = input.meta) === null || _input$meta8 === void 0 ? void 0 : _input$meta8.hidden) === true;
+      const isFieldDisabled = props.disabled || isDisabled;
+      if (isFieldHidden || isFieldDisabled) {
+        value = input.meta.defaultValue;
+        if (typeof path === 'string') {
+          dot__default["default"].str(path, value, values);
+        }
       }
     }
     const config = {

package/dist/pages/index.js

@@ -29374,21 +29374,27 @@ function DynamicForm({
     }
   }, [data]);
 
-  // Initialize default values for hidden fields
+  // Initialize default values for hidden and disabled fields
   React.useEffect(() => {
     if (Object.keys(form).length > 0) {
       const updatedValues = {
         ...values
       };
       let hasChanges = false;
+      const isEditMode = data && (data.id || data._id);
 
-      // Process all form fields to set default values for hidden fields
+      // Process all form fields to set default values for hidden and disabled fields
       Object.keys(form).forEach(formKey => {
         Object.keys(form[formKey]).forEach(fieldKey => {
           const field = form[formKey][fieldKey];
-          if (field?.meta?.hidden === true && field?.meta?.defaultValue !== undefined) {
-            const fieldId = field.dataId || fieldKey;
-            if (!propHasValue(updatedValues[fieldId])) {
+          const fieldId = field.dataId || fieldKey;
+
+          // Check if field is disabled
+          const isDisabled = field?.meta?.disableEdit && typeof field?.meta?.disableEdit === 'object' ? isModal ? field.meta.disableEdit.create || field.meta.disableEdit.modal || field?.meta?.disableEdit?.edit && isEditMode : field.meta.disableEdit.create || field.meta.disableEdit.drawer || field?.meta?.disableEdit?.edit && isEditMode : field?.meta?.disableEdit;
+
+          // Set default value for hidden fields or disabled fields with default values
+          if (field?.meta?.defaultValue !== undefined && !propHasValue(updatedValues[fieldId])) {
+            if (field?.meta?.hidden === true || isDisabled) {
               updatedValues[fieldId] = field.meta.defaultValue;
               hasChanges = true;
             }
@@ -29401,7 +29407,7 @@ function DynamicForm({
         MainForm.setFieldsValue(updatedValues);
       }
     }
-  }, [form]);
+  }, [form, data, isModal]);
   const setSelectedForm = id => {
     setForms(Forms.map(form => {
       id === form.id ? form.selected = true : form.selected = false;
@@ -29474,11 +29480,15 @@ function DynamicForm({
       }
       value = fileList;
     }
-    // Handle default values for hidden fields
-    if (input?.meta?.hidden === true && input?.meta?.defaultValue !== undefined && !propHasValue(value)) {
-      value = input.meta.defaultValue;
-      if (typeof path === 'string') {
-        dot__default["default"].str(path, value, values);
+    // Handle default values for hidden fields and disabled fields
+    if (input?.meta?.defaultValue !== undefined && !propHasValue(value)) {
+      const isFieldHidden = input?.meta?.hidden === true;
+      const isFieldDisabled = props.disabled || isDisabled;
+      if (isFieldHidden || isFieldDisabled) {
+        value = input.meta.defaultValue;
+        if (typeof path === 'string') {
+          dot__default["default"].str(path, value, values);
+        }
       }
     }
     const config = {

package/dist/style/datastake/mapbox-gl.css

@@ -0,0 +1,330 @@
+/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
+
+/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
+.mapbox-gl-scope .mapboxgl-map {
+  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
+  overflow: hidden;
+  position: relative;
+  -webkit-tap-highlight-color: rgb(0 0 0/0);
+}
+
+.mapbox-gl-scope .mapboxgl-canvas {
+  left: 0;
+  position: absolute;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-canary {
+  background-color: salmon;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
+  cursor: grab;
+  -webkit-user-select: none;
+  user-select: none;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
+  cursor: pointer;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
+  cursor: grabbing;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
+  touch-action: pan-x pan-y;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: pinch-zoom;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: none;
+}
+
+/* Control positioning */
+.mapbox-gl-scope .mapboxgl-ctrl-bottom,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
+.mapbox-gl-scope .mapboxgl-ctrl-left,
+.mapbox-gl-scope .mapboxgl-ctrl-right,
+.mapbox-gl-scope .mapboxgl-ctrl-top,
+.mapbox-gl-scope .mapboxgl-ctrl-top-left,
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  pointer-events: none;
+  position: absolute;
+  z-index: 2;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left {
+  left: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top {
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  right: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-right {
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
+  bottom: 0;
+  right: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom {
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
+  bottom: 0;
+  left: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-left {
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl {
+  clear: both;
+  pointer-events: auto;
+  transform: translate(0);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0 0 10px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
+  float: right;
+  margin: 10px 10px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
+  float: right;
+  margin: 0 10px 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
+  float: left;
+  margin: 0 0 10px 10px;
+}
+
+/* Control group styling */
+.mapbox-gl-scope .mapboxgl-ctrl-group {
+  background: #fff;
+  border-radius: 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
+  box-shadow: 0 0 0 2px #0000001a;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button {
+  background-color: initial;
+  border: 0;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: block;
+  height: 29px;
+  outline: none;
+  overflow: hidden;
+  padding: 0;
+  width: 29px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
+  border-top: 1px solid #ddd;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
+  background-position: 50%;
+  background-repeat: no-repeat;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
+.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
+  box-shadow: 0 0 2px 2px #0096ff;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
+  cursor: not-allowed;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
+  opacity: .25;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
+  border-radius: 4px 4px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
+  border-radius: 0 0 4px 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
+  border-radius: inherit;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
+  background-color: #0000000d;
+}
+
+/* Marker styles */
+.mapbox-gl-scope .mapboxgl-marker {
+  position: absolute;
+  z-index: 1;
+}
+
+.mapbox-gl-scope .mapboxgl-marker svg {
+  display: block;
+}
+
+/* Popup styles */
+.mapbox-gl-scope .mapboxgl-popup {
+  position: absolute;
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
+  padding: 1px;
+  text-align: left;
+  border-radius: 12px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content {
+  margin: 13px 24px 13px 20px;
+  line-height: 1.3;
+  font-size: 13px;
+  min-height: 1px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content p {
+  margin: 17px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip-container {
+  width: 40px;
+  height: 20px;
+  position: absolute;
+  left: 50%;
+  margin-top: -1px;
+  margin-left: -20px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  width: 17px;
+  height: 17px;
+  padding: 1px;
+  margin: -10px auto 0;
+  pointer-events: auto;
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  background: white;
+  color: #333;
+  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border: none;
+  text-align: center;
+  width: 24px;
+  height: 24px;
+  font: 16px/24px Tahoma, Verdana, sans-serif;
+  color: #757575;
+  text-decoration: none;
+  background: transparent;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
+.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
+  color: #585858;
+}
+
+/* Attribution */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  background: #fff;
+  background: rgba(255, 255, 255, 0.8);
+  margin: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution,
+.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
+  padding: 0 5px;
+  color: #333;
+  line-height: 1.4;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
+  text-decoration: none;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
+  text-decoration: underline;
+}
+
+/* Hide attribution by default */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  display: none !important;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-logo {
+  display: none !important;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.751",
+	"version": "0.6.752",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/DynamicForm/index.jsx

@@ -168,19 +168,29 @@ export default function DynamicForm({
     }
   }, [data]);
 
-    // Initialize default values for hidden fields
+    // Initialize default values for hidden and disabled fields
     useEffect(() => {
       if (Object.keys(form).length > 0) {
         const updatedValues = { ...values };
         let hasChanges = false;
+        const isEditMode = data && (data.id || data._id);
   
-        // Process all form fields to set default values for hidden fields
+        // Process all form fields to set default values for hidden and disabled fields
         Object.keys(form).forEach(formKey => {
           Object.keys(form[formKey]).forEach(fieldKey => {
             const field = form[formKey][fieldKey];
-            if (field?.meta?.hidden === true && field?.meta?.defaultValue !== undefined) {
-              const fieldId = field.dataId || fieldKey;
-              if (!propHasValue(updatedValues[fieldId])) {
+            const fieldId = field.dataId || fieldKey;
+            
+            // Check if field is disabled
+            const isDisabled = (field?.meta?.disableEdit && typeof field?.meta?.disableEdit === 'object')
+              ? isModal 
+              ? field.meta.disableEdit.create || field.meta.disableEdit.modal || (field?.meta?.disableEdit?.edit && isEditMode)
+              : field.meta.disableEdit.create || field.meta.disableEdit.drawer || (field?.meta?.disableEdit?.edit && isEditMode)
+              : field?.meta?.disableEdit;
+            
+            // Set default value for hidden fields or disabled fields with default values
+            if (field?.meta?.defaultValue !== undefined && !propHasValue(updatedValues[fieldId])) {
+              if (field?.meta?.hidden === true || isDisabled) {
                 updatedValues[fieldId] = field.meta.defaultValue;
                 hasChanges = true;
               }
@@ -194,7 +204,7 @@ export default function DynamicForm({
           MainForm.setFieldsValue(updatedValues);
         }
       }
-    }, [form]);
+    }, [form, data, isModal]);
 
   const setSelectedForm = (id) => {
     setForms(Forms.map(form => {
@@ -295,11 +305,16 @@ export default function DynamicForm({
       }
       value = fileList;
     }
-    // Handle default values for hidden fields
-    if (input?.meta?.hidden === true && input?.meta?.defaultValue !== undefined && !propHasValue(value)) {
-      value = input.meta.defaultValue;
-      if (typeof path === 'string') {
-        dot.str(path, value, values);
+    // Handle default values for hidden fields and disabled fields
+    if (input?.meta?.defaultValue !== undefined && !propHasValue(value)) {
+      const isFieldHidden = input?.meta?.hidden === true;
+      const isFieldDisabled = props.disabled || isDisabled;
+      
+      if (isFieldHidden || isFieldDisabled) {
+        value = input.meta.defaultValue;
+        if (typeof path === 'string') {
+          dot.str(path, value, values);
+        }
       }
     }