diff --git a/src/components/PanelComponents/FormItems/FormItems.tsx b/src/components/PanelComponents/FormItems/FormItems.tsx index bd103ac..a853321 100644 --- a/src/components/PanelComponents/FormItems/FormItems.tsx +++ b/src/components/PanelComponents/FormItems/FormItems.tsx @@ -4,6 +4,7 @@ import EditorModal from './EditorModal'; import { EditOutlined, MinusCircleOutlined } from '@ant-design/icons'; import styles from './formItems.less'; import { baseFormUnion, TFormItemsDefaultType } from '../FormEditor/types'; +import { uuid } from '@/utils/tool'; // import { Popconfirm } from 'antd'; @@ -67,7 +68,7 @@ const FormItems = (props: FormItemsProps) => { const handleAddItem = (item: baseFormUnion) => { let tpl = formTpl.find(v => v.type === item.type); - let newData = [...formData, tpl!]; + let newData = [...formData, { ...tpl!, id: uuid(6, 10) }]; setFormData(newData); onChange && onChange(newData); }; diff --git a/src/global.css b/src/global.css index ca19bf9..08a8694 100644 --- a/src/global.css +++ b/src/global.css @@ -26,6 +26,12 @@ body { border-color: #2F54EB !important; } +.ant-btn-link[disabled], .ant-btn-link[disabled]:active, .ant-btn-link[disabled]:focus, .ant-btn-link[disabled]:hover { + color: rgba(0,0,0,.25) !important; + background: transparent !important; + border-color: transparent !important; +} + @import '~react-grid-layout/css/styles.css'; @import '~react-resizable/css/styles.css'; @import '~zarm/dist/zarm.min.css'; diff --git a/src/pages/editor/Container.js b/src/pages/editor/Container.js index 0c89388..a382521 100644 --- a/src/pages/editor/Container.js +++ b/src/pages/editor/Container.js @@ -124,8 +124,7 @@ const Container = props => { message={
Dooring升级啦!
-
Dooring添加自动保存功能
-
已有500+人使用
+
已有1000+人使用
持续迭代中...
} diff --git a/src/pages/editor/SourceBox.js b/src/pages/editor/SourceBox.js index 44a9954..73996cb 100644 --- a/src/pages/editor/SourceBox.js +++ b/src/pages/editor/SourceBox.js @@ -7,6 +7,7 @@ import { connect } from 'dva'; import DynamicEngine from 'components/DynamicEngine'; import styles from './index.less'; import { uuid } from '@/utils/tool'; + const SourceBox = memo(props => { const { pstate, scaleNum, canvasId, allType, dispatch } = props; @@ -123,7 +124,7 @@ const SourceBox = memo(props => { className={styles.layout} cols={24} rowHeight={2} - width={canvasRect[0]} + width={canvasRect[0] || 0} margin={[0, 0]} onDragStop={dragStop} onDragStart={onDragStart} diff --git a/src/pages/editor/components/Header/index.js b/src/pages/editor/components/Header/index.js index 6092c1b..1020f17 100644 --- a/src/pages/editor/components/Header/index.js +++ b/src/pages/editor/components/Header/index.js @@ -193,13 +193,7 @@ const HeaderComponent = memo(props => { > -