mirror of
https://github.com/getrebuild/rebuild.git
synced 2024-09-20 07:25:54 +08:00
Fix 3.6 beta3 (#727)
* 3.6-beta3 * fix: Gitee#I971N4 * Update url-safe.html
This commit is contained in:
parent
5ccfe4994c
commit
ea86c421a9
2
@rbv
2
@rbv
|
@ -1 +1 @@
|
||||||
Subproject commit b653c87672ac09e4277c012211f1a11db339e92b
|
Subproject commit a2b338694068b3bfa059af4e83f669686515ef00
|
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>com.rebuild</groupId>
|
<groupId>com.rebuild</groupId>
|
||||||
<artifactId>rebuild</artifactId>
|
<artifactId>rebuild</artifactId>
|
||||||
<version>3.6.0-beta2</version>
|
<version>3.6.0-beta3</version>
|
||||||
<name>rebuild</name>
|
<name>rebuild</name>
|
||||||
<description>Building your business-systems freely!</description>
|
<description>Building your business-systems freely!</description>
|
||||||
<url>https://getrebuild.com/</url>
|
<url>https://getrebuild.com/</url>
|
||||||
|
|
|
@ -74,7 +74,7 @@ public class Application implements ApplicationListener<ApplicationStartedEvent>
|
||||||
/**
|
/**
|
||||||
* Rebuild Version
|
* Rebuild Version
|
||||||
*/
|
*/
|
||||||
public static final String VER = "3.6.0-beta2";
|
public static final String VER = "3.6.0-beta3";
|
||||||
/**
|
/**
|
||||||
* Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2}
|
* Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2}
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
|
<script th:src="@{/assets/js/general/rb-advfilter.js}" type="text/babel"></script>
|
||||||
<script th:src="@{/assets/js/general/rb-assignshare.js}" type="text/babel"></script>
|
<script th:src="@{/assets/js/general/rb-assignshare.js}" type="text/babel"></script>
|
||||||
<!--
|
<!--
|
||||||
<link rel="stylesheet" type="text/css" th:href="@{/assets/css/customized.css}" />
|
<link rel="stylesheet" type="text/css" th:href="@{/assets/css/customized/customized.css}" />
|
||||||
<script th:src="@{/assets/js/customized-forms.js}" type="text/babel"></script>
|
<script th:src="@{/assets/js/customized/customized-forms.js}" type="text/babel"></script>
|
||||||
<script th:src="@{/assets/js/customized-datalist.js}" type="text/babel"></script>
|
<script th:src="@{/assets/js/customized/customized-datalist.js}" type="text/babel"></script>
|
||||||
-->
|
-->
|
||||||
|
|
|
@ -6,7 +6,21 @@ See LICENSE and COMMERCIAL in the project root for license information.
|
||||||
*/
|
*/
|
||||||
/* global RbForm */
|
/* global RbForm */
|
||||||
|
|
||||||
let RbForm_postAfter = RbForm.postAfter
|
RbForm.renderAfter = function (formObject) {
|
||||||
|
formObject.onFieldValueChange(function (fieldValue) {
|
||||||
|
if (fieldValue.name === 'isDisabled' && $isTrue(fieldValue.value)) {
|
||||||
|
const c = formObject.getFieldComp('isDisabled')
|
||||||
|
c &&
|
||||||
|
c.setTip(
|
||||||
|
<span className="text-warning">
|
||||||
|
<i className="fs-14 mdi mdi-alert-circle-outline" /> {$L('禁用后子部门及其下用户将会同时禁用')}
|
||||||
|
</span>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
const RbForm_postAfter = RbForm.postAfter
|
||||||
RbForm.postAfter = function (data, next) {
|
RbForm.postAfter = function (data, next) {
|
||||||
RbForm_postAfter(data, next)
|
RbForm_postAfter(data, next)
|
||||||
if (parent && parent.loadDeptTree) parent.loadDeptTree()
|
if (parent && parent.loadDeptTree) parent.loadDeptTree()
|
||||||
|
|
|
@ -1204,6 +1204,8 @@ class RbList extends React.Component {
|
||||||
// 分页组件
|
// 分页组件
|
||||||
if (this._Pagination) {
|
if (this._Pagination) {
|
||||||
this._Pagination.setState({ selectedTotal: chkSelected }, () => {
|
this._Pagination.setState({ selectedTotal: chkSelected }, () => {
|
||||||
|
if (wpc.statsField !== true || rb.commercial < 10) return
|
||||||
|
|
||||||
if (chkSelected > 1) {
|
if (chkSelected > 1) {
|
||||||
const ids = this.getSelectedIds(true)
|
const ids = this.getSelectedIds(true)
|
||||||
const qurey = {
|
const qurey = {
|
||||||
|
@ -1457,7 +1459,7 @@ class RbListPagination extends React.Component {
|
||||||
</span>
|
</span>
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
{rb.isAdminUser && wpc.statsField && (
|
{rb.isAdminUser && wpc.statsField && (wpc.type === 'RecordList' || wpc.type === 'DetailList') && (
|
||||||
<a
|
<a
|
||||||
className="list-stats-settings"
|
className="list-stats-settings"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|
|
@ -690,10 +690,6 @@ class RbForm extends React.Component {
|
||||||
console.log('FrontJS prevented save')
|
console.log('FrontJS prevented save')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (typeof this._postBefore === 'function' && this._postBefore(data, this) === false) {
|
|
||||||
console.log('_postBefore prevented save')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const $$$parent = this.props.$$$parent
|
const $$$parent = this.props.$$$parent
|
||||||
const previewid = $$$parent.state.previewid
|
const previewid = $$$parent.state.previewid
|
||||||
|
@ -724,7 +720,9 @@ class RbForm extends React.Component {
|
||||||
if (typeof this._postAfter === 'function') {
|
if (typeof this._postAfter === 'function') {
|
||||||
this._postAfter(recordId, next, this)
|
this._postAfter(recordId, next, this)
|
||||||
return
|
return
|
||||||
} else if (next === RbForm.NEXT_ADDDETAIL) {
|
}
|
||||||
|
|
||||||
|
if (next === RbForm.NEXT_ADDDETAIL) {
|
||||||
const iv = $$$parent.props.initialValue
|
const iv = $$$parent.props.initialValue
|
||||||
const dm = this.props.rawModel.entityMeta
|
const dm = this.props.rawModel.entityMeta
|
||||||
RbFormModal.create({ title: $L('添加%s', dm.entityLabel), entity: dm.entity, icon: dm.icon, initialValue: iv })
|
RbFormModal.create({ title: $L('添加%s', dm.entityLabel), entity: dm.entity, icon: dm.icon, initialValue: iv })
|
||||||
|
@ -767,7 +765,11 @@ class RbForm extends React.Component {
|
||||||
|
|
||||||
// 保存前调用(返回 false 则不继续保存)
|
// 保存前调用(返回 false 则不继续保存)
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
static postBefore(data, from) {
|
static postBefore(data, formObject) {
|
||||||
|
if (typeof formObject._postBefore === 'function') {
|
||||||
|
const ret = formObject._postBefore(data, formObject)
|
||||||
|
if (ret === false) return false
|
||||||
|
}
|
||||||
if (window.FrontJS) {
|
if (window.FrontJS) {
|
||||||
const ret = window.FrontJS.Form._trigger('saveBefore', [data])
|
const ret = window.FrontJS.Form._trigger('saveBefore', [data])
|
||||||
if (ret === false) return false
|
if (ret === false) return false
|
||||||
|
@ -777,7 +779,7 @@ class RbForm extends React.Component {
|
||||||
|
|
||||||
// 保存后调用
|
// 保存后调用
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
static postAfter(data, next, from) {
|
static postAfter(data, next, formObject) {
|
||||||
if (window.FrontJS) {
|
if (window.FrontJS) {
|
||||||
window.FrontJS.Form._trigger('saveAfter', [data, next])
|
window.FrontJS.Form._trigger('saveAfter', [data, next])
|
||||||
}
|
}
|
||||||
|
@ -793,7 +795,7 @@ class RbForm extends React.Component {
|
||||||
|
|
||||||
// 组件渲染后调用
|
// 组件渲染后调用
|
||||||
// eslint-disable-next-line no-unused-vars
|
// eslint-disable-next-line no-unused-vars
|
||||||
static renderAfter(form) {}
|
static renderAfter(formObject) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 表单元素基础类
|
// 表单元素基础类
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
<div class="error-container mt-0">
|
<div class="error-container mt-0">
|
||||||
<div class="safe-tips">
|
<div class="safe-tips">
|
||||||
<h3>[[${bundle.L('即将跳转到外部网站')}]]</h3>
|
<h3>[[${bundle.L('即将跳转到外部网站')}]]</h3>
|
||||||
<p class="text-warning"><i class="mdi mdi-shield-alert-outline"></i> [[${bundle.L('请注意你的账户安全')}]]</p>
|
<p class="text-warning"><i class="mdi mdi-shield-alert-outline fs-14"></i> [[${bundle.L('请注意你的账户安全')}]]</p>
|
||||||
<div class="url">
|
<div class="url">
|
||||||
<span class="icon"><i class="zmdi zmdi-link"></i></span>
|
<span class="icon"><i class="zmdi zmdi-link"></i></span>
|
||||||
<span class="text" th:utext="${outerUrl}"></span>
|
<span class="text" th:utext="${outerUrl}"></span>
|
||||||
|
|
Loading…
Reference in a new issue