ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: cleanup

Browse Source
This commit is contained in:
chenos 2023-04-26 22:32:45 +08:00
parent 76527465f3
commit 77a6cbf773
12 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc
View File

@ -41,6 +41,8 @@
"react/display-name": "off", "react/display-name": "off",
"react/prop-types": "off", "react/prop-types": "off",
"no-explicit-any": "off", "no-explicit-any": "off",
"@typescript-eslint/no-explicit-any": "off" "@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-var-requires": "off"
} }
} }

7
packages/core/client/src/schema-component/antd/form-v2/utils.tsx
View File

@ -1,7 +1,8 @@
import { last, cloneDeep } from 'lodash'; import { evaluators } from '@nocobase/evaluators/client';
import { conditionAnalyse } from '../../common/utils/uitls'; import { cloneDeep, last } from 'lodash';
import { ActionType } from '../../../schema-settings/LinkageRules/type'; import { ActionType } from '../../../schema-settings/LinkageRules/type';
import evaluators from '@nocobase/evaluators/client'; import { conditionAnalyse } from '../../common/utils/uitls';
export const linkageMergeAction = ({ operator, value }, field, condition, values) => { export const linkageMergeAction = ({ operator, value }, field, condition, values) => {
const requiredResult = field?.linkageProperty?.required || [field?.initProperty?.required || false]; const requiredResult = field?.linkageProperty?.required || [field?.initProperty?.required || false];
const displayResult = field?.linkageProperty?.display || [field?.initProperty?.display]; const displayResult = field?.linkageProperty?.display || [field?.initProperty?.display];

9
packages/plugins/formula-field/src/client/components/Formula/Result.tsx
View File

@ -1,11 +1,10 @@
import React from 'react';
import { onFormValuesChange } from '@formily/core'; import { onFormValuesChange } from '@formily/core';
import { useFieldSchema, useFormEffects } from '@formily/react'; import { useFieldSchema, useFormEffects } from '@formily/react';
import cloneDeep from 'lodash/cloneDeep'; import { Checkbox, DatePicker, InputNumber, Input as InputString, useCollection } from '@nocobase/client';
import { Evaluator, evaluators } from '@nocobase/evaluators/client';
import evaluators, { Evaluator } from '@nocobase/evaluators/client';
import { Registry, toFixedByStep } from '@nocobase/utils/client'; import { Registry, toFixedByStep } from '@nocobase/utils/client';
import { Checkbox, DatePicker, Input as InputString, InputNumber, useCollection } from '@nocobase/client'; import cloneDeep from 'lodash/cloneDeep';
import React from 'react';
import { toDbType } from '../../../utils'; import { toDbType } from '../../../utils';

5
packages/plugins/formula-field/src/client/interfaces/formula.tsx
View File

@ -1,8 +1,7 @@
import { cloneDeep } from 'lodash';
import { i18n, IField, interfacesProperties } from '@nocobase/client'; import { i18n, IField, interfacesProperties } from '@nocobase/client';
import evaluators, { Evaluator } from '@nocobase/evaluators/client'; import { Evaluator, evaluators } from '@nocobase/evaluators/client';
import { Registry } from '@nocobase/utils/client'; import { Registry } from '@nocobase/utils/client';
import { cloneDeep } from 'lodash';
import { NAMESPACE } from '../locale'; import { NAMESPACE } from '../locale';
// const booleanReactions = [ // const booleanReactions = [

6
packages/plugins/formula-field/src/server/formula-field.ts
View File

@ -1,8 +1,6 @@
import { DataTypes } from 'sequelize';
import { BaseFieldOptions, Field } from '@nocobase/database'; import { BaseFieldOptions, Field } from '@nocobase/database';
import evaluators from '@nocobase/evaluators'; import { evaluators } from '@nocobase/evaluators';
import { DataTypes } from 'sequelize';
import { toDbType } from '../utils'; import { toDbType } from '../utils';
export interface FormulaFieldOptions extends BaseFieldOptions { export interface FormulaFieldOptions extends BaseFieldOptions {

5
packages/plugins/workflow/src/client/components/renderEngineReference.tsx
View File

@ -1,8 +1,7 @@
import React from 'react';
import { css } from '@emotion/css'; import { css } from '@emotion/css';
import { i18n } from '@nocobase/client'; import { i18n } from '@nocobase/client';
import evaluators from '@nocobase/evaluators/client'; import { evaluators } from '@nocobase/evaluators/client';
import React from 'react';
export const renderEngineReference = (key: string) => { export const renderEngineReference = (key: string) => {
const engine = evaluators.get(key); const engine = evaluators.get(key);

19
packages/plugins/workflow/src/client/nodes/calculation.tsx
View File

@ -1,19 +1,16 @@
import React from 'react';
import { observer } from '@formily/react';
import { FormLayout, FormItem } from '@formily/antd';
import { css } from '@emotion/css'; import { css } from '@emotion/css';
import parse from 'json-templates'; import { FormItem, FormLayout } from '@formily/antd';
import { useTranslation } from 'react-i18next'; import { SchemaInitializer, SchemaInitializerItemOptions, Variable, useCollectionManager } from '@nocobase/client';
import { Evaluator, evaluators, getOptions } from '@nocobase/evaluators/client';
import { Radio } from 'antd'; import { Radio } from 'antd';
import parse from 'json-templates';
import { SchemaInitializer, SchemaInitializerItemOptions, useCollectionManager, Variable } from '@nocobase/client'; import React from 'react';
import { evaluators, Evaluator, getOptions } from '@nocobase/evaluators/client'; import { useTranslation } from 'react-i18next';
import { useFlowContext } from '../FlowContext'; import { useFlowContext } from '../FlowContext';
import { lang, NAMESPACE } from '../locale';
import { BaseTypeSets, useWorkflowVariableOptions } from '../variable';
import { RadioWithTooltip } from '../components/RadioWithTooltip'; import { RadioWithTooltip } from '../components/RadioWithTooltip';
import { renderEngineReference } from '../components/renderEngineReference'; import { renderEngineReference } from '../components/renderEngineReference';
import { NAMESPACE, lang } from '../locale';
import { BaseTypeSets, useWorkflowVariableOptions } from '../variable';
function matchDynamicExpressionCollectionField(field): boolean { function matchDynamicExpressionCollectionField(field): boolean {
const { getCollectionFields, getCollection } = useCollectionManager(); const { getCollectionFields, getCollection } = useCollectionManager();

18
packages/plugins/workflow/src/client/nodes/condition.tsx
View File

@ -1,21 +1,19 @@
import React from 'react';
import { css, cx } from '@emotion/css';
import { Button, Select } from 'antd';
import { CloseCircleOutlined } from '@ant-design/icons'; import { CloseCircleOutlined } from '@ant-design/icons';
import { Trans, useTranslation } from 'react-i18next'; import { css, cx } from '@emotion/css';
import { Registry } from '@nocobase/utils/client';
import { Variable, useCompile } from '@nocobase/client'; import { Variable, useCompile } from '@nocobase/client';
import { evaluators } from '@nocobase/evaluators/client'; import { evaluators } from '@nocobase/evaluators/client';
import { Registry } from '@nocobase/utils/client';
import { Button, Select } from 'antd';
import React from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { NodeDefaultView } from '.'; import { NodeDefaultView } from '.';
import { Branch } from '../Branch'; import { Branch } from '../Branch';
import { useFlowContext } from '../FlowContext'; import { useFlowContext } from '../FlowContext';
import { branchBlockClass, nodeSubtreeClass } from '../style';
import { lang, NAMESPACE } from '../locale';
import { useWorkflowVariableOptions } from '../variable';
import { RadioWithTooltip, RadioWithTooltipOption } from '../components/RadioWithTooltip'; import { RadioWithTooltip, RadioWithTooltipOption } from '../components/RadioWithTooltip';
import { renderEngineReference } from '../components/renderEngineReference'; import { renderEngineReference } from '../components/renderEngineReference';
import { NAMESPACE, lang } from '../locale';
import { branchBlockClass, nodeSubtreeClass } from '../style';
import { useWorkflowVariableOptions } from '../variable';
interface Calculator { interface Calculator {
name: string; name: string;

16
packages/plugins/workflow/src/server/Processor.ts
View File

@ -1,15 +1,13 @@
import { Transaction, Transactionable } from 'sequelize';
import parse from 'json-templates';
import { Model } from '@nocobase/database'; import { Model } from '@nocobase/database';
import { appendArrayColumn } from '@nocobase/evaluators'; import { appendArrayColumn } from '@nocobase/evaluators';
import Plugin from '.';
import ExecutionModel from './models/Execution';
import JobModel from './models/Job';
import FlowNodeModel from './models/FlowNode';
import { EXECUTION_STATUS, JOB_STATUS } from './constants';
import { Logger } from '@nocobase/logger'; import { Logger } from '@nocobase/logger';
import parse from 'json-templates';
import { Transaction, Transactionable } from 'sequelize';
import Plugin from '.';
import { EXECUTION_STATUS, JOB_STATUS } from './constants';
import ExecutionModel from './models/Execution';
import FlowNodeModel from './models/FlowNode';
import JobModel from './models/Job';
export interface ProcessorOptions extends Transactionable { export interface ProcessorOptions extends Transactionable {
plugin: Plugin; plugin: Plugin;

6
packages/plugins/workflow/src/server/instructions/calculation.ts
View File

@ -1,11 +1,9 @@
import { Evaluator, evaluators } from '@nocobase/evaluators';
import parse from 'json-templates'; import parse from 'json-templates';
import { Instruction } from '.';
import evaluators, { Evaluator } from '@nocobase/evaluators';
import { Processor } from '..'; import { Processor } from '..';
import { JOB_STATUS } from '../constants'; import { JOB_STATUS } from '../constants';
import FlowNodeModel from '../models/FlowNode'; import FlowNodeModel from '../models/FlowNode';
import { Instruction } from '.';
interface CalculationConfig { interface CalculationConfig {
dynamic?: boolean | string; dynamic?: boolean | string;

5
packages/plugins/workflow/src/server/instructions/condition.ts
View File

@ -1,10 +1,9 @@
import { evaluators } from '@nocobase/evaluators';
import { Registry } from '@nocobase/utils'; import { Registry } from '@nocobase/utils';
import evaluators from '@nocobase/evaluators'; import { Instruction } from '.';
import { Processor } from '..'; import { Processor } from '..';
import { JOB_STATUS } from '../constants'; import { JOB_STATUS } from '../constants';
import FlowNodeModel from '../models/FlowNode'; import FlowNodeModel from '../models/FlowNode';
import { Instruction } from '.';
export const calculators = new Registry<Function>(); export const calculators = new Registry<Function>();

3
tsconfig.json
View File

@ -32,6 +32,9 @@
"@nocobase/preset-*": [ "@nocobase/preset-*": [
"packages/presets/*/src" "packages/presets/*/src"
], ],
"@nocobase/evaluators/client": [
"packages/core/evaluators/src/client"
],
"@nocobase/utils/client": [ "@nocobase/utils/client": [
"packages/core/utils/src/client" "packages/core/utils/src/client"
], ],