From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 608130d..4a4bd91 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox, Typography } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
@@ -10,7 +10,6 @@
import './index.scss'
const { TextArea } = Input
-const { Paragraph } = Typography
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
const acTyOptions = {
@@ -166,7 +165,7 @@
reOptions.intertype = this.state.interTypeOptions
if (intertype === 'custom') {
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType', 'outerBlacklist')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
@@ -174,14 +173,16 @@
shows.push('innerFunc')
}
if (this.record.callbackType === 'func') {
- shows.push('callbackFunc')
+ shows.push('callbackFunc', 'output')
+ } else if (this.record.callbackType === 'script') {
+ shows.push('cbTable', 'output')
} else if (this.record.callbackType !== 'none') {
shows.push('cbTable')
}
reReadonly.interface = false
reRequired.interface = true
} else if (intertype === 'outer') {
- shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType', 'output')
+ shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
@@ -189,7 +190,9 @@
shows.push('innerFunc')
}
if (this.record.callbackType === 'func') {
- shows.push('callbackFunc')
+ shows.push('callbackFunc', 'output')
+ } else if (this.record.callbackType === 'script') {
+ shows.push('cbTable', 'output')
} else if (this.record.callbackType !== 'none') {
shows.push('cbTable')
}
@@ -498,7 +501,7 @@
}
if (appType === 'mob') {
- if (Ot !== 'notRequired' && openType !== 'excelOut') {
+ if (openType !== 'excelOut') {
shows.push('control')
reOptions.control = [
{ value: '', text: '鏃�' },
@@ -513,7 +516,7 @@
}
}
} else {
- if (Ot !== 'notRequired' && openType !== 'excelOut') {
+ if (openType !== 'excelOut') {
reOptions.control = [
{ value: '', text: '鏃�' },
{ value: 'disabled', text: '绂佺敤' },
@@ -800,6 +803,10 @@
{ pattern: formRule.func.pattern, message: formRule.func.message },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
+ } else if (item.key === 'outerBlacklist') {
+ rules.push(
+ { max: 512, message: '鏈�澶�512涓瓧绗�' }
+ )
} else if (item.key === 'output') {
if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
rules = [{
@@ -929,7 +936,7 @@
fields.push(
<Col span={span} key={index}>
<Form.Item className={className} help={item.help} label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
+ <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
@@ -942,16 +949,6 @@
</Col>
)
})
-
- if (window.debugger && this.props.card.uuid) {
- fields.push(
- <Col span={12} key="uuid">
- <Form.Item label="鎸夐挳ID">
- <Paragraph copyable>{this.props.card.uuid}</Paragraph>
- </Form.Item>
- </Col>
- )
- }
return fields
}
@@ -1065,6 +1062,10 @@
})
}
}
+
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+ }
if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
let list = null
--
Gitblit v1.8.0