plain-design 1.0.0-beta.71 → 1.0.0-beta.72

package/src/packages/components/FilterService/utils/filter.service.utils.ts

@@ -1,138 +1,138 @@
-import {RenderNode} from "plain-design-composition";
-import {PlainObject} from "plain-utils/utils/event";
-import {PartialFields} from "../../../utils/type";
-
-/**
- * 筛选符类型
- * @author  韦胜健
- * @date    2023.1.4 21:33
- */
-export const eFilterOperator = {
-  ['eq']: '=',                     // 精确查询
-  ['like']: '~',                 // 模糊查询
-  ['gt']: '>',                     // 大于
-  ['gte']: '>=',                   // 大于等于
-  ['lt']: '<',                     // 小于
-  ['lte']: '<=',                   // 小于等于
-  ['in']: 'in',                     // 包含查询
-  ['not_in']: 'not in',             // 非包含查询
-  ['in_like']: 'in like',           // 包含模糊查询
-  ['not_in_like']: 'not in like',   // 非包含模糊查询
-  ['is_null']: 'is null',           // 为空
-  ['is_not_null']: 'is not null',   // 不为空
-} as const;
-
-/**
- * 单个筛选参数
- * @author  韦胜健
- * @date    2023.1.4 21:35
- */
-export interface iFilterQueryMeta {
-  id: string,
-  field: string,
-  operator: (typeof eFilterOperator)[keyof typeof eFilterOperator],
-  value?: any,
-}
-
-/**
- * 发请求时，筛选查询参数类型
- * @author  韦胜健
- * @date    2023.1.4 21:46
- */
-export type iFilterQueryParam = { queries?: iFilterQueryMeta[], expression?: string, } & Record<string, any>
-
-/**
- * filter handler的getQueryParam返回的query meta类型
- * @author  韦胜健
- * @date    2023.1.5 0:44
- */
-export type iFilterHandlerQueryMeta = PartialFields<iFilterQueryMeta, 'id'>
-
-/**
- * filter handler返回的参数类型
- * @author  韦胜健
- * @date    2023.1.5 0:45
- */
-export type iFilterHandlerQueryParam = {
-  queries?: iFilterHandlerQueryMeta[],
-  expression?: string,
-} & Record<string, any>
-
-/**
- * 某种筛选类型
- * @author  韦胜健
- * @date    2023.1.4 22:13
- */
-export interface iFilterType<FilterConfig> {
-  name: string,
-  state: {
-    map: Record<string, iFilterHandler<FilterConfig> | undefined>,
-    list: iFilterHandler<FilterConfig>[],
-  },
-  getHandler: (handlerName: string) => iFilterHandler<FilterConfig> | undefined,
-  setHandler: (filterName: string, filterHandler: PartialFields<iFilterHandler<FilterConfig>, 'name' | 'seq' | 'getDefaultValue' | 'clearValue'>) => iFilterType<FilterConfig>,
-}
-
-/**
- * 筛选子类型
- * @author  韦胜健
- * @date    2023.1.4 22:13
- */
-export interface iFilterHandler<FilterConfig = PlainObject> {
-  /*唯一标识*/
-  name: string;
-  /*显示名称*/
-  label: () => string,
-  /*排序*/
-  seq: number,
-  /*渲染内容*/
-  render: (data: { formData: PlainObject, option: iFilterOption<FilterConfig>, confirm: () => void }) => RenderNode,
-  /*获取查询参数*/
-  getQueryParam: (data: { formData: PlainObject, option: iFilterOption<FilterConfig> }) => null | undefined | iFilterHandlerQueryParam | Promise<iFilterHandlerQueryParam>,
-  /*获取默认值*/
-  getDefaultValue: (option: iFilterOption<FilterConfig>) => PlainObject,
-  /*清理值*/
-  clearValue: (data: { formData: PlainObject, option: iFilterOption<FilterConfig> }) => void,
-  /**
-   * 获取描述文本
-   * 返回null表示没有筛选值
-   * 返回undefined表示有筛选值，但是没有需要显示的文本
-   * @author  韦胜健
-   * @date    2023.1.15 0:27
-   */
-  getDescription?: (data: { formData: PlainObject, option: iFilterOption<FilterConfig> }) => PlainObject | string | null | undefined,
-}
-
-export interface iFilterOption<FilterConfig = PlainObject> {
-  label: string,
-  field: string,
-  startField: string,
-  endField: string,
-  filterType: string,
-  filterHandler: string,
-  filterConfig: FilterConfig,
-  getQueryParam?: iFilterHandler<FilterConfig>['getQueryParam'],
-
-  defaultValue?: any,
-  defaultSearch?: boolean,
-}
-
-export type iCreateFilterOption = PartialFields<iFilterOption, 'startField' | 'endField' | 'filterConfig'>
-
-function createFilterOptions(val: iCreateFilterOption[]): iFilterOption[]
-function createFilterOptions(val: iCreateFilterOption): iFilterOption
-function createFilterOptions(val: iCreateFilterOption | iCreateFilterOption[]): any {
-  if (Array.isArray(val)) {
-    return val.map(i => createFilterOptions(i));
-  } else {
-    const option: iFilterOption = {
-      ...val,
-      filterConfig: val.filterConfig || {},
-      startField: val.startField || `${val.field}Start`,
-      endField: val.endField || `${val.field}End`,
-    };
-    return option;
-  }
-}
-
-export {createFilterOptions};
+import {RenderNode} from "plain-design-composition";
+import {PlainObject} from "plain-utils/utils/event";
+import {PartialFields} from "../../../utils/type";
+
+/**
+ * 筛选符类型
+ * @author  韦胜健
+ * @date    2023.1.4 21:33
+ */
+export const eFilterOperator = {
+  ['eq']: '=',                     // 精确查询
+  ['like']: '~',                 // 模糊查询
+  ['gt']: '>',                     // 大于
+  ['gte']: '>=',                   // 大于等于
+  ['lt']: '<',                     // 小于
+  ['lte']: '<=',                   // 小于等于
+  ['in']: 'in',                     // 包含查询
+  ['not_in']: 'not in',             // 非包含查询
+  ['in_like']: 'in like',           // 包含模糊查询
+  ['not_in_like']: 'not in like',   // 非包含模糊查询
+  ['is_null']: 'is null',           // 为空
+  ['is_not_null']: 'is not null',   // 不为空
+} as const;
+
+/**
+ * 单个筛选参数
+ * @author  韦胜健
+ * @date    2023.1.4 21:35
+ */
+export interface iFilterQueryMeta {
+  id: string,
+  field: string,
+  operator: (typeof eFilterOperator)[keyof typeof eFilterOperator],
+  value?: any,
+}
+
+/**
+ * 发请求时，筛选查询参数类型
+ * @author  韦胜健
+ * @date    2023.1.4 21:46
+ */
+export type iFilterQueryParam = { queries?: iFilterQueryMeta[], expression?: string, } & Record<string, any>
+
+/**
+ * filter handler的getQueryParam返回的query meta类型
+ * @author  韦胜健
+ * @date    2023.1.5 0:44
+ */
+export type iFilterHandlerQueryMeta = PartialFields<iFilterQueryMeta, 'id'>
+
+/**
+ * filter handler返回的参数类型
+ * @author  韦胜健
+ * @date    2023.1.5 0:45
+ */
+export type iFilterHandlerQueryParam = {
+  queries?: iFilterHandlerQueryMeta[],
+  expression?: string,
+} & Record<string, any>
+
+/**
+ * 某种筛选类型
+ * @author  韦胜健
+ * @date    2023.1.4 22:13
+ */
+export interface iFilterType<FilterConfig> {
+  name: string,
+  state: {
+    map: Record<string, iFilterHandler<FilterConfig> | undefined>,
+    list: iFilterHandler<FilterConfig>[],
+  },
+  getHandler: (handlerName: string) => iFilterHandler<FilterConfig> | undefined,
+  setHandler: (filterName: string, filterHandler: PartialFields<iFilterHandler<FilterConfig>, 'name' | 'seq' | 'getDefaultValue' | 'clearValue'>) => iFilterType<FilterConfig>,
+}
+
+/**
+ * 筛选子类型
+ * @author  韦胜健
+ * @date    2023.1.4 22:13
+ */
+export interface iFilterHandler<FilterConfig = PlainObject> {
+  /*唯一标识*/
+  name: string;
+  /*显示名称*/
+  label: () => string,
+  /*排序*/
+  seq: number,
+  /*渲染内容*/
+  render: (data: { formData: PlainObject, option: iFilterOption<FilterConfig>, confirm: () => void }) => RenderNode,
+  /*获取查询参数*/
+  getQueryParam: (data: { formData: PlainObject, option: iFilterOption<FilterConfig> }) => null | undefined | iFilterHandlerQueryParam | Promise<iFilterHandlerQueryParam>,
+  /*获取默认值*/
+  getDefaultValue: (option: iFilterOption<FilterConfig>) => PlainObject,
+  /*清理值*/
+  clearValue: (data: { formData: PlainObject, option: iFilterOption<FilterConfig> }) => void,
+  /**
+   * 获取描述文本
+   * 返回null表示没有筛选值
+   * 返回undefined表示有筛选值，但是没有需要显示的文本
+   * @author  韦胜健
+   * @date    2023.1.15 0:27
+   */
+  getDescription?: (data: { formData: PlainObject, option: iFilterOption<FilterConfig> }) => PlainObject | string | null | undefined,
+}
+
+export interface iFilterOption<FilterConfig = PlainObject> {
+  label: string,
+  field: string,
+  startField: string,
+  endField: string,
+  filterType: string,
+  filterHandler: string,
+  filterConfig: FilterConfig,
+  getQueryParam?: iFilterHandler<FilterConfig>['getQueryParam'],
+
+  defaultValue?: any,
+  defaultSearch?: boolean,
+}
+
+export type iCreateFilterOption = PartialFields<iFilterOption, 'startField' | 'endField' | 'filterConfig'>
+
+function createFilterOptions(val: iCreateFilterOption[]): iFilterOption[]
+function createFilterOptions(val: iCreateFilterOption): iFilterOption
+function createFilterOptions(val: iCreateFilterOption | iCreateFilterOption[]): any {
+  if (Array.isArray(val)) {
+    return val.map(i => createFilterOptions(i));
+  } else {
+    const option: iFilterOption = {
+      ...val,
+      filterConfig: val.filterConfig || {},
+      startField: val.startField || `${val.field}Start`,
+      endField: val.endField || `${val.field}End`,
+    };
+    return option;
+  }
+}
+
+export {createFilterOptions};

package/src/packages/components/FilterService/utils/mergeQueryParam.ts

@@ -1,80 +1,80 @@
-import {iFilterHandlerQueryMeta, iFilterHandlerQueryParam, iFilterQueryMeta, iFilterQueryParam} from "./filter.service.utils";
-import {PlainObject} from "plain-utils/utils/event";
-import {deepcopy} from "plain-utils/object/deepcopy";
-import {createCounter} from "plain-utils/utils/createCounter";
-
-export function mergeQueryParam(...queryParamList: (iFilterQueryParam | iFilterHandlerQueryParam | null | undefined | void)[]): iFilterQueryParam {
-  const requestData: PlainObject = {};
-  /*没有涉及到expression的简单筛选条件，以and的逻辑连接*/
-  const outerFilterHandlerQueryMetaList: iFilterHandlerQueryMeta[] = [];
-  /*设计到expression的复杂筛选条件，以expression的逻辑连接*/
-  const groupFilterHandlerQueryMetaList: { queries: iFilterHandlerQueryMeta[], expression: string }[] = [];
-
-  queryParamList.forEach((itemQueryParam) => {
-    if (!itemQueryParam) {return;}
-    const { queries, expression, ...itemRequestData } = deepcopy(itemQueryParam);
-    if (!!queries) {
-      if (!!expression && queries.length > 1) {
-        /*当返回多个queryMeta的时候，才会处理expression（只有一个queryMeta的话当做无特殊逻辑处理）*/
-        /*如果有返回expression，则将返回的queryMeta视为一个分组*/
-        groupFilterHandlerQueryMetaList.push({ expression, queries });
-      } else {
-        /*否则将queryMeta与其他的queryMeta做and连接*/
-        outerFilterHandlerQueryMetaList.push(...queries);
-      }
-    }
-    Object.assign(requestData, itemRequestData);
-  });
-
-  let paramQueries: iFilterQueryMeta[] = [];
-  let paramExpression: string | null = null;
-
-  /*没有设置id的给补充id*/
-  const outerFilterQueryMetaList: iFilterQueryMeta[] = outerFilterHandlerQueryMetaList.map(i => ({ ...i, id: i.id || nextQueryMetaId() }));
-
-  if (groupFilterHandlerQueryMetaList.length > 0) {
-    /*最外层无特殊逻辑的filtersRaw无论如何都不需要使用小括号包裹，否则会导致语法错误*/
-    const expressionList =
-      outerFilterQueryMetaList.length > 0
-        ? [`${outerFilterQueryMetaList.map((i) => i.id).join(' and ')}`]
-        : [];
-    groupFilterHandlerQueryMetaList.forEach(({ expression, queries }) => {
-      queries.forEach((i) => {
-        if (!i.id) {
-          console.log(i);
-          console.error(
-            `分组的filtersRaw每一项都不能缺少id，并且分组的filterOperator字符串应该含有使用这个id!`
-          );
-        }
-      });
-      outerFilterQueryMetaList.push(...queries as iFilterQueryMeta[]);
-      expressionList.push(`(${expression})`);
-    });
-    paramQueries = outerFilterQueryMetaList;
-    paramExpression = expressionList.join(' and ');
-  } else {
-    paramQueries = outerFilterQueryMetaList;
-    paramExpression = null;
-  }
-  /*while (
-    !!paramExpression &&
-    paramExpression.charAt(0) === '(' &&
-    paramExpression.charAt(paramExpression.length - 1) === ')'
-    ) {
-    paramExpression = paramExpression.slice(1, -1);
-  }*/
-  return {
-    ...requestData,
-    ...(paramQueries.length > 0 ? { queries: paramQueries } : {}),
-    ...(!!paramExpression && paramExpression.length > 0
-      ? { expression: paramExpression }
-      : {})
-  };
-}
-
-/**
- * 获取一个新的FiltersRaw的id
- * @author  韦胜健
- * @date    2022.9.8 16:27
- */
-export const nextQueryMetaId = createCounter('query_meta');
+import {iFilterHandlerQueryMeta, iFilterHandlerQueryParam, iFilterQueryMeta, iFilterQueryParam} from "./filter.service.utils";
+import {PlainObject} from "plain-utils/utils/event";
+import {deepcopy} from "plain-utils/object/deepcopy";
+import {createCounter} from "plain-utils/utils/createCounter";
+
+export function mergeQueryParam(...queryParamList: (iFilterQueryParam | iFilterHandlerQueryParam | null | undefined | void)[]): iFilterQueryParam {
+  const requestData: PlainObject = {};
+  /*没有涉及到expression的简单筛选条件，以and的逻辑连接*/
+  const outerFilterHandlerQueryMetaList: iFilterHandlerQueryMeta[] = [];
+  /*设计到expression的复杂筛选条件，以expression的逻辑连接*/
+  const groupFilterHandlerQueryMetaList: { queries: iFilterHandlerQueryMeta[], expression: string }[] = [];
+
+  queryParamList.forEach((itemQueryParam) => {
+    if (!itemQueryParam) {return;}
+    const { queries, expression, ...itemRequestData } = deepcopy(itemQueryParam);
+    if (!!queries) {
+      if (!!expression && queries.length > 1) {
+        /*当返回多个queryMeta的时候，才会处理expression（只有一个queryMeta的话当做无特殊逻辑处理）*/
+        /*如果有返回expression，则将返回的queryMeta视为一个分组*/
+        groupFilterHandlerQueryMetaList.push({ expression, queries });
+      } else {
+        /*否则将queryMeta与其他的queryMeta做and连接*/
+        outerFilterHandlerQueryMetaList.push(...queries);
+      }
+    }
+    Object.assign(requestData, itemRequestData);
+  });
+
+  let paramQueries: iFilterQueryMeta[] = [];
+  let paramExpression: string | null = null;
+
+  /*没有设置id的给补充id*/
+  const outerFilterQueryMetaList: iFilterQueryMeta[] = outerFilterHandlerQueryMetaList.map(i => ({ ...i, id: i.id || nextQueryMetaId() }));
+
+  if (groupFilterHandlerQueryMetaList.length > 0) {
+    /*最外层无特殊逻辑的filtersRaw无论如何都不需要使用小括号包裹，否则会导致语法错误*/
+    const expressionList =
+      outerFilterQueryMetaList.length > 0
+        ? [`${outerFilterQueryMetaList.map((i) => i.id).join(' and ')}`]
+        : [];
+    groupFilterHandlerQueryMetaList.forEach(({ expression, queries }) => {
+      queries.forEach((i) => {
+        if (!i.id) {
+          console.log(i);
+          console.error(
+            `分组的filtersRaw每一项都不能缺少id，并且分组的filterOperator字符串应该含有使用这个id!`
+          );
+        }
+      });
+      outerFilterQueryMetaList.push(...queries as iFilterQueryMeta[]);
+      expressionList.push(`(${expression})`);
+    });
+    paramQueries = outerFilterQueryMetaList;
+    paramExpression = expressionList.join(' and ');
+  } else {
+    paramQueries = outerFilterQueryMetaList;
+    paramExpression = null;
+  }
+  /*while (
+    !!paramExpression &&
+    paramExpression.charAt(0) === '(' &&
+    paramExpression.charAt(paramExpression.length - 1) === ')'
+    ) {
+    paramExpression = paramExpression.slice(1, -1);
+  }*/
+  return {
+    ...requestData,
+    ...(paramQueries.length > 0 ? { queries: paramQueries } : {}),
+    ...(!!paramExpression && paramExpression.length > 0
+      ? { expression: paramExpression }
+      : {})
+  };
+}
+
+/**
+ * 获取一个新的FiltersRaw的id
+ * @author  韦胜健
+ * @date    2022.9.8 16:27
+ */
+export const nextQueryMetaId = createCounter('query_meta');