mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: china region code eq

Browse Source
This commit is contained in:
chenos 2024-08-05 16:04:50 +08:00
parent dd9f5d5e52
commit 6434b5d8dc
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/client/src/collection-manager/interfaces/chinaRegion.ts
View File

@ -8,8 +8,8 @@
*/
import { uid } from '@formily/shared';
import { defaultProps, operators } from './properties';
import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface';
import { defaultProps, operators } from './properties';
export class ChinaRegionFieldInterface extends CollectionFieldInterface {
name = 'chinaRegion';
@ -86,6 +86,16 @@ export class ChinaRegionFieldInterface extends CollectionFieldInterface {
filterable = {
children: [
{
name: 'code',
title: '{{t("Province/city/area code")}}',
operators: operators.regionCode,
schema: {
title: '{{t("Province/city/area code")}}',
type: 'string',
'x-component': 'Input',
},
},
{
name: 'name',
title: '{{t("Province/city/area name")}}',

2
packages/core/client/src/collection-manager/interfaces/properties/operators.ts
View File

@ -16,6 +16,8 @@ export const string = [
{ label: '{{t("is not empty")}}', value: '$notEmpty', noValue: true },
];
export const regionCode = [{ label: '{{t("is")}}', value: '$regionCodeEq' }];
export const array = [
{
label: '{{t("is")}}',

15
packages/plugins/@nocobase/plugin-field-china-region/src/server/index.ts
View File

@ -8,7 +8,7 @@
*/
import { Plugin } from '@nocobase/server';
import { resolve } from 'path';
import _ from 'lodash';
import { ChinaRegionInterface } from './interfaces/china-region-interface';
function getChinaDivisionData(key: string) {
@ -26,10 +26,19 @@ export class PluginFieldChinaRegionServer extends Plugin {
}
async load() {
await this.importCollections(resolve(__dirname, 'collections'));
this.app.acl.allow('chinaRegions', 'list', 'loggedIn');
this.db.registerOperators({
$regionCodeEq: (value, ctx) => {
const eq = this.db.operators.get('$eq');
if (Array.isArray(value)) {
const obj = _.castArray(value).pop();
return eq(obj?.code, ctx);
}
return eq(value, ctx);
},
});
this.app.resourcer.use(async (ctx, next) => {
const { resourceName, actionName } = ctx.action.params;