@kontur.candy/generator 4.245.0-lazy-loading-test.21 → 4.245.0-lazy-loading.22

package/dist/index.js

@@ -114720,6 +114720,9 @@ class FilterExpressionTransduceVisitor {
       case _FilterExpression__WEBPACK_IMPORTED_MODULE_2__.OperatorType.UnaryNot:
         return this.transformUnaryNotExpression(expression);
 
+      case _FilterExpression__WEBPACK_IMPORTED_MODULE_2__.OperatorType.ByInstances:
+        return this.transformByInstancesExpression(expression);
+
       default:
         (0,_Common_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.ensureNever)(expression);
         return this.createDefaultResult();
@@ -114741,12 +114744,12 @@ class CompileFilterExpressionTransduceVisitor extends FilterExpressionTransduceV
 
   transformOrExpression(expression) {
     const conditions = expression.conditions.map(x => this.transformExpression(x));
-    return getModelValuesFn => conditions.some(condition => condition(getModelValuesFn));
+    return (getModelValuesFn, GetInstanceFn) => conditions.some(condition => condition(getModelValuesFn, GetInstanceFn));
   }
 
   transformAndExpression(expression) {
     const conditions = expression.conditions.map(x => this.transformExpression(x));
-    return getModelValuesFn => conditions.every(condition => condition(getModelValuesFn));
+    return (getModelValuesFn, GetInstanceFn) => conditions.every(condition => condition(getModelValuesFn, GetInstanceFn));
   }
 
   transformEqualExpression(expression) {
@@ -114771,13 +114774,20 @@ class CompileFilterExpressionTransduceVisitor extends FilterExpressionTransduceV
 
   transformUnaryNotExpression(expression) {
     const condition = this.transformExpression(expression.condition);
-    return getModelValuesFn => !condition(getModelValuesFn);
+    return (getModelValuesFn, getPathsFn) => !condition(getModelValuesFn, getPathsFn);
   }
 
   transformConditionValueExpression(condition) {
     return condition.value;
   }
 
+  transformByInstancesExpression(expression) {
+    return (getModelValuesFn, getInstanceFn) => {
+      const instance = getInstanceFn(expression.condition.dataPath);
+      return expression.condition.instances.some(x => x === instance);
+    };
+  }
+
   // @ts-ignore
   __reactstandin__regenerateByEval(key, code) {
     // @ts-ignore
@@ -114874,6 +114884,7 @@ let OperatorType;
   OperatorType["StartDate"] = "startDate";
   OperatorType["EndDate"] = "endDate";
   OperatorType["Substring"] = "substring";
+  OperatorType["ByInstances"] = "byInstances";
 })(OperatorType || (OperatorType = {}));
 
 let FilterType;
@@ -152257,6 +152268,10 @@ class FilterInputConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_
       markupBuilder.prop(x => x.dataPaths).set(node.dataPaths.map(x => (0,_getBindingPath__WEBPACK_IMPORTED_MODULE_1__.getNewBindingPathExpression)(node, x)));
     }
 
+    if (node.serverMode != undefined) {
+      markupBuilder.prop(x => x.serverMode).set(node.serverMode);
+    }
+
     return markupBuilder.buildConverterResult();
   }
 
@@ -152307,7 +152322,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../Serializer/SugarSerializer */ "./Generator/src/generators/markupGenerator/Serializer/SugarSerializer.ts");
 /* module decorator */ module = __webpack_require__.hmd(module);
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7;
 
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -152325,7 +152340,7 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 };
 
 
-let FilterInputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.sugarNode)("filterinput", `Содержимое в headerMenu для фильтрации по строке`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/FilterInput sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("placeholder", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.localizedString, `подсказка в input-e для поиска`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("multilinePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.bindingPath, ``), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("tableId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.string, ``), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("dataPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.string, "путь до поля, которое необходимо отсортировать, необходимо указывать с ' * ' (например, dataPath=\"*/НомСчФПрод\")"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.lengthUnit, "Ширина"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("dataPaths", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.stringArray, `массив путей, по которым будет происходить фильтрация, необходимо указывать с ' * ' (например, dataPaths={["*/СвПос/ИНН", "*/СвПос/КПП"]})`), _dec(_class = (_class2 = class FilterInputNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.SugarNodeBase {
+let FilterInputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.sugarNode)("filterinput", `Содержимое в headerMenu для фильтрации по строке`, __webpack_require__("./Generator/src/generators/markupGenerator/ElementProcessors/MultiControls/FilterInput sync recursive .md$")), _dec2 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("placeholder", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.localizedString, `подсказка в input-e для поиска`), _dec3 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("multilinePath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.bindingPath, ``), _dec4 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("tableId", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.string, ``), _dec5 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("dataPath", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.string, "путь до поля, которое необходимо отсортировать, необходимо указывать с ' * ' (например, dataPath=\"*/НомСчФПрод\")"), _dec6 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("width", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.lengthUnit, "Ширина"), _dec7 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("dataPaths", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.stringArray, `массив путей, по которым будет происходить фильтрация, необходимо указывать с ' * ' (например, dataPaths={["*/СвПос/ИНН", "*/СвПос/КПП"]})`), _dec8 = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attr)("serverMode", _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.attrType.boolean, `использовать серверый поиск`), _dec(_class = (_class2 = class FilterInputNode extends _Serializer_SugarSerializer__WEBPACK_IMPORTED_MODULE_0__.SugarNodeBase {
   constructor(...args) {
     super(...args);
 
@@ -152340,6 +152355,8 @@ let FilterInputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_M
     _initializerDefineProperty(this, "width", _descriptor5, this);
 
     _initializerDefineProperty(this, "dataPaths", _descriptor6, this);
+
+    _initializerDefineProperty(this, "serverMode", _descriptor7, this);
   }
 
   // @ts-ignore
@@ -152378,6 +152395,11 @@ let FilterInputNode = (_dec = (0,_Serializer_SugarSerializer__WEBPACK_IMPORTED_M
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "serverMode", [_dec8], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 ;
 
@@ -152793,6 +152815,14 @@ class FilterExpressionResolveBindingPaths extends _Engine_src_Helpers_FilterExpr
     };
   }
 
+  transformByInstancesExpression(expression) {
+    return { ...expression,
+      condition: { ...expression.condition,
+        dataPath: this.pathResolver(expression.condition.dataPath)
+      }
+    };
+  }
+
   transformUnaryNotExpression(expression) {
     return { ...expression,
       condition: this.transformExpression(expression.condition)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "4.245.0-lazy-loading-test.21",
+  "version": "4.245.0-lazy-loading.22",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,