plain-design 1.0.0-beta.50 → 1.0.0-beta.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.50",
+  "version": "1.0.0-beta.51",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/components/FilterFormMultiple/index.tsx

@@ -236,7 +236,7 @@ export const FilterFormMultiple = designComponent({
                         width={100}
                       >
                         {filter.state.list.map((handler) => (
-                          <SelectOption label={handler!.label} val={handler!.name} key={handler!.name}/>
+                          <SelectOption label={handler!.label()} val={handler!.name} key={handler!.name}/>
                         ))}
                       </Select>
                       {handler.render({ formData: state.formData, option: filterOption, confirm: methods.search })}

package/src/packages/components/FilterFormSingle/index.tsx

@@ -155,7 +155,7 @@ export const FilterFormSingle = designComponent({
           {!props.hideHandlerSelector && (
             <Select width={90} modelValue={state.filterHandler} onUpdateModelValue={handler.onUpdateHandler} inputAttrs={inputAttrs}>
               {(FilterService.touch(usingFilterOption.value.filterType)).state.list.map((handler) => (
-                <SelectOption label={handler.label} val={handler.name} key={handler.name}/>
+                <SelectOption label={handler.label()} val={handler.name} key={handler.name}/>
               ))}
             </Select>
           )}

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

@@ -22,7 +22,7 @@ export function installFilterCity(
   }: iFilterService) {
   touch('city')
     .setHandler('like', {
-      label: i18n.$it('base.filter.like').d('约等于'),
+      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);
@@ -33,7 +33,7 @@ export function installFilterCity(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      label: () => i18n.$it('base.filter.equal').d('等于'),
       getDescription: ({ formData, option }: { formData: PlainObject, option: iFilterOption }) => {
         const val = formData[option.field]?.city;
         const service = $configuration.get('address')!;
@@ -60,7 +60,7 @@ export function installFilterCity(
       },
     })
     .setHandler('in', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      label: () => i18n.$it('base.filter.include').d('包含'),
       getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
       render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="pc" multiple valueType="arraystring"/>),
       getQueryParam: async ({ formData, option }) => {
@@ -70,7 +70,7 @@ export function installFilterCity(
       },
     })
     .setHandler('not_in', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
       getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
       render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="pc" multiple valueType="arraystring"/>),
       getQueryParam: async ({ formData, option }) => {

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

@@ -23,7 +23,7 @@ export function installFilterDate(
   }: iFilterService) {
   touch<iFilterConfigDate>('date')
     .setHandler('range', {
-      label: i18n.$it('base.filter.range').d('范围'),
+      label: () => i18n.$it('base.filter.range').d('范围'),
       getDescription: defaultRangeGetDescription,
       ...defaultRangeHandlerAttrs,
       render: ({ formData, option }) => <DatePicker
@@ -54,7 +54,7 @@ export function installFilterDate(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      label: () => i18n.$it('base.filter.equal').d('等于'),
       render: ({ formData, option }) => <DatePicker v-model={formData[option.field!]}/>,
       getQueryParam: ({ formData, option }) => {
         const { isEmpty, value, field } = checkEmpty(formData, option);
@@ -63,7 +63,7 @@ export function installFilterDate(
       },
     })
     .setHandler('in', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      label: () => i18n.$it('base.filter.include').d('包含'),
       render: ({ formData, option }) => <DatePicker v-model={formData[option.field!]} multiple valueType="arraystring"/>,
       getQueryParam: ({ formData, option }) => {
         const { isEmpty, value, field } = checkEmpty(formData, option);
@@ -72,7 +72,7 @@ export function installFilterDate(
       },
     })
     .setHandler('not_in', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
       render: ({ formData, option }) => <DatePicker v-model={formData[option.field!]} multiple valueType="arraystring"/>,
       getQueryParam: ({ formData, option }) => {
         const { isEmpty, value, field } = checkEmpty(formData, option);

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

@@ -23,7 +23,7 @@ export function installFilterDatetime(
   }: iFilterService) {
   touch<iFilterConfigDate>('datetime')
     .setHandler('range', {
-      label: i18n.$it('base.filter.range').d('范围'),
+      label: () => i18n.$it('base.filter.range').d('范围'),
       getDescription: defaultRangeGetDescription,
       ...defaultRangeHandlerAttrs,
       render: ({ formData, option }) => <DatePicker
@@ -55,7 +55,7 @@ export function installFilterDatetime(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      label: () => i18n.$it('base.filter.equal').d('等于'),
       render: ({ formData, option }) => <DatePicker v-model={formData[option.field!]} datetime/>,
       getQueryParam: ({ formData, option }) => {
         const { isEmpty, value, field } = checkEmpty(formData, option);

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

@@ -22,7 +22,7 @@ export function installFilterDistrict(
   }: iFilterService) {
   touch('district')
     .setHandler('like', {
-      label: i18n.$it('base.filter.like').d('约等于'),
+      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);
@@ -33,7 +33,7 @@ export function installFilterDistrict(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      label: () => i18n.$it('base.filter.equal').d('等于'),
       getDescription: ({ formData, option }: { formData: PlainObject, option: iFilterOption }) => {
         const val = formData[option.field]?.district;
         const service = $configuration.get('address')!;
@@ -61,7 +61,7 @@ export function installFilterDistrict(
       },
     })
     .setHandler('in', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      label: () => i18n.$it('base.filter.include').d('包含'),
       getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
       render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="pcd" multiple valueType="arraystring"/>),
       getQueryParam: async ({ formData, option }) => {
@@ -71,7 +71,7 @@ export function installFilterDistrict(
       },
     })
     .setHandler('not_in', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
       getDescription: createAddressDescriptionGetter({ multiple: true, valueType: 'arraystring' }),
       render: ({ formData, option }) => (<AddressCascade v-model={formData[option.field!]} types="pcd" multiple valueType="arraystring"/>),
       getQueryParam: async ({ formData, option }) => {

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

@@ -23,7 +23,7 @@ export function installFilterNumber(
 
   touch<iFilterConfigNumber>('number')
     .setHandler('range', {
-      label: i18n.$it('base.filter.range').d('范围'),
+      label: () => i18n.$it('base.filter.range').d('范围'),
       ...defaultRangeHandlerAttrs,
       getDescription: defaultRangeGetDescription,
       render: ({ formData, option, confirm }) => (

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

@@ -46,7 +46,7 @@ export function installFilterProvince(
   }: iFilterService) {
   touch('province')
     .setHandler('like', {
-      label: i18n.$it('base.filter.like').d('约等于'),
+      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);
@@ -57,7 +57,7 @@ export function installFilterProvince(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      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 }) => {
@@ -67,7 +67,7 @@ export function installFilterProvince(
       },
     })
     .setHandler('in', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      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 }) => {
@@ -77,7 +77,7 @@ export function installFilterProvince(
       },
     })
     .setHandler('not_in', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      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 }) => {

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

@@ -32,7 +32,7 @@ export function installFilterSelect(
   }: iFilterService) {
   touch<iFilterConfigSelect>('select')
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      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 }) => {
@@ -42,7 +42,7 @@ export function installFilterSelect(
       },
     })
     .setHandler('in', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      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 }) => {
@@ -52,7 +52,7 @@ export function installFilterSelect(
       },
     })
     .setHandler('not_in', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      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 }) => {

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

@@ -17,7 +17,7 @@ export function installFilterText(
   }: iFilterService) {
   touch('text')
     .setHandler('like', {
-      label: i18n.$it('base.filter.like').d('约等于'),
+      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);
@@ -26,7 +26,7 @@ export function installFilterText(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      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);
@@ -35,7 +35,7 @@ export function installFilterText(
       },
     })
     .setHandler('in_like', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      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);
@@ -44,7 +44,7 @@ export function installFilterText(
       },
     })
     .setHandler('not_in_like', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      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);

package/src/packages/components/FilterService/filter/fitler.object.tsx

@@ -40,7 +40,7 @@ export function installFilterObject(
   }: iFilterService) {
   touch<iFilterConfigObject>('object')
     .setHandler('like', {
-      label: i18n.$it('base.filter.like').d('约等于'),
+      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);
@@ -49,7 +49,7 @@ export function installFilterObject(
       },
     })
     .setHandler('eq', {
-      label: i18n.$it('base.filter.equal').d('等于'),
+      label: () => i18n.$it('base.filter.equal').d('等于'),
       render: ({ formData, option, confirm }) => (
         <_Object
           v-model={formData[option.field]}
@@ -69,7 +69,7 @@ export function installFilterObject(
       },
     })
     .setHandler('in', {
-      label: i18n.$it('base.filter.include').d('包含'),
+      label: () => i18n.$it('base.filter.include').d('包含'),
       getDescription: createDescriptionGetter(),
       render: ({ formData, option, confirm }) => (
         <_Object
@@ -90,7 +90,7 @@ export function installFilterObject(
       },
     })
     .setHandler('not_in', {
-      label: i18n.$it('base.filter.notInclude').d('不包含'),
+      label: () => i18n.$it('base.filter.notInclude').d('不包含'),
       getDescription: createDescriptionGetter(),
       render: ({ formData, option, confirm }) => (
         <_Object

package/src/packages/components/FilterService/index.tsx

@@ -168,7 +168,7 @@ export const FilterService = (() => {
   const defaultNullHandler: Parameters<iFilterType<any>['setHandler']> = [
     'is_null',
     {
-      label: i18n.$it('base.isEmpty').d('为空'),
+      label: () => i18n.$it('base.isEmpty').d('为空'),
       getDescription: () => undefined,
       render: () => (<Input placeholder={i18n.$it('base.isEmpty').d('为空')} disabled/>),
       getQueryParam: ({ formData, option }) => {
@@ -182,7 +182,7 @@ export const FilterService = (() => {
   const defaultNotnullHandler: Parameters<iFilterType<any>['setHandler']> = [
     'is_not_null',
     {
-      label: i18n.$it('base.isNotEmpty').d('不为空'),
+      label: () => i18n.$it('base.isNotEmpty').d('不为空'),
       getDescription: () => undefined,
       render: () => (<Input placeholder={i18n.$it('base.isNotEmpty').d('不为空')} disabled/>),
       getQueryParam: ({ formData, option }) => {

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

@@ -82,7 +82,7 @@ export interface iFilterHandler<FilterConfig = PlainObject> {
   /*唯一标识*/
   name: string;
   /*显示名称*/
-  label: string,
+  label: () => string,
   /*排序*/
   seq: number,
   /*渲染内容*/