fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 22:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-03-27 02:44:12 +00:00
commit 3dcc8d32c1
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/plugins/@nocobase/plugin-environment-variables/src/client/components/EnvironmentTabs.tsx
View File

@ -10,9 +10,18 @@ import { DeleteOutlined, DownOutlined, PlusOutlined, ReloadOutlined } from '@ant
import { Checkbox, FormButtonGroup, FormItem, FormLayout, Input, Radio, Reset, Submit } from '@formily/antd-v5'; import { Checkbox, FormButtonGroup, FormItem, FormLayout, Input, Radio, Reset, Submit } from '@formily/antd-v5';
import { registerValidateRules } from '@formily/core'; import { registerValidateRules } from '@formily/core';
import { createSchemaField, useField } from '@formily/react'; import { createSchemaField, useField } from '@formily/react';
import { SchemaComponent, SchemaComponentOptions, useAPIClient, FormDrawer, useGlobalTheme } from '@nocobase/client'; import {
SchemaComponent,
SchemaComponentOptions,
useAPIClient,
FormDrawer,
useGlobalTheme,
removeNullCondition,
} from '@nocobase/client';
import { useLocation } from 'react-router-dom';
import { Alert, App, Button, Card, Dropdown, Flex, Space, Table, Tag } from 'antd'; import { Alert, App, Button, Card, Dropdown, Flex, Space, Table, Tag } from 'antd';
import React, { useContext, useState } from 'react'; import React, { useContext, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { VAR_NAME_RE } from '../../re'; import { VAR_NAME_RE } from '../../re';
import { EnvAndSecretsContext } from '../EnvironmentVariablesAndSecretsProvider'; import { EnvAndSecretsContext } from '../EnvironmentVariablesAndSecretsProvider';
import { useT } from '../locale'; import { useT } from '../locale';
@ -258,6 +267,13 @@ export function EnvironmentTabs() {
const [selectRowKeys, setSelectRowKeys] = useState([]); const [selectRowKeys, setSelectRowKeys] = useState([]);
const resource = api.resource('environmentVariables'); const resource = api.resource('environmentVariables');
const { theme } = useGlobalTheme(); const { theme } = useGlobalTheme();
const location = useLocation();
useEffect(() => {
const { run, params } = variablesRequest;
if (params?.length) {
run();
}
}, [location.key]);
const handleBulkImport = async (importData) => { const handleBulkImport = async (importData) => {
const arr = Object.entries(importData).map(([type, dataString]) => { const arr = Object.entries(importData).map(([type, dataString]) => {
return parseKeyValuePairs(dataString, type).filter(Boolean); return parseKeyValuePairs(dataString, type).filter(Boolean);
@ -359,13 +375,20 @@ export function EnvironmentTabs() {
const useFilterActionProps = () => { const useFilterActionProps = () => {
const field = useField<any>(); const field = useField<any>();
const { run } = variablesRequest; const { run } = variablesRequest;
const { t } = useTranslation();
return { return {
options: filterOptions, options: filterOptions,
onSubmit: async (values) => { onSubmit: async (values) => {
run(values); run(values);
field.setValue(values); field.setValue(values);
const filter = removeNullCondition(values?.filter);
const items = filter?.$and || filter?.$or;
if (items?.length) {
field.title = t('{{count}} filter items', { count: items?.length || 0 });
} else {
field.title = t('Filter');
}
}, },
onReset: (values) => { onReset: (values) => {
field.setValue(values); field.setValue(values);
@ -407,7 +430,7 @@ export function EnvironmentTabs() {
$and: [{ name: { $includes: '' } }], $and: [{ name: { $includes: '' } }],
}, },
'x-component': 'Filter.Action', 'x-component': 'Filter.Action',
'x-component-props': { icon: 'FilterOutlined' },
enum: filterOptions, enum: filterOptions,
'x-use-component-props': useFilterActionProps, 'x-use-component-props': useFilterActionProps,
}} }}