@@ -36,8 +36,15 @@ class FilesList extends React.Component {
-
previewFile(e, item.filePath, item.relatedRecord ? item.relatedRecord[0] : null)} title={$L('预览')}>
- {$fileCutName(item.filePath)}
+ {
+ $.get(`/files/check-readable?id=${item.id}`, (res) => {
+ if (res.data) RbPreview.create(res.data)
+ else RbHighbar.create($L('你没有查看此文件的权限'))
+ })
+ }}
+ title={$L('预览')}>
+ {item.fileName}
{item.fileSize}
@@ -118,19 +125,6 @@ class FilesList extends React.Component {
}
}
-// 文件预览
-const previewFile = function (e, path, checkId) {
- $stopEvent(e)
- if (checkId) {
- $.get(`/files/check-readable?id=${checkId}`, (res) => {
- if (res.data) RbPreview.create(path)
- else RbHighbar.error($L('你没有查看此文件的权限'))
- })
- } else {
- RbPreview.create(path)
- }
-}
-
// ~~ 共享列表
class SharedFiles extends RbModalHandler {
render() {
diff --git a/src/main/resources/web/assets/js/general/rb-approval.js b/src/main/resources/web/assets/js/general/rb-approval.js
index 10a3b0d1e..b8e615e7e 100644
--- a/src/main/resources/web/assets/js/general/rb-approval.js
+++ b/src/main/resources/web/assets/js/general/rb-approval.js
@@ -1020,7 +1020,7 @@ class EditableFieldForms extends React.Component {
item.isFull = true
delete item.referenceQuickNew // v35
// eslint-disable-next-line no-undef
- return detectElement(item, entity.entity)
+ return detectElement(item)
})}
)
diff --git a/src/main/resources/web/assets/js/general/rb-forms.js b/src/main/resources/web/assets/js/general/rb-forms.js
index 2bbfe21d4..e0cb17dff 100644
--- a/src/main/resources/web/assets/js/general/rb-forms.js
+++ b/src/main/resources/web/assets/js/general/rb-forms.js
@@ -130,9 +130,7 @@ class RbFormModal extends React.Component {
readonly={!!formModel.readonlyMessage}
ref={(c) => (that._formComponentRef = c)}
_disableAutoFillin={that.props._disableAutoFillin}>
- {formModel.elements.map((item) => {
- return detectElement(item, entity)
- })}
+ {formModel.elements.map((item) => detectElement(item))}
)
@@ -1185,7 +1183,7 @@ class RbFormElement extends React.Component {
setReadonly(readonly) {
this.setState({ readonly: readonly === true }, () => {
// fix 4.0.6 只读变为非只读，富附件需初始化
- this.onEditModeChanged(readonly === true)
+ this.onEditModeChanged(readonly === true, true)
})
}
// TIP 仅表单有效
@@ -1243,6 +1241,12 @@ class RbFormText extends RbFormElement {
)
+
+ // fix:4.1-b5 禁用时不触发
+ $(this._fieldValue).on('click', (e) => {
+ const $t = e.target || {}
+ if ($t.disabled || $t.readOnly) $stopEvent(e, true)
+ })
}
}
}
@@ -1431,7 +1435,7 @@ class RbFormNText extends RbFormElement {
/>
{props.useMdedit && !_readonly37 &&
(this._fieldValue__upload = c)} />}
{this._textCommonMenuId && (
-
+
{$L('常用值')}
)}
@@ -1509,21 +1513,21 @@ class RbFormNText extends RbFormElement {