Merge branch 'master' into positec

king

2025-04-21 f3d4db769ba9b51b799d981511a710fd443d0e08

 src/views/appmanage/scriptform/index.jsx

@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, Select, notification } from 'antd'
import { Form, Row, Col, Input, Select, notification, Tooltip } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import moment from 'moment'

import Api from '@/api'
@@ -16,7 +17,7 @@
  }

  state = {
    type: 'subapp',
    type: 'view',
    sublist: [],
    views: [],
    appId: '',
@@ -42,7 +43,9 @@

    this.viewList = {}

    this.setState({sublist, appId, subAppId})
    this.setState({sublist, appId, subAppId}, () => {
      this.getViews()
    })
  }

  /**
@@ -148,20 +151,24 @@
    const formItemLayout = {
      labelCol: {
        xs: { span: 24 },
        sm: { span: 8 }
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 16 }
        sm: { span: 18 }
      }
    }
    return (
      <Form {...formItemLayout} className="app-script-form">
        <Row gutter={24}>
          <Col span={12}>
            <Form.Item label="类型">
            <Form.Item label={
              <Tooltip placement="topLeft" title="1、初次升级或应用基本信息修改时，请首先添加应用（基本信息）；2、子应用整体升级时，请添加子应用（升级内容包括页面及权限树）；3、单个页面升级时，请添加页面；4、涉及权限更新时，请添加权限树">
                <QuestionCircleOutlined className="mk-form-tip" />类型
              </Tooltip>
            }>
              {getFieldDecorator('VType', {
                initialValue: 'subapp',
                initialValue: 'view',
                rules: [{
                  required: true,
                  message: '请选择类型!'
@@ -219,9 +226,9 @@
                  message: '请选择页面!'
                }]
              })(
                <Select>
                <Select showSearch dropdownMatchSelectWidth={false} filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
                  {views.map(item => {
                    return <Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>
                    return <Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName + ' ' + item.MenuNo}</Select.Option>
                  })}
                </Select>
              )}