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

Merge branch 'main' into chore/kanban

Browse Source
This commit is contained in:
katherinehhh 2023-04-14 19:14:52 +08:00
commit 46d8c00f76
12 changed files with 121 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/block-provider/GanttBlockProvider.tsx
View File

@ -13,6 +13,7 @@ const formatData = (
hideChildren: boolean = false,
) => {
data.forEach((item: any) => {
const percent=item[fieldNames.progress] * 100;
if (item.children && item.children.length) {
tasks.push({
start: new Date(item[fieldNames.start]),
@ -20,7 +21,7 @@ const formatData = (
name: item[fieldNames.title],
id: item.id + '',
type: 'project',
progress: item[fieldNames.progress] * 100 || 0,
progress: percent>100?100:percent || 0,
hideChildren: hideChildren,
project: projectId,
color: item.color,
@ -33,7 +34,7 @@ const formatData = (
name: item[fieldNames.title],
id: item.id + '',
type: fieldNames.end ? 'task' : 'milestone',
progress: item[fieldNames.progress] * 100 || 0,
progress: percent>100?100:percent || 0,
project: projectId,
color: item.color,
});

12
packages/core/client/src/block-provider/hooks/index.ts
View File

@ -718,7 +718,17 @@ export const useDestroyActionProps = () => {
await resource.destroy({
filterByTk,
});
service?.refresh?.();
const { count = 0, page = 0, pageSize = 0 } = service?.data?.meta || {};
if (count % pageSize === 1) {
service.run({
...service?.params?.[0],
page: page - 1,
});
} else {
service?.refresh?.();
}
if (block !== 'TableField') {
__parent?.service?.refresh?.();
setVisible?.(false);

2
packages/core/client/src/schema-component/antd/gantt/components/gantt/task-gantt.tsx
View File

@ -39,7 +39,7 @@ export const TaskGantt: React.FC<TaskGanttProps> = forwardRef(
width={gridProps.svgWidth}
height={calendarProps.headerHeight}
fontFamily={barProps.fontFamily}
style={{ borderBottom: '1px solid #f0f0f0',fontWeight:700 }}
style={{ borderBottom: '1px solid #f0f0f0', fontWeight: 700 }}
>
<Calendar {...calendarProps} />
</svg>

2
packages/core/client/src/schema-component/antd/gantt/components/task-item/task-item.tsx
View File

@ -98,7 +98,7 @@ export const TaskItem: React.FC<TaskItemProps> = (props) => {
{taskItem}
<text
x={isProjectBar ? task.x1 : getX()}
y={isProjectBar ? task.y - 8 : task.y + taskHeight * 0.5}
y={isProjectBar ? task.y - 8 : isTextInside ? task.y + taskHeight * 0.5 : task.y + taskHeight * 0.65}
className={isProjectBar ? cx(projectLabel) : isTextInside ? cx(barLabel) : cx(barLabel) && cx(barLabelOutside)}
ref={textRef}
>

4
packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
View File

@ -58,7 +58,7 @@ ReadPretty.TextArea = (props) => {
value
);
return (
<div className={cls(prefixCls, props.className)} style={props.style}>
<div className={cls(prefixCls, props.className)} style={{ overflowWrap: 'break-word', ...props.style }}>
{props.addonBefore}
{props.prefix}
{content}
@ -94,7 +94,7 @@ ReadPretty.Html = (props) => {
</EllipsisWithTooltip>
);
return (
<div className={cls(prefixCls, props.className)} style={props.style}>
<div className={cls(prefixCls, props.className)} style={{ overflowWrap: 'break-word', ...props.style }}>
{props.addonBefore}
{props.prefix}
{content}

3
packages/core/client/src/schema-component/antd/markdown/style.less
View File

@ -1,8 +1,5 @@
.nb-markdown {
line-height: 1.612;
a {
word-break: break-all;
}
}
.nb-markdown > *:last-child {

2
packages/core/client/src/schema-component/antd/table-v2/Table.tsx
View File

@ -131,7 +131,7 @@ const usePaginationProps = (pagination1, pagination2) => {
...pagination1,
...pagination2,
};
return result.total < result.pageSize ? false : result;
return result.total <= result.pageSize ? false : result;
};
const useValidator = (validator: (value: any) => string) => {

26
packages/core/client/src/schema-component/antd/variable/JSONInput.tsx
View File

@ -1,10 +1,10 @@
import React, { useRef, useState } from 'react';
import { Button, Cascader, Popover, Input as AntInput } from 'antd';
import React, { useRef } from 'react';
import { Button } from 'antd';
import { css } from "@emotion/css";
import { Input } from "../input";
import { useTranslation } from 'react-i18next';
import { XButton } from './XButton';
import { VariableSelect } from './VariableSelect';
@ -21,7 +21,6 @@ export function JSONInput(props) {
const inputRef = useRef<any>(null);
const { value, space = 2, scope } = props;
const { t } = useTranslation();
const [selectedVar, setSelectedVar] = useState<string[]>([]);
const options = typeof scope === 'function' ? scope() : (scope ?? []);
function onFormat() {
@ -72,24 +71,7 @@ export function JSONInput(props) {
`}
>
<Button onClick={onFormat}>{t('Prettify')}</Button>
<Popover
content={(
<AntInput.Group compact>
<Cascader
placeholder={t('Select a variable')}
value={selectedVar}
options={options}
onChange={(keyPaths) => setSelectedVar(keyPaths as string[])}
changeOnSelect
/>
<Button onClick={onInsert}>{t('Insert')}</Button>
</AntInput.Group>
)}
trigger="click"
placement="topRight"
>
<XButton />
</Popover>
<VariableSelect options={options} onInsert={onInsert} />
</Button.Group>
</div>
);

75
packages/core/client/src/schema-component/antd/variable/TextArea.tsx
View File

@ -1,12 +1,12 @@
import React, { useState, useEffect, useRef, useMemo } from 'react';
import { Input, Cascader, Button, Tag } from 'antd';
import { Input } from 'antd';
import { useForm } from '@formily/react';
import { cx, css } from '@emotion/css';
import { useTranslation } from 'react-i18next';
import * as sanitizeHTML from 'sanitize-html';
import { EllipsisWithTooltip, useCompile } from '../..';
import { useRecord } from '../../../record-provider';
import { VariableSelect } from './VariableSelect';
type RangeIndexes = [number, number, number, number];
@ -341,19 +341,6 @@ export function TextArea(props) {
}
}
}
.x-button{
.ant-select.ant-cascader{
position: absolute;
top: -1px;
left: -1px;
min-width: auto;
width: calc(100% + 2px);
height: calc(100% + 2px);
overflow: hidden;
opacity: 0;
}
}
`}
>
<div
@ -382,63 +369,7 @@ export function TextArea(props) {
dangerouslySetInnerHTML={{ __html: html }}
/>
{!disabled
? (
<Button className={cx('x-button', css`
position: relative;
`)}>
<span
className={css`
font-style: italic;
font-family: "New York", "Times New Roman", Times, serif;
`}
>x</span>
<Cascader
placeholder={t('Select a variable')}
value={[]}
options={options}
onChange={(keyPaths = [], selectedOptions = []) => {
setSelectedVar(keyPaths as string[]);
if (!keyPaths.length) {
return;
}
const option = selectedOptions[selectedOptions.length - 1];
if (!option?.children?.length) {
onInsert(keyPaths);
}
}}
changeOnSelect
onClick={(e: any) => {
if (e.detail !== 2) {
return;
}
for (let n = e.target; n && n !== e.currentTarget; n = n.parentNode) {
if (Array.from(n.classList ?? []).includes('ant-cascader-menu-item')) {
onInsert(selectedVar);
}
}
}}
dropdownClassName={css`
.ant-cascader-menu{
margin-bottom: 0;
}
`}
dropdownRender={(menu) => (
<>
{menu}
<div
className={css`
padding: .5em;
border-top: 1px solid rgba(0, 0, 0, .06);
color: rgba(0, 0, 0, .45);
`}
>
{t('Double click to choose entire object')}
</div>
</>
)}
/>
</Button>
)
? <VariableSelect options={options} onInsert={onInsert} />
: null
}
</Input.Group>

83
packages/core/client/src/schema-component/antd/variable/VariableSelect.tsx Normal file
View File

@ -0,0 +1,83 @@
import { css, cx } from "@emotion/css";
import { Button, Cascader } from "antd";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
export function VariableSelect(props) {
const { options, onInsert } = props;
const { t } = useTranslation();
const [selectedVar, setSelectedVar] = useState<string[]>([]);
useEffect(() => {
setSelectedVar([]);
}, [options]);
return (
<Button className={cx('x-button', css`
position: relative;
.ant-select.ant-cascader{
position: absolute;
top: -1px;
left: -1px;
min-width: auto;
width: calc(100% + 2px);
height: calc(100% + 2px);
overflow: hidden;
opacity: 0;
}
`)}>
<span
className={css`
font-style: italic;
font-family: "New York", "Times New Roman", Times, serif;
`}
>x</span>
<Cascader
placeholder={t('Select a variable')}
value={[]}
options={options}
onChange={(keyPaths = [], selectedOptions = []) => {
setSelectedVar(keyPaths as string[]);
if (!keyPaths.length) {
return;
}
const option = selectedOptions[selectedOptions.length - 1];
if (!option?.children?.length) {
onInsert(keyPaths);
}
}}
changeOnSelect
onClick={(e: any) => {
if (e.detail !== 2) {
return;
}
for (let n = e.target; n && n !== e.currentTarget; n = n.parentNode) {
if (Array.from(n.classList ?? []).includes('ant-cascader-menu-item')) {
onInsert(selectedVar);
}
}
}}
dropdownClassName={css`
.ant-cascader-menu{
margin-bottom: 0;
}
`}
dropdownRender={(menu) => (
<>
{menu}
<div
className={css`
padding: .5em;
border-top: 1px solid rgba(0, 0, 0, .06);
color: rgba(0, 0, 0, .45);
`}
>
{t('Double click to choose entire object')}
</div>
</>
)}
/>
</Button>
);
}

8
packages/plugins/workflow/src/client/nodes/delay.tsx
View File

@ -19,15 +19,13 @@ export default {
type: 'number',
title: `{{t("End Status", { ns: "${NAMESPACE}" })}}`,
'x-decorator': 'FormItem',
'x-component': 'Select',
'x-component-props': {
placeholder: `{{t("Select status", { ns: "${NAMESPACE}" })}}`,
},
'x-component': 'Radio.Group',
enum: [
{ label: `{{t("Succeed and continue", { ns: "${NAMESPACE}" })}}`, value: JOB_STATUS.RESOLVED },
{ label: `{{t("Fail and exit", { ns: "${NAMESPACE}" })}}`, value: JOB_STATUS.FAILED },
],
required: true
required: true,
default: JOB_STATUS.RESOLVED
}
},
view: {

10
packages/plugins/workflow/src/client/nodes/index.tsx
View File

@ -423,7 +423,6 @@ export function NodeDefaultView(props) {
'x-component': 'fieldset',
'x-component-props': {
className: css`
.ant-input,
.ant-select,
.ant-cascader-picker,
.ant-picker,
@ -434,6 +433,15 @@ export function NodeDefaultView(props) {
min-width: 6em;
}
}
.ant-input-affix-wrapper{
&:not(.full-width){
.ant-input{
width: auto;
min-width: 6em;
}
}
}
`
},
properties: instruction.fieldset