plain-design 1.0.0-beta.8 → 1.0.0-beta.80

package/src/packages/components/FilterService/filter/filter.province.tsx

@@ -1,91 +1,91 @@
-import {iFilterService} from "../index";
-import {eFilterOperator, iFilterOption} from "../utils/filter.service.utils";
-import {Input} from "../../Input";
-import {$configuration} from "../../$configuration";
-import {eAddressTypeEnum} from "../../$address/address.utils";
-import {AddressCascade} from "../../AddressCascade";
-import {PlainObject} from "plain-utils/utils/event";
-import i18n from "../../i18n";
-
-/**
- * 渲染显示值
- * @author  韦胜健
- * @date    2023.1.15 0:30
- */
-export function createAddressDescriptionGetter({ multiple, valueType }: { valueType: 'arraystring' | 'arrayjson' | undefined, multiple: boolean }) {
-  return ({ formData, option }: { formData: PlainObject, option: iFilterOption }) => {
-    let val = formData[option.field];
-    if (!val) {return null;}
-    const service = $configuration.get('address')!;
-    if (!multiple) {
-      return service.getAddressByCodesComputed(val as string);
-    } else {
-      if (!Array.isArray(val)) {
-        if (valueType === "arrayjson") {
-          val = JSON.parse(val);
-        } else if (valueType === 'arraystring') {
-          val = val.split(',');
-        }
-      }
-      return service.getAddressByCodesComputed(val as string[]).join(',');
-    }
-  };
-}
-
-/**
- * 文本筛选
- * @author  韦胜健
- * @date    2023.1.6 16:45
- */
-export function installFilterProvince(
-  {
-    touch,
-    checkEmpty,
-    defaultNullHandler,
-    defaultNotnullHandler,
-  }: iFilterService) {
-  touch('province')
-    .setHandler('like', {
-      label: i18n('base.filter.like').d('约等于'),
-      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} onEnter={confirm}/>),
-      getQueryParam: async ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        const metas = await $configuration.get('address')!.getAddressByLabel(value, eAddressTypeEnum.province);
-        if (metas.length === 0) {return;}
-        return { queries: [{ field, value: metas.map(i => i.code).join(','), operator: eFilterOperator.in }] };
-      },
-    })
-    .setHandler('eq', {
-      label: i18n('base.filter.equal').d('等于'),
-      getDescription: createAddressDescriptionGetter({ multiple: false, valueType: undefined }),
-      render: ({ formData, option }) => (<AddressCascade v-model:province={formData[option.field!]} types="p"/>),
-      getQueryParam: async ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.eq }] };
-      },
-    })
-    .setHandler('in', {
-      label: i18n('base.filter.include').d('包含'),
-      getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
-      render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="p" multiple valueType="arraystring"/>),
-      getQueryParam: async ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.in }] };
-      },
-    })
-    .setHandler('not_in', {
-      label: i18n('base.filter.notInclude').d('不包含'),
-      getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
-      render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="p" multiple valueType="arraystring"/>),
-      getQueryParam: async ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.not_in }] };
-      },
-    })
-    .setHandler(...defaultNullHandler)
-    .setHandler(...defaultNotnullHandler);
-}
+import {iFilterService} from "../index";
+import {eFilterOperator, iFilterOption} from "../utils/filter.service.utils";
+import {Input} from "../../Input";
+import {$configuration} from "../../$configuration";
+import {eAddressTypeEnum} from "../../$address/address.utils";
+import {AddressCascade} from "../../AddressCascade";
+import {PlainObject} from "plain-utils/utils/event";
+import i18n from "../../i18n";
+
+/**
+ * 渲染显示值
+ * @author  韦胜健
+ * @date    2023.1.15 0:30
+ */
+export function createAddressDescriptionGetter({ multiple, valueType }: { valueType: 'arraystring' | 'arrayjson' | undefined, multiple: boolean }) {
+  return ({ formData, option }: { formData: PlainObject, option: iFilterOption }) => {
+    let val = formData[option.field];
+    if (!val) {return null;}
+    const service = $configuration.get('address')!;
+    if (!multiple) {
+      return service.getAddressByCodesComputed(val as string);
+    } else {
+      if (!Array.isArray(val)) {
+        if (valueType === "arrayjson") {
+          val = JSON.parse(val);
+        } else if (valueType === 'arraystring') {
+          val = val.split(',');
+        }
+      }
+      return service.getAddressByCodesComputed(val as string[]).join(',');
+    }
+  };
+}
+
+/**
+ * 文本筛选
+ * @author  韦胜健
+ * @date    2023.1.6 16:45
+ */
+export function installFilterProvince(
+  {
+    touch,
+    checkEmpty,
+    defaultNullHandler,
+    defaultNotnullHandler,
+  }: iFilterService) {
+  touch('province')
+    .setHandler('like', {
+      label: () => i18n.$it('base.filter.like').d('约等于'),
+      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} onEnter={confirm}/>),
+      getQueryParam: async ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        const metas = await $configuration.get('address')!.getAddressByLabel(value, eAddressTypeEnum.province);
+        if (metas.length === 0) {return;}
+        return { queries: [{ field, value: metas.map(i => i.code).join(','), operator: eFilterOperator.in }] };
+      },
+    })
+    .setHandler('eq', {
+      label: () => i18n.$it('base.filter.equal').d('等于'),
+      getDescription: createAddressDescriptionGetter({ multiple: false, valueType: undefined }),
+      render: ({ formData, option }) => (<AddressCascade v-model:province={formData[option.field!]} types="p"/>),
+      getQueryParam: async ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.eq }] };
+      },
+    })
+    .setHandler('in', {
+      label: () => i18n.$it('base.filter.include').d('包含'),
+      getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
+      render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="p" multiple valueType="arraystring"/>),
+      getQueryParam: async ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.in }] };
+      },
+    })
+    .setHandler('not_in', {
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
+      getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
+      render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="p" multiple valueType="arraystring"/>),
+      getQueryParam: async ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.not_in }] };
+      },
+    })
+    .setHandler(...defaultNullHandler)
+    .setHandler(...defaultNotnullHandler);
+}

package/src/packages/components/FilterService/filter/filter.select.tsx

@@ -1,66 +1,66 @@
-import {RenderNode} from "plain-design-composition";
-import {iFilterService} from "../index";
-import {eFilterOperator, iFilterOption} from "../utils/filter.service.utils";
-import {Select} from "../../Select";
-import {PlainObject} from "plain-utils/utils/event";
-import SelectDisplay from "../../SelectDisplay";
-import i18n from "../../i18n";
-
-export interface iFilterConfigSelect {
-  renderOptions: () => RenderNode,
-}
-
-/**
- * 渲染显示值
- * @author  韦胜健
- * @date    2023.1.15 0:30
- */
-function createDescriptionGetter({ multiple, valueType }: { valueType: 'arraystring' | 'arrayjson' | undefined, multiple: boolean }) {
-  return ({ formData, option }: { formData: PlainObject, option: iFilterOption<iFilterConfigSelect> }) => {
-    const val = formData[option.field];
-    if (!val) {return null;}
-    return <SelectDisplay modelValue={val} multiple={multiple} valueType={valueType}>{option.filterConfig.renderOptions()}</SelectDisplay>;
-  };
-}
-
-export function installFilterSelect(
-  {
-    touch,
-    checkEmpty,
-    defaultNullHandler,
-    defaultNotnullHandler,
-  }: iFilterService) {
-  touch<iFilterConfigSelect>('select')
-    .setHandler('eq', {
-      label: i18n('base.filter.equal').d('等于'),
-      getDescription: createDescriptionGetter({ multiple: false, valueType: undefined }),
-      render: ({ formData, option }) => (<Select v-model={formData[option.field]}>{option.filterConfig.renderOptions()}</Select>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.eq }] };
-      },
-    })
-    .setHandler('in', {
-      label: i18n('base.filter.include').d('包含'),
-      getDescription: createDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
-      render: ({ formData, option }) => (<Select v-model={formData[option.field]} multiple valueType="arraystring">{option.filterConfig.renderOptions()}</Select>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.in }] };
-      },
-    })
-    .setHandler('not_in', {
-      label: i18n('base.filter.notInclude').d('不包含'),
-      getDescription: createDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
-      render: ({ formData, option }) => (<Select v-model={formData[option.field]} multiple valueType="arraystring">{option.filterConfig.renderOptions()}</Select>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.not_in }] };
-      },
-    })
-    .setHandler(...defaultNullHandler)
-    .setHandler(...defaultNotnullHandler);
-}
+import {RenderNode} from "plain-design-composition";
+import {iFilterService} from "../index";
+import {eFilterOperator, iFilterOption} from "../utils/filter.service.utils";
+import {Select} from "../../Select";
+import {PlainObject} from "plain-utils/utils/event";
+import SelectDisplay from "../../SelectDisplay";
+import i18n from "../../i18n";
+
+export interface iFilterConfigSelect {
+  renderOptions: () => RenderNode,
+}
+
+/**
+ * 渲染显示值
+ * @author  韦胜健
+ * @date    2023.1.15 0:30
+ */
+function createDescriptionGetter({ multiple, valueType }: { valueType: 'arraystring' | 'arrayjson' | undefined, multiple: boolean }) {
+  return ({ formData, option }: { formData: PlainObject, option: iFilterOption<iFilterConfigSelect> }) => {
+    const val = formData[option.field];
+    if (!val) {return null;}
+    return <SelectDisplay modelValue={val} multiple={multiple} valueType={valueType}>{option.filterConfig.renderOptions()}</SelectDisplay>;
+  };
+}
+
+export function installFilterSelect(
+  {
+    touch,
+    checkEmpty,
+    defaultNullHandler,
+    defaultNotnullHandler,
+  }: iFilterService) {
+  touch<iFilterConfigSelect>('select')
+    .setHandler('eq', {
+      label: () => i18n.$it('base.filter.equal').d('等于'),
+      getDescription: createDescriptionGetter({ multiple: false, valueType: undefined }),
+      render: ({ formData, option }) => (<Select v-model={formData[option.field]}>{option.filterConfig.renderOptions()}</Select>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.eq }] };
+      },
+    })
+    .setHandler('in', {
+      label: () => i18n.$it('base.filter.include').d('包含'),
+      getDescription: createDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
+      render: ({ formData, option }) => (<Select v-model={formData[option.field]} multiple valueType="arraystring">{option.filterConfig.renderOptions()}</Select>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.in }] };
+      },
+    })
+    .setHandler('not_in', {
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
+      getDescription: createDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
+      render: ({ formData, option }) => (<Select v-model={formData[option.field]} multiple valueType="arraystring">{option.filterConfig.renderOptions()}</Select>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.not_in }] };
+      },
+    })
+    .setHandler(...defaultNullHandler)
+    .setHandler(...defaultNotnullHandler);
+}

package/src/packages/components/FilterService/filter/filter.text.tsx

@@ -1,57 +1,57 @@
-import {iFilterService} from "../index";
-import {eFilterOperator} from "../utils/filter.service.utils";
-import {Input} from "../../Input";
-import i18n from "../../i18n";
-
-/**
- * 文本筛选
- * @author  韦胜健
- * @date    2023.1.6 16:45
- */
-export function installFilterText(
-  {
-    touch,
-    checkEmpty,
-    defaultNullHandler,
-    defaultNotnullHandler,
-  }: iFilterService) {
-  touch('text')
-    .setHandler('like', {
-      label: i18n('base.filter.like').d('约等于'),
-      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} onEnter={confirm}/>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.like }] };
-      },
-    })
-    .setHandler('eq', {
-      label: i18n('base.filter.equal').d('等于'),
-      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} onEnter={confirm}/>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.eq }] };
-      },
-    })
-    .setHandler('in_like', {
-      label: i18n('base.filter.include').d('包含'),
-      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} multiple valueType="arraystring"/>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.in_like }] };
-      },
-    })
-    .setHandler('not_in_like', {
-      label: i18n('base.filter.notInclude').d('不包含'),
-      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} multiple valueType="arraystring"/>),
-      getQueryParam: ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
-        if (isEmpty) {return;}
-        return { queries: [{ field, value, operator: eFilterOperator.not_in_like }] };
-      },
-    })
-    .setHandler(...defaultNullHandler)
-    .setHandler(...defaultNotnullHandler);
-}
+import {iFilterService} from "../index";
+import {eFilterOperator} from "../utils/filter.service.utils";
+import {Input} from "../../Input";
+import i18n from "../../i18n";
+
+/**
+ * 文本筛选
+ * @author  韦胜健
+ * @date    2023.1.6 16:45
+ */
+export function installFilterText(
+  {
+    touch,
+    checkEmpty,
+    defaultNullHandler,
+    defaultNotnullHandler,
+  }: iFilterService) {
+  touch('text')
+    .setHandler('like', {
+      label: () => i18n.$it('base.filter.like').d('约等于'),
+      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} onEnter={confirm}/>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.like }] };
+      },
+    })
+    .setHandler('eq', {
+      label: () => i18n.$it('base.filter.equal').d('等于'),
+      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} onEnter={confirm}/>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.eq }] };
+      },
+    })
+    .setHandler('in_like', {
+      label: () => i18n.$it('base.filter.include').d('包含'),
+      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} multiple valueType="arraystring"/>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.in_like }] };
+      },
+    })
+    .setHandler('not_in_like', {
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
+      render: ({ formData, option, confirm }) => (<Input v-model={formData[option.field!]} multiple valueType="arraystring"/>),
+      getQueryParam: ({ formData, option }) => {
+        const { isEmpty, value, field } = checkEmpty(formData, option);
+        if (isEmpty) {return;}
+        return { queries: [{ field, value, operator: eFilterOperator.not_in_like }] };
+      },
+    })
+    .setHandler(...defaultNullHandler)
+    .setHandler(...defaultNotnullHandler);
+}