plmt-constructor-sdk 0.13.38 → 0.13.40

package/conditional-format/conditions.js

@@ -16,10 +16,16 @@ function isFulfillingCondition(type, cellValue, condition) {
                 : conditionValue;
             return isFulfillingNumberCondition(method, cellValue, value);
         case constants_1.ColumnType.Date:
-            const date = Array.isArray(conditionValue)
-                ? conditionValue.map((item) => new Date(item))
-                : new Date(conditionValue);
-            return isFulfillingDateCondition(method, new Date(cellValue), date);
+            const cellDate = new Date(cellValue);
+            if (Array.isArray(conditionValue)) {
+                if (conditionValue.length < 2)
+                    return false;
+                return isFulfillingDateCondition(method, cellDate, [
+                    new Date(conditionValue[0]),
+                    new Date(conditionValue[1]),
+                ]);
+            }
+            return isFulfillingDateCondition(method, cellDate, new Date(conditionValue));
         default:
             return false;
     }
@@ -104,30 +110,58 @@ function isFulfillingNumberCondition(method, cellValue, conditionValue) {
 function isFulfillingDateCondition(method, cellValue, conditionValue) {
     if (Array.isArray(conditionValue))
         switch (method) {
-            case data_1.FilterMethod.InList:
+            case data_1.FilterMethod.InList: {
                 return (cellValue >= conditionValue[0] &&
                     cellValue <= conditionValue[1]);
-            case data_1.FilterMethod.NotInList:
+            }
+            case data_1.FilterMethod.NotInList: {
                 return (cellValue < conditionValue[0] ||
                     cellValue > conditionValue[1]);
+            }
+            case data_1.FilterMethod.Range: {
+                const start = startOfDay(conditionValue[0]);
+                const end = endOfDay(conditionValue[1]);
+                return cellValue >= start && cellValue <= end;
+            }
+            case data_1.FilterMethod.Range$Not: {
+                const start = startOfDay(conditionValue[0]);
+                const end = endOfDay(conditionValue[1]);
+                return cellValue < start || cellValue > end;
+            }
             default:
                 return false;
         }
     else
         switch (method) {
-            case data_1.FilterMethod.Equal:
-                return cellValue.getTime() === conditionValue.getTime();
-            case data_1.FilterMethod.NotEqual:
-                return cellValue.getTime() !== conditionValue.getTime();
+            case data_1.FilterMethod.Equal: {
+                const start = startOfDay(conditionValue);
+                const end = endOfDay(conditionValue);
+                return cellValue >= start && cellValue <= end;
+            }
+            case data_1.FilterMethod.NotEqual: {
+                const start = startOfDay(conditionValue);
+                const end = endOfDay(conditionValue);
+                return cellValue < start || cellValue > end;
+            }
             case data_1.FilterMethod.GreaterThen:
-                return cellValue > conditionValue;
+                return cellValue > endOfDay(conditionValue);
             case data_1.FilterMethod.GreaterThenOrEqual:
-                return cellValue >= conditionValue;
+                return cellValue >= startOfDay(conditionValue);
             case data_1.FilterMethod.LessThen:
-                return cellValue < conditionValue;
+                return cellValue < startOfDay(conditionValue);
             case data_1.FilterMethod.LessThenOrEqual:
-                return cellValue <= conditionValue;
+                return cellValue <= endOfDay(conditionValue);
             default:
                 return false;
         }
 }
+function startOfDay(date) {
+    const normalizedDate = new Date(date.getTime());
+    normalizedDate.setHours(0, 0, 0, 0);
+    return normalizedDate;
+}
+function endOfDay(date) {
+    const normalizedDate = new Date(date.getTime());
+    normalizedDate.setHours(23, 59, 59, 999);
+    return normalizedDate;
+}

package/conditional-format/constants.d.ts

@@ -1,10 +1,5 @@
-import { FilterMethod } from '../data';
-export declare enum ColumnType {
-    String = 0,
-    Number = 1,
-    Date = 2,
-    Boolean = 3
-}
+import { ColumnType, FilterMethod } from '../data';
+export { ColumnType };
 export declare const COLOR_STEPS = 128;
 export interface Condition {
     column_id: number;

package/conditional-format/constants.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COLOR_STEPS = exports.ColumnType = void 0;
-var ColumnType;
-(function (ColumnType) {
-    ColumnType[ColumnType["String"] = 0] = "String";
-    ColumnType[ColumnType["Number"] = 1] = "Number";
-    ColumnType[ColumnType["Date"] = 2] = "Date";
-    ColumnType[ColumnType["Boolean"] = 3] = "Boolean";
-})(ColumnType = exports.ColumnType || (exports.ColumnType = {}));
+const data_1 = require("../data");
+Object.defineProperty(exports, "ColumnType", { enumerable: true, get: function () { return data_1.ColumnType; } });
 exports.COLOR_STEPS = 128;

package/declare.d.ts

@@ -12,14 +12,6 @@
  * @packageDocumentation
  * @module Регистрация виджета
  */
-import { WidgetState } from './widget';
-declare global {
-    interface Window {
-        getWidgetState: {
-            [uid: string]: () => WidgetState;
-        };
-    }
-}
 /**
  * Функция-декоратор
  */

package/declare.js

@@ -35,11 +35,6 @@ function Declare(params) {
         const uid = readFromUrl('uid');
         if (uid)
             instance.uid = uid;
-        if (typeof instance.getWidgetState === 'function' && uid) {
-            const getState = window.parent['getWidgetState'] || {};
-            getState[uid] = instance.getWidgetState.bind(instance);
-            window.parent.getWidgetState = getState;
-        }
         Object.assign(instance, {
             viewSettings: {},
             ready() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "plmt-constructor-sdk",
-    "version": "0.13.38",
+    "version": "0.13.40",
     "description": "Набор инструментов для создания виджетов.",
     "dependencies": {
         "logical-not": "^1.0.9"

package/widget.d.ts

@@ -18,11 +18,6 @@ export declare abstract class Widget {
     ready(): void;
     onInit(): void;
     abstract onChange(): void;
-    /**
-     * Метод для получения состояния виджета
-     * @return `WidgetState`
-     */
-    abstract getWidgetState(): WidgetState;
     /**
      * Обработчик события кастомного запроса
      * @param customData WidgetCustomProvide
@@ -32,15 +27,6 @@ export declare abstract class Widget {
     onThemeChange(): void;
     onLangChange(): void;
 }
-/**
- * Состояние виджета
- */
-export interface WidgetState {
-    /** Лимит */
-    limit?: number;
-    /** Смещение */
-    offset?: number;
-}
 /**
  * Интерфейс для виджета с одним источником данных
  */