Merge branch 'jinfa-0518' into 'jinfa-0518'

src/components/TabTree/index.tsx

@@ -100,7 +100,7 @@ const RenderIcons: React.FC<RenderIconsProps> = props => {
   // return <Space className={cx('god-tabtree-icons', props.nowKey === props.node.key ? 'show' : 'hide')}>
   return (
     <Space className={cx('god-tabtree-icons')}>
-      <Tooltip title={intl.formatMessage({ id: 'components.xinzengjiedian' })}>
+      {/* <Tooltip title={intl.formatMessage({ id: 'components.xinzengjiedian' })}>
         <PlusCircleOutlined
           onClick={e => {
             e.stopPropagation();
@@ -109,7 +109,7 @@ const RenderIcons: React.FC<RenderIconsProps> = props => {
               toolsRender.addNode(props.node);
           }}
         />
-      </Tooltip>
+      </Tooltip> */}
       {/* <Tooltip title={intl.formatMessage({ id: 'components.xinzengzijiedian' })}>
         <PlusCircleOutlined
           onClick={e => {

src/pages/classAndProperty/class/index.tsx

@@ -200,8 +200,8 @@ const ClassProperty: React.FC<{}> = () => {
     syncTreeActions.setSelectKeys([])
   }
 
-  const connectCategory = <div className='connectBtn' onClick={handleConnectCategroyBtn}><LinkOutlined style={{ marginRight: 4 }} />{intl.formatMessage({ id: 'classAndProperty.class.connectCategory' })}</div>
-
+  // const connectCategory = <div className='connectBtn'  onClick={handleConnectCategroyBtn}><LinkOutlined style={{ marginRight: 4 }} />{intl.formatMessage({ id: 'classAndProperty.class.connectCategory' })}</div>
+  const connectCategory = <div className='connectBtn' ><LinkOutlined style={{ marginRight: 4 }} />{intl.formatMessage({ id: 'classAndProperty.class.connectCategory' })}</div>
   return <PageHeaderWrapper
     title={intl.formatMessage({ id: 'classAndProperty.class.title' })}
     className="useConnectBtnWrapper"

src/pages/classAndProperty/class/schema/index.ts

@@ -25,6 +25,7 @@ export const classSchema: ISchema = {
           properties: {
             name: {
               type: 'string',
+              editable:false,
               title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name' }),
               'x-component-props': {
                 placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name.placeholder' }),
@@ -59,6 +60,7 @@ export const classSchema: ISchema = {
             },
             type: {
               type: 'number',
+              editable:false,
               title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type' }),
               'x-component-props': {
                 placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.placeholder' }),
@@ -77,10 +79,15 @@ export const classSchema: ISchema = {
               ],
             },
             imageUrl: {
+              // editable:false,
               title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.imageUrl' }),
               'x-component': 'CustomUpload',
+              'x-component-props':{
+                disabled: true,
+              }
             },
             category: {
+              editable:false,
               type: 'object',
               visible: false,             
               properties: {
@@ -103,6 +110,7 @@ export const classSchema: ISchema = {
               title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.sort' }),
               required: true,
               'x-component-props': {
+                disabled: true,
                 placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.sort.placeholder' }),
               },
               'x-rules': [
@@ -116,9 +124,10 @@ export const classSchema: ISchema = {
               type: 'string',
               title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.deadline' }),
               'x-component-props': {
+                disabled: true,
                 prefix: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.deadline.prefix' }),
                 suffix: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.deadline.suffix' }),
-                placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.deadline.placeholder' }),
+                // placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.deadline.placeholder' }),
               },
               'x-rules': [
                 {