@opengis/fastify-table 1.1.63 → 1.1.65

package/server/plugins/redis/index.js

@@ -1,15 +1,15 @@
-import getRedis from './funcs/getRedis.js';
-
-function close(fastify) {
-  fastify.rclient.quit();
-}
-
-async function plugin(fastify) {
-  const client = getRedis({ db: 0 });
-  client.getJSON = client.get;
-  // fastify.decorate('rclient', client);
-  // fastify.decorate('getRedis', getRedis);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+import getRedis from './funcs/getRedis.js';
+
+function close(fastify) {
+  fastify.rclient.quit();
+}
+
+async function plugin(fastify) {
+  const client = getRedis({ db: 0 });
+  client.getJSON = client.get;
+  // fastify.decorate('rclient', client);
+  // fastify.decorate('getRedis', getRedis);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/server/plugins/table/funcs/addTemplateDir.js

@@ -1,8 +1,8 @@
-import userTemplateDir from './userTemplateDir.js';
-
-export default function addTemplateDir(dir) {
-  if (dir) {
-    userTemplateDir.push(dir);
-  }
-  return userTemplateDir;
-}
+import userTemplateDir from './userTemplateDir.js';
+
+export default function addTemplateDir(dir) {
+  if (dir) {
+    userTemplateDir.push(dir);
+  }
+  return userTemplateDir;
+}

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -1,96 +1,96 @@
-import getTemplate from '../getTemplate.js';
-import pgClients from '../../../pg/pgClients.js';
-
-// import { getTemplate, pgClients } from '../../../../../utils.js';
-
-// filter util
-import getTableSql from './util/getTableSql.js';
-import getFilterQuery from './util/getFilterQuery.js';
-import getOptimizedQuery from './util/getOptimizedQuery.js';
-
-async function getFilterSQL({
-  table, filter, pg = pgClients.client, search, filterList, query, custom, state,
-}) {
-  if (!table) return { error: 'param table is required', status: 400 };
-
-  const body = await getTemplate('table', table);
-
-  const sqlList = body?.sql?.length
-    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
-      .map((el, i) => {
-        Object.assign(el, { name: el.name || `t${i + 1}` });
-        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
-      }).join(' ')
-    : '';
-  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;
-  const { fields = [] } = await pg.query(fieldQuery);
-
-  const { fields: fieldsModel } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
-
-  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || autoSearchColumn;
-  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
-  try {
-    const tableSQL = await getTableSql({
-      pg, body, table, fields,
-    });
-    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
-    const searchQuery = search && searchColumn
-      ? ` (${searchColumn.split(',')?.map((name) => {
-        const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
-      }).join(' or ')} )` : '';
-
-    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])
-      .concat(body?.filters || [])) /* .concat(extraFilters || []).concat(customFilters || []) */
-
-      ?.map(async (el) => {
-        if (!el?.data) return el;
-        const cls = await getTemplate(['cls', 'select'], el.data);
-        if (Array.isArray(cls) && cls?.length) {
-          Object.assign(el, { options: cls });
-        }
-        else if (typeof (cls?.sql || cls) === 'string') {
-          Object.assign(el, { sql: cls?.sql || cls });
-        }
-        return el;
-      }));
-
-    const filters = getFilterQuery({
-      pg,
-      filter,
-      table,
-      tableSQL,
-      fields,
-      filterList: filterList1,
-    });
-
-    // filter
-    const customQuery = body?.filterCustom?.length && custom ? body.filterCustom?.find((el) => el.name === custom)?.sql : null;
-    const stateQuery = body?.filterState?.length && state ? body.filterState?.find((el) => el.name === state)?.sql : null;
-
-    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
-    const q = [body?.query, query, searchQuery, filterQuery, stateQuery, customQuery].filter((el) => el).join(' and ');
-
-    // table
-    const modelQuery = body?.model || body?.table || table;
-    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
-    const tableCount = getOptimizedQuery({ body, table, q }, true);
-    // console.log(optimizedSQL);
-    return {
-      filterList,
-
-      q,
-      optimizedSQL,
-      tableCount,
-      table: modelQuery,
-      // filter parts
-      searchQuery,
-    };
-  }
-  catch (err) {
-    throw new Error(err.toString());
-  }
-}
-
-export default getFilterSQL;
+import getTemplate from '../getTemplate.js';
+import pgClients from '../../../pg/pgClients.js';
+
+// import { getTemplate, pgClients } from '../../../../../utils.js';
+
+// filter util
+import getTableSql from './util/getTableSql.js';
+import getFilterQuery from './util/getFilterQuery.js';
+import getOptimizedQuery from './util/getOptimizedQuery.js';
+
+async function getFilterSQL({
+  table, filter, pg = pgClients.client, search, filterList, query, custom, state,
+}) {
+  if (!table) return { error: 'param table is required', status: 400 };
+
+  const body = await getTemplate('table', table);
+
+  const sqlList = body?.sql?.length
+    ? body?.sql?.filter((el) => !el.disabled && el?.sql?.replace)
+      .map((el, i) => {
+        Object.assign(el, { name: el.name || `t${i + 1}` });
+        return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
+      }).join(' ')
+    : '';
+  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;
+  const { fields = [] } = await pg.query(fieldQuery);
+
+  const { fields: fieldsModel } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
+
+  const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
+  const searchColumn = body?.search_column || autoSearchColumn;
+  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
+  try {
+    const tableSQL = await getTableSql({
+      pg, body, table, fields,
+    });
+    const sval = `ilike '%${decodeURIComponent(search).replace(/'/g, "''")}%'`;
+    const searchQuery = search && searchColumn
+      ? ` (${searchColumn.split(',')?.map((name) => {
+        const { pk } = tableSQL.find((el) => el.name === name) || {};
+        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
+      }).join(' or ')} )` : '';
+
+    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])
+      .concat(body?.filters || [])) /* .concat(extraFilters || []).concat(customFilters || []) */
+
+      ?.map(async (el) => {
+        if (!el?.data) return el;
+        const cls = await getTemplate(['cls', 'select'], el.data);
+        if (Array.isArray(cls) && cls?.length) {
+          Object.assign(el, { options: cls });
+        }
+        else if (typeof (cls?.sql || cls) === 'string') {
+          Object.assign(el, { sql: cls?.sql || cls });
+        }
+        return el;
+      }));
+
+    const filters = getFilterQuery({
+      pg,
+      filter,
+      table,
+      tableSQL,
+      fields,
+      filterList: filterList1,
+    });
+
+    // filter
+    const customQuery = body?.filterCustom?.length && custom ? body.filterCustom?.find((el) => el.name === custom)?.sql : null;
+    const stateQuery = body?.filterState?.length && state ? body.filterState?.find((el) => el.name === state)?.sql : null;
+
+    const filterQuery = filters?.filter((el) => el.query)?.map((el) => `${el.query} `).join(' and ');
+    const q = [body?.query, query, searchQuery, filterQuery, stateQuery, customQuery].filter((el) => el).join(' and ');
+
+    // table
+    const modelQuery = body?.model || body?.table || table;
+    const optimizedSQL = `select * from ${getOptimizedQuery({ body, table, q })} `;
+    const tableCount = getOptimizedQuery({ body, table, q }, true);
+    // console.log(optimizedSQL);
+    return {
+      filterList,
+
+      q,
+      optimizedSQL,
+      tableCount,
+      table: modelQuery,
+      // filter parts
+      searchQuery,
+    };
+  }
+  catch (err) {
+    throw new Error(err.toString());
+  }
+}
+
+export default getFilterSQL;

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -1,170 +1,170 @@
-const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
-const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
-
-function dt(y, m, d) {
-  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
-}
-const dp = {
-  d: new Date().getDate(),
-  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
-  m: new Date().getMonth(),
-  q: (new Date().getMonth() / 4).toFixed() * 3,
-  y: new Date().getFullYear(),
-};
-
-function formatDateISOString(date) {
-  if (!date?.includes('.')) return date;
-  const [day, month, year] = date.split('.');
-  return `${year}-${month}-${day}`;
-}
-
-function formatValue({
-  pg, table, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
-}) {
-  const { data, sql, extra } = filter;
-  const pk = pg?.pk && table ? pg.pk[table] : undefined;
-
-  if (!dataTypeID && !extra) return {};
-  const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
-  if (!name || !value || !fieldType) return {};
-  const filterType = filter.type?.toLowerCase();
-
-  // current day, week, month, year etc.
-  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
-    const query = {
-      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
-      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
-      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
-      cq: `${name}::date >= '${dt(dp.y, dp.q, 1)}'::date and ${name} <= '${dt(dp.y, dp.q + 3, 0)}'::date`,
-      cy: `${name}::date >= '${dt(dp.y, 0, 1)}'::date and ${name}::date <= '${dt(dp.y, 11, 31)}'::date`,
-    }[value];
-    return { op: '=', query, extra };
-  }
-
-  // date range
-  if (dateTypeList.includes(fieldType) && value?.includes('_')) {
-    const [min, max] = value.split('_');
-    const query = `${name} >= '${min}'::date and ${name} <= '${max}'::date`;
-    return { op: 'between', query, extra };
-  }
-
-  // v3 filter date range, example - "01.01.2024-31.12.2024"
-  if (dateTypeList.includes(fieldType) && value?.includes('.') && value?.indexOf('-') === 10 && value?.length === 21) {
-    const [startDate, endDate] = value.split('-');
-    const min = formatDateISOString(startDate);
-    const max = formatDateISOString(endDate);
-    const query = extra && pk
-      ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
-      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
-    return { op: 'between', query, extra };
-  }
-
-  // my rows
-  if (value === 'me' && uid && fieldType === 'text') {
-    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
-  }
-
-  const formatType = {
-    float8: 'numeric',
-    int4: 'numeric',
-    int8: 'numeric',
-    varchar: 'text',
-    bool: 'boolean',
-    geometry: 'geom',
-  }[fieldType] || 'text';
-
-  if (optimize && optimize.name !== optimize.pk) {
-    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
-    return {
-      op: '~',
-      query: fieldType?.includes('[]')
-        ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
-        : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
-      extra,
-    };
-  }
-
-  if (fieldType?.includes('[]')) {
-    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]`, extra };
-  }
-
-  // multiple items of 1 param
-  if (value?.indexOf(',') !== -1) {
-    const values = value.split(',').filter((el) => el !== 'null');
-    if (extra && pk) {
-      const query = value?.indexOf('null') !== -1
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
-      return { op: 'in', query, extra };
-    }
-    const query = value?.indexOf('null') !== -1
-      ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
-      : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
-    return { op: 'in', query, extra };
-  }
-
-  // v3 filter number range, example - "100_500"
-  if (numberTypeList.includes(fieldType) && value?.indexOf('_') !== -1) {
-    const [min, max] = value.split('_');
-    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query, extra };
-  }
-
-  // number range
-  if (numberTypeList.includes(fieldType) && value?.indexOf('-') !== -1) {
-    const [min, max] = value.split('-');
-    if (min === 'min' && max === 'max') return {};
-    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
-    return { op: 'between', query, extra };
-  }
-
-  if (['<', '>'].includes(operator)) {
-    const query = `${name} ${operator} '${value}'::${formatType}`;
-    return { op: operator, query, extra };
-  }
-
-  if (operator === '=' && filterType !== 'text' && !filter?.data) {
-    const query = {
-      null: `${name} is null`,
-      notnull: `${name} is not null`,
-    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
-    return { op: '=', query, extra };
-  }
-
-  if (['~', '='].includes(operator)) {
-    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
-    const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
-    if (extra && pk) {
-      const query = data && sql
-        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where name ${match})))`
-        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
-      return { op: 'ilike', query, extra };
-    }
-
-    const query = filter?.data && filter?.sql
-      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name::text ${match}) )` // filter with cls
-      : `${name}::text ${match}`; // simple filter
-    // console.log(query);
-    return { op: 'ilike', query };
-  }
-
-  // json
-  if (name.includes('.')) {
-    const [col, prop] = name.split('.');
-    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
-    return { op: 'in', query, extra };
-  }
-
-  // geometry
-  if (['geometry'].includes(fieldType)) {
-    const bbox = value[0].split('_');
-
-    if (bbox?.length === 4) {
-      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
-      return { op: '&&', query, extra };
-    }
-  }
-  return {};
-}
-
-export default formatValue;
+const dateTypeList = ['date', 'timestamp', 'timestamp without time zone'];
+const numberTypeList = ['float8', 'int4', 'int8', 'numeric', 'double precision', 'integer'];
+
+function dt(y, m, d) {
+  return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
+}
+const dp = {
+  d: new Date().getDate(),
+  w: new Date().getDate() - (new Date().getDay() || 7) + 1,
+  m: new Date().getMonth(),
+  q: (new Date().getMonth() / 4).toFixed() * 3,
+  y: new Date().getFullYear(),
+};
+
+function formatDateISOString(date) {
+  if (!date?.includes('.')) return date;
+  const [day, month, year] = date.split('.');
+  return `${year}-${month}-${day}`;
+}
+
+function formatValue({
+  pg, table, filter = {}, name, value, operator = '=', dataTypeID, uid = 1, optimize,
+}) {
+  const { data, sql, extra } = filter;
+  const pk = pg?.pk && table ? pg.pk[table] : undefined;
+
+  if (!dataTypeID && !extra) return {};
+  const fieldType = extra ? pg.pgType?.[{ Date: 1114 }[filter?.type] || 25] : pg.pgType?.[dataTypeID];
+  if (!name || !value || !fieldType) return {};
+  const filterType = filter.type?.toLowerCase();
+
+  // current day, week, month, year etc.
+  if (dateTypeList.includes(fieldType) && !value?.includes('_') && ['cd', 'cw', 'cm', 'cq', 'cy'].includes(value)) {
+    const query = {
+      cd: `${name}::date = '${dt(dp.y, dp.m, dp.d)}'::date`,
+      cw: `${name}::date >= '${dt(dp.y, dp.m, dp.w)}'::date and ${name} <= '${dt(dp.y, dp.m, dp.w + 6)}'::date`,
+      cm: `${name}::date >= '${dt(dp.y, dp.m, 1)}'::date and ${name} <= '${dt(dp.y, dp.m + 1, 0)}'::date`,
+      cq: `${name}::date >= '${dt(dp.y, dp.q, 1)}'::date and ${name} <= '${dt(dp.y, dp.q + 3, 0)}'::date`,
+      cy: `${name}::date >= '${dt(dp.y, 0, 1)}'::date and ${name}::date <= '${dt(dp.y, 11, 31)}'::date`,
+    }[value];
+    return { op: '=', query, extra };
+  }
+
+  // date range
+  if (dateTypeList.includes(fieldType) && value?.includes('_')) {
+    const [min, max] = value.split('_');
+    const query = `${name} >= '${min}'::date and ${name} <= '${max}'::date`;
+    return { op: 'between', query, extra };
+  }
+
+  // v3 filter date range, example - "01.01.2024-31.12.2024"
+  if (dateTypeList.includes(fieldType) && value?.includes('.') && value?.indexOf('-') === 10 && value?.length === 21) {
+    const [startDate, endDate] = value.split('-');
+    const min = formatDateISOString(startDate);
+    const max = formatDateISOString(endDate);
+    const query = extra && pk
+      ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_date::date >= '${min}'::date and value_date::date <= '${max}'::date)`
+      : `${name}::date >= '${min}'::date and ${name}::date <= '${max}'::date`;
+    return { op: 'between', query, extra };
+  }
+
+  // my rows
+  if (value === 'me' && uid && fieldType === 'text') {
+    return { op: '=', query: extra ? `uid = '${uid}'` : `${name}::text = '${uid}'`, extra };
+  }
+
+  const formatType = {
+    float8: 'numeric',
+    int4: 'numeric',
+    int8: 'numeric',
+    varchar: 'text',
+    bool: 'boolean',
+    geometry: 'geom',
+  }[fieldType] || 'text';
+
+  if (optimize && optimize.name !== optimize.pk) {
+    const val = filterType === 'text' ? `ilike '%${value}%'` : `= any('{${value}}')`;
+    return {
+      op: '~',
+      query: fieldType?.includes('[]')
+        ? `${optimize.pk} && (select array_agg(${optimize.pk}) from ${optimize.table} where ${name} ${val} )`
+        : `${optimize.pk} in (select ${optimize.pk} from ${optimize.table} where ${name} ${val} )`,
+      extra,
+    };
+  }
+
+  if (fieldType?.includes('[]')) {
+    return { op: 'in', query: `'{${value}}'::text[] && ${name}::text[]`, extra };
+  }
+
+  // multiple items of 1 param
+  if (value?.indexOf(',') !== -1) {
+    const values = value.split(',').filter((el) => el !== 'null');
+    if (extra && pk) {
+      const query = value?.indexOf('null') !== -1
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and ( value_text is null or value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) ) )`
+        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in (${values?.map((el) => `'"${el}"'`).join(',')}) )`;
+      return { op: 'in', query, extra };
+    }
+    const query = value?.indexOf('null') !== -1
+      ? `( ${name} is null or ${name}::text in (${values?.map((el) => `'${el}'`).join(',')}) )`
+      : `${name}::text in (${value.split(',')?.map((el) => `'${el}'`).join(',')})`;
+    return { op: 'in', query, extra };
+  }
+
+  // v3 filter number range, example - "100_500"
+  if (numberTypeList.includes(fieldType) && value?.indexOf('_') !== -1) {
+    const [min, max] = value.split('_');
+    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
+    return { op: 'between', query, extra };
+  }
+
+  // number range
+  if (numberTypeList.includes(fieldType) && value?.indexOf('-') !== -1) {
+    const [min, max] = value.split('-');
+    if (min === 'min' && max === 'max') return {};
+    const query = (max === 'max' ? `${name} > ${min}` : null) || (min === 'min' ? `${name} < ${max}` : null) || `${name} between ${min} and ${max}`;
+    return { op: 'between', query, extra };
+  }
+
+  if (['<', '>'].includes(operator)) {
+    const query = `${name} ${operator} '${value}'::${formatType}`;
+    return { op: operator, query, extra };
+  }
+
+  if (operator === '=' && filterType !== 'text' && !filter?.data) {
+    const query = {
+      null: `${name} is null`,
+      notnull: `${name} is not null`,
+    }[value] || `${name}::${formatType}='${value}'::${formatType}`;
+    return { op: '=', query, extra };
+  }
+
+  if (['~', '='].includes(operator)) {
+    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
+    const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
+    if (extra && pk) {
+      const query = data && sql
+        ? `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text in ( ( with q(id,name)  as  (${sql}) select id from q where name ${match})))`
+        : `${pk} in (select object_id from crm.extra_data where property_key='${name}' and value_text ${match})`;
+      return { op: 'ilike', query, extra };
+    }
+
+    const query = filter?.data && filter?.sql
+      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name::text ${match}) )` // filter with cls
+      : `${name}::text ${match}`; // simple filter
+    // console.log(query);
+    return { op: 'ilike', query };
+  }
+
+  // json
+  if (name.includes('.')) {
+    const [col, prop] = name.split('.');
+    const query = ` ${col}->>'${prop}' in ('${value.join("','")}')`;
+    return { op: 'in', query, extra };
+  }
+
+  // geometry
+  if (['geometry'].includes(fieldType)) {
+    const bbox = value[0].split('_');
+
+    if (bbox?.length === 4) {
+      const query = ` ${name} && 'box(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d `;
+      return { op: '&&', query, extra };
+    }
+  }
+  return {};
+}
+
+export default formatValue;

package/server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.js

@@ -1,13 +1,13 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;
+async function getCustomQuery({
+  pg, table, customFilter,
+}) {
+  if (!customFilter) return null;
+  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
+  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
+  const customQuery = data?.map((el) => el.query).join(' and ');
+  return `${customQuery}`;
+}
+
+export default getCustomQuery;