directual-web-components-v2 3.11.334 → 3.11.336

package/dist/index.js

@@ -19497,6 +19497,11 @@ function ElementAction(props) {
       if (action.actionSubmit) {
         console.log("onSubmit");
         onSubmit(res => {
+          if (res === false) {
+            setLoading(false);
+            finish && finish(false);
+            return;
+          }
           console.log("finish onSubmit", res);
           console.log("payload => " + action.endpoint);
           console.log(payload);
@@ -19669,6 +19674,11 @@ function ElementText(props) {
       if (action.actionSubmit) {
         console.log("onSubmit");
         onSubmit(res => {
+          if (res === false) {
+            setLoading(false);
+            finish && finish(false);
+            return;
+          }
           console.log("finish onSubmit", res);
           console.log("payload => " + action.endpoint);
           console.log(payload);
@@ -19961,6 +19971,7 @@ function FpsForm2(props) {
   const isSocketUpdateRef = React.useRef(false);
   const restoredStepRef = React.useRef(null);
   const isAutoSubmittingRef = React.useRef(false);
+  const initialObjectIdRef = React.useRef(edditingOn ? _$1__default.get(data, "data[0].id") : null);
   function usePrevious(value) {
     const ref = React.useRef();
     React.useEffect(() => {
@@ -20025,7 +20036,9 @@ function FpsForm2(props) {
     return newModel;
   }
   React.useEffect(() => {
-    if (_$1__default.get(model, "id") && _$1__default.get(data, "data[0].id") && _$1__default.get(model, "id") !== _$1__default.get(data, "data[0].id")) {
+    const _incomingId = _$1__default.get(data, "data[0].id");
+    if (initialObjectIdRef.current && _incomingId && initialObjectIdRef.current !== _incomingId) {
+      console.warn('[SOCKET GUARD] Отклонён апдейт для чужого объекта:', _incomingId, '(наш:', initialObjectIdRef.current + ')');
       return;
     }
     const timestampToISO = timestamp => {
@@ -20055,7 +20068,7 @@ function FpsForm2(props) {
       }, {});
       const newExtendedModel = _extends({}, gatherDefaults(), _$1__default.get(data, "data[0]"), convertedDates, convertedBools);
       setExtendedModel(newExtendedModel);
-      let saveSate = _extends({}, state);
+      let saveSate = _extends({}, stateRef.current);
       const newModel = _extends({}, flatternModel(_extends({}, gatherDefaults(), _$1__default.get(data, "data[0]"), convertedDates, convertedBools)));
       if (!_$1__default.isEqual(newModel, model)) {
         submitDebouncedRef.current.cancel();
@@ -20448,6 +20461,9 @@ function FpsForm2(props) {
     if (autoSubmit) {
       console.log('[AUTOSUBMIT LOG] Устанавливаем state перед отправкой:', JSON.parse(JSON.stringify(localState)));
     }
+    if (localModel.id && initialObjectIdRef.current && localModel.id !== initialObjectIdRef.current) {
+      console.error('[SUBMIT ID MISMATCH] id в модели:', localModel.id, '!= initialObjectId:', initialObjectIdRef.current, '— возможна подмена объекта!', JSON.parse(JSON.stringify(localModel)));
+    }
     setState(_extends({}, localState));
     setLoading(true);
     const endpoint = _$1__default.get(data, "sl");
@@ -20509,7 +20525,7 @@ function FpsForm2(props) {
           }, stateUpdate));
         }
         if (submitKeepModel && !resetModel) {
-          modelUpdate = _extends({}, model, modelToSend, modelUpdate);
+          modelUpdate = _extends({}, currentModel, modelToSend, modelUpdate);
         } else if (resetModel) {
           modelUpdate = {};
           extendedModelUpdate = {};
@@ -21077,6 +21093,10 @@ function FpsForm2(props) {
       currentStep: currentStep,
       refreshOptions: refreshOptions,
       model: model,
+      modelRef: modelRef,
+      extendedModelRef: extendedModelRef,
+      stateRef: stateRef,
+      edditingOn: edditingOn,
       checkHidden: checkHidden,
       dict: dict,
       extendedModel: extendedModel,
@@ -21146,6 +21166,10 @@ function FpsForm2(props) {
       refreshOptions: refreshOptions,
       currentStep: currentStep,
       model: model,
+      modelRef: modelRef,
+      extendedModelRef: extendedModelRef,
+      stateRef: stateRef,
+      edditingOn: edditingOn,
       userDebug: userDebug,
       setOriginalModel: setOriginalModel,
       originalExtendedModel: originalExtendedModel,
@@ -21187,6 +21211,10 @@ function RenderStep(props) {
     editModelAL,
     originalModel,
     model,
+    modelRef,
+    extendedModelRef,
+    stateRef,
+    edditingOn,
     checkHidden,
     userDebug,
     dict,
@@ -21217,21 +21245,40 @@ function RenderStep(props) {
         if (ignoreResponse) return;
         try {
           const response = JSON.parse(content);
+          const currentModel = modelRef && modelRef.current || model;
+          const currentExtendedModel = extendedModelRef && extendedModelRef.current || extendedModel;
+          const currentState = stateRef && stateRef.current || state;
           if (!_$1.isEmpty(_$1__default.get(response, "state"))) {
             const stateUpdate = _$1__default.get(response, "state");
-            setState(_extends({}, state, stateUpdate));
+            setState(_extends({}, currentState, stateUpdate));
           }
           if (!_$1.isEmpty(_$1__default.get(response, "object"))) {
-            const modelUpdate = _$1__default.get(response, "object");
-            setModel(_extends({}, model, modelUpdate));
-            setOriginalModel(_extends({}, model, modelUpdate));
-            setOriginalExtendedModel(_extends({}, extendedModel, modelUpdate));
+            let modelUpdate = _$1__default.get(response, "object");
+            if (edditingOn && currentModel.id) {
+              if (modelUpdate.id && modelUpdate.id !== currentModel.id) {
+                console.warn('[callEndpointPOST] Отклонена попытка подмены id модели:', currentModel.id, '->', modelUpdate.id);
+              }
+              modelUpdate = _extends({}, modelUpdate, {
+                id: currentModel.id
+              });
+            }
+            setModel(_extends({}, currentModel, modelUpdate));
+            setOriginalModel(_extends({}, currentModel, modelUpdate));
+            setOriginalExtendedModel(_extends({}, currentExtendedModel, modelUpdate));
           }
           if (!_$1.isEmpty(_$1__default.get(response, "model"))) {
-            const modelUpdate = _$1__default.get(response, "model");
-            setModel(_extends({}, model, modelUpdate));
-            setOriginalModel(_extends({}, model, modelUpdate));
-            setOriginalExtendedModel(_extends({}, extendedModel, modelUpdate));
+            let modelUpdate = _$1__default.get(response, "model");
+            if (edditingOn && currentModel.id) {
+              if (modelUpdate.id && modelUpdate.id !== currentModel.id) {
+                console.warn('[callEndpointPOST] Отклонена попытка подмены id модели:', currentModel.id, '->', modelUpdate.id);
+              }
+              modelUpdate = _extends({}, modelUpdate, {
+                id: currentModel.id
+              });
+            }
+            setModel(_extends({}, currentModel, modelUpdate));
+            setOriginalModel(_extends({}, currentModel, modelUpdate));
+            setOriginalExtendedModel(_extends({}, currentExtendedModel, modelUpdate));
           }
           if (!_$1.isEmpty(_$1__default.get(response, "redirect")) && !_$1.isEmpty(_$1__default.get(response, "redirect.target"))) {
             let delay = 0;
@@ -22637,6 +22684,98 @@ function NewMainMenuItem(_ref2) {
 
 var styles$C = {"showhide":"_2kNHQ"};
 
+function template$1(input, rowData, auth) {
+  if (!input) return "";
+  if (!input.includes('{{')) return input;
+  const webUser = auth ? _extends({}, auth, {
+    id: auth.user
+  }) : {};
+  const regex = /\{\{([^}]+)\}\}/g;
+  return input.replace(regex, (match, fieldPath) => {
+    const trimmedPath = fieldPath.trim();
+    if (trimmedPath.startsWith('WebUser.')) {
+      const authField = trimmedPath.substring('WebUser.'.length);
+      const value = _$1__default.get(webUser, authField);
+      if (value === null || value === undefined) return "";
+      if (typeof value === 'boolean') return JSON.stringify(value);
+      if (typeof value === 'object') return JSON.stringify(value);
+      return String(value);
+    }
+    let value = _$1__default.get(rowData, trimmedPath);
+    if (value && typeof value === 'object' && value.id !== undefined) {
+      value = value.id;
+    }
+    if (value === null || value === undefined) return "";
+    if (typeof value === 'boolean') return JSON.stringify(value);
+    if (typeof value === 'object') return JSON.stringify(value);
+    return String(value);
+  });
+}
+function checkCondition(condition, rowData, auth) {
+  let field = template$1("{{" + condition._conditionalView_field + "}}", rowData, auth);
+  let value = template$1(condition._conditionalView_value, rowData, auth);
+  if (condition._conditionalView_operator === "==") {
+    if (typeof field === 'boolean') field = JSON.stringify(field);
+    return !_$1__default.isEqual(field, value);
+  }
+  if (condition._conditionalView_operator === "!==") {
+    if (typeof field === 'boolean') field = JSON.stringify(field);
+    return _$1__default.isEqual(field, value);
+  }
+  if (condition._conditionalView_operator === "contains") {
+    const valueArr = value ? value.split(",") : [];
+    const fieldArr = field ? field.split(",") : [];
+    const hasIntersection = fieldArr.length > 0 && valueArr.length > 0 && _$1__default.intersection(valueArr, fieldArr).length > 0;
+    return !hasIntersection;
+  }
+  if (condition._conditionalView_operator === "notContains") {
+    const valueArr = value ? value.split(",") : [];
+    const fieldArr = field ? field.split(",") : [];
+    const hasIntersection = fieldArr.length > 0 && valueArr.length > 0 && _$1__default.intersection(valueArr, fieldArr).length > 0;
+    return hasIntersection;
+  }
+  if (condition._conditionalView_operator === "in") {
+    const valueArr = value ? value.split(",") : [];
+    const fieldArr = field ? field.split(",") : [];
+    const hasIntersection = fieldArr.length > 0 && valueArr.length > 0 && _$1__default.intersection(valueArr, fieldArr).length > 0;
+    return !hasIntersection;
+  }
+  if (condition._conditionalView_operator === "notIn") {
+    const valueArr = value ? value.split(",") : [];
+    const fieldArr = field ? field.split(",") : [];
+    const hasIntersection = fieldArr.length > 0 && valueArr.length > 0 && _$1__default.intersection(valueArr, fieldArr).length > 0;
+    return hasIntersection;
+  }
+  if (condition._conditionalView_operator === "isNull") {
+    return !_$1__default.isEmpty(field);
+  }
+  if (condition._conditionalView_operator === "isNotNull") {
+    return _$1__default.isEmpty(field);
+  }
+  return false;
+}
+function evaluateRowConditions(conditionLibrary, rowData, auth) {
+  if (!conditionLibrary || !Array.isArray(conditionLibrary)) return "";
+  const appliedClasses = [];
+  conditionLibrary.forEach(condItem => {
+    if (!condItem._conditionalView || !condItem.title) return;
+    const conditions = _$1__default.get(condItem, "_conditions") || [];
+    const andOr = _$1__default.get(condItem, "_action_conditionals_and_or") || "AND";
+    if (conditions.length === 0) return;
+    let shouldApplyClass = false;
+    if (andOr === "OR") {
+      shouldApplyClass = !conditions.every(cond => checkCondition(cond, rowData, auth));
+    } else {
+      shouldApplyClass = !conditions.some(cond => checkCondition(cond, rowData, auth));
+    }
+    if (shouldApplyClass) {
+      const className = condItem.title.startsWith('.') ? condItem.title.substring(1) : condItem.title;
+      appliedClasses.push(className);
+    }
+  });
+  return appliedClasses.join(' ');
+}
+
 function sanitizedHTML(inputHTML) {
   return DOMPurify.sanitize(inputHTML, {
     USE_PROFILES: {
@@ -22926,6 +23065,7 @@ const defaultColumn = {
 };
 function ReactTable(_ref2) {
   let {
+    auth,
     columns,
     params,
     hideExpandTD,
@@ -22937,7 +23077,8 @@ function ReactTable(_ref2) {
     skipPageReset,
     getLinkName,
     onExpand,
-    getExpandHref
+    getExpandHref,
+    conditionLibrary
   } = _ref2;
   const {
     getTableProps,
@@ -22982,9 +23123,11 @@ function ReactTable(_ref2) {
     const isColorRow = row.cells.filter(cell => _$1__default.get(tableParams, "[" + cell.column.id + "].include") && _$1__default.get(tableParams, "[" + cell.column.id + "].colorRow")) ? row.cells.filter(cell => _$1__default.get(tableParams, "[" + cell.column.id + "].include") && _$1__default.get(tableParams, "[" + cell.column.id + "].colorRow"))[0] : null;
     let colorRow = isColorRow ? isColorRow.row.values[isColorRow.column.id] ? isColorRow.row.values[isColorRow.column.id] : 'default' : 'default';
     colorRow = colorRow == 'default' ? colorRow : colorRow[0] == '#' || colorRow[0] == 'r' ? colorRow : '#' + colorRow;
+    const conditionalClasses = evaluateRowConditions(conditionLibrary, row.original, auth);
     const key = _$1__default.get(row, 'original.id') || row.id;
     return /*#__PURE__*/React__default.createElement("tr", _extends({
       key: key,
+      className: conditionalClasses,
       onDoubleClick: () => onExpand(row.original),
       style: colorRow == 'default' ? {} : {
         backgroundColor: colorRow,
@@ -23167,6 +23310,7 @@ function Table(_ref3) {
   }, /*#__PURE__*/React__default.createElement(Loader, null, " ", _$1__default.get(dict[lang], 'loading') || "Loading..."))), /*#__PURE__*/React__default.createElement("div", {
     className: loading ? styles$n.backGroundBlur : ''
   }, /*#__PURE__*/React__default.createElement(ReactTable, {
+    auth: auth,
     columns: columns,
     data: tableData,
     params: params,
@@ -23178,7 +23322,8 @@ function Table(_ref3) {
     skipPageReset: skipPageReset,
     onExpand: onExpand,
     getExpandHref: getExpandHref,
-    tableParams: tableParams.fieldParams
+    tableParams: tableParams.fieldParams,
+    conditionLibrary: _$1__default.get(data, "params._condition_library", [])
   })));
 }
 
@@ -23769,6 +23914,7 @@ function FpsTable(_ref) {
     urlKey: comp_ID,
     headers: currentData.headers
   }), /*#__PURE__*/React__default.createElement(Table, {
+    auth: auth,
     currentBP: currentBP,
     data: currentData,
     cardsData: cardsData,
@@ -23801,7 +23947,6 @@ function FpsTable(_ref) {
       }
       return undefined;
     },
-    auth: auth,
     submitAction: submitAction,
     id: id,
     loading: loading,