Skip to content

Commit

Permalink
be
Browse files Browse the repository at this point in the history
  • Loading branch information
getrebuild committed Jan 10, 2025
1 parent 15aaf81 commit 86e2a69
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion @rbv
Submodule @rbv updated from 9d3513 to f9db47
10 changes: 8 additions & 2 deletions src/main/resources/web/assets/js/general/rb-datalist.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,8 @@ class RbList extends React.Component {
type="button"
className="btn btn-sm btn-link w-auto"
title={btn.title || null}
disabled={!!btn._eaid}
data-eaid={btn._eaid}
onClick={(e) => {
typeof btn.onClick === 'function' && btn.onClick(primaryKey.id, e)
}}>
Expand Down Expand Up @@ -2201,7 +2203,8 @@ const EasyAction4List = {
if (!(_FrontJS && _EasyAction && items)) return
const _List = _FrontJS.DataList

items['datalist'] &&
// 工具栏
if (items['datalist']) {
items['datalist'].forEach((item) => {
item = _EasyAction.fixItem(item)
if (!item) return
Expand All @@ -2213,15 +2216,18 @@ const EasyAction4List = {
})
_List.addButton(item)
})
}

items['datarow'] &&
// 记录行
if (items['datarow']) {
items['datarow'].forEach((item) => {
item = _EasyAction.fixItem(item)
if (!item) return

item.onClick = (id) => _EasyAction.handleOp(item, id)
_List.regRowButton(item)
})
}
},
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/web/assets/js/general/rb-view.append.js
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ const _EasyAction = window.EasyAction
// eslint-disable-next-line no-unused-vars
const EasyAction4View = {
init(items) {
if (!(_FrontJS && items) || !items['view']) return
if (!(_FrontJS && _EasyAction && items) || !items['view']) return
const _View = _FrontJS.View

items['view'].forEach((item) => {
Expand Down

0 comments on commit 86e2a69

Please sign in to comment.