diff --git a/@rbv b/@rbv index 1055750e8..8d66ac27e 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit 1055750e8b4add3af4d1ce51a3f1d73f1643d99a +Subproject commit 8d66ac27ecebf958e3675fd44c39a9d6670d2ed4 diff --git a/src/main/java/com/rebuild/core/configuration/NavBuilder.java b/src/main/java/com/rebuild/core/configuration/NavBuilder.java index 0124c7395..0de13c0ae 100644 --- a/src/main/java/com/rebuild/core/configuration/NavBuilder.java +++ b/src/main/java/com/rebuild/core/configuration/NavBuilder.java @@ -505,8 +505,8 @@ public class NavBuilder extends NavManager { StringBuilder topNavHtml = new StringBuilder(); for (Object[] nd : topNav) { - String url = AppUtils.getContextPath("/app/home?n=" + nd[0]); - if (nd[1] != null) url += "&d=" + nd[1]; + String url = AppUtils.getContextPath("/app/home?def=" + nd[0]); + if (nd[1] != null) url += ":" + nd[1]; topNavHtml.append(String.format( "
  • %s
    • ", nd[0], url, nd[2])); } diff --git a/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java b/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java index 215b4e245..60b244ba2 100644 --- a/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java +++ b/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java @@ -56,15 +56,12 @@ public class Entity2Schema extends Field2Schema { * @return Returns 实体名称 */ public String createEntity(String entityName, String entityLabel, String comments, String mainEntity, boolean haveNameField, boolean haveSeriesField) { - entityName = StringUtils.trim(entityName); - entityLabel = StringUtils.trim(entityLabel); - if (!License.isCommercial() && MetadataHelper.getEntities().length >= 100) { throw new NeedRbvException(Language.L("实体数量超出免费版限制")); } + entityLabel = CommonsUtils.maxstr(StringUtils.trim(entityLabel), 40); entityName = StringUtils.trim(entityName); - entityLabel = StringUtils.trim(entityLabel); if (entityName != null) { if (MetadataHelper.containsEntity(entityName)) { diff --git a/src/main/java/com/rebuild/core/metadata/impl/ExcelEntity.java b/src/main/java/com/rebuild/core/metadata/impl/ExcelEntity.java new file mode 100644 index 000000000..1138f15e4 --- /dev/null +++ b/src/main/java/com/rebuild/core/metadata/impl/ExcelEntity.java @@ -0,0 +1,70 @@ +package com.rebuild.core.metadata.impl; + +import cn.devezhao.persist4j.Entity; +import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.rebuild.core.metadata.MetadataHelper; +import com.rebuild.core.metadata.easymeta.DisplayType; +import com.rebuild.core.privileges.UserHelper; +import com.rebuild.core.support.i18n.Language; +import com.rebuild.utils.JSONUtils; +import com.rebuild.utils.RbAssert; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.Assert; + +/** + * EXCEL 导入实体 + * + * @author RB + * @see CopyEntity + * @since 2023/12/18 + */ +@Slf4j +public class ExcelEntity extends Entity2Schema { + + /** + * @param entityName + * @param fields + * @return + */ + public String imports(String entityName, JSONArray fields) { + final ID user = getUser(); + RbAssert.isAllow(UserHelper.isSuperAdmin(user), Language.L("仅超级管理员可操作")); + + // 1.实体 + String uniqueEntityName = createEntity(null, entityName, null, null, false, false); + Entity entityNew = MetadataHelper.getEntity(uniqueEntityName); + + // 2.字段 + try { + for (Object o : fields) { + JSONArray item = (JSONArray) o; + String name = item.getString(0); + String type = item.getString(1); + + String refEntityOrClass = item.size() > 2 ? item.getString(2) : null; + JSON extConfig = null; + if ("CLASSIFICATION".equals(type)) { + Assert.notNull(refEntityOrClass, "[refEntityOrClass] cannot be null"); + ID dataId = ID.valueOf(refEntityOrClass); + extConfig = JSONUtils.toJSONObject(EasyFieldConfigProps.CLASSIFICATION_USE, dataId); + refEntityOrClass = null; + } + + createField(entityNew, name, DisplayType.valueOf(type), null, refEntityOrClass, extConfig); + } + + } catch (Throwable ex) { + // DROP + dropEntity(entityNew, true); + + if (ex instanceof MetadataModificationException) { + throw (MetadataModificationException) ex; + } + throw new MetadataModificationException(Language.L("无法导入实体 : %s", ex.getLocalizedMessage())); + } + + return uniqueEntityName; + } +} diff --git a/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java b/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java index 114d88839..0f48762ee 100644 --- a/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java +++ b/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java @@ -100,7 +100,7 @@ public class Field2Schema extends SetUser { * @return */ public String createField(Entity entity, String fieldLabel, String fieldName, DisplayType type, String comments, String refEntity, JSON extConfig) { - fieldLabel = StringUtils.trim(fieldLabel); + fieldLabel = CommonsUtils.maxstr(StringUtils.trim(fieldLabel), 40); fieldName = StringUtils.trim(fieldName); if (StringUtils.length(fieldName) < 4) fieldName = toPinyinName(fieldLabel); diff --git a/src/main/java/com/rebuild/core/service/general/ObservableService.java b/src/main/java/com/rebuild/core/service/general/ObservableService.java index d03a9dac5..c6df9e1aa 100644 --- a/src/main/java/com/rebuild/core/service/general/ObservableService.java +++ b/src/main/java/com/rebuild/core/service/general/ObservableService.java @@ -100,6 +100,7 @@ public abstract class ObservableService extends Observable implements ServiceSpe if (countObservers() > 0) { deleted = EntityHelper.forUpdate(recordId, currentUser, Boolean.FALSE); deleted = recordSnap(deleted, true); + if (deleted == null) return 0; // 删除前触发，做一些状态保持 setChanged(); diff --git a/src/main/java/com/rebuild/core/service/trigger/aviator/OverOperatorType.java b/src/main/java/com/rebuild/core/service/trigger/aviator/OverOperatorType.java index 6609dd9a8..d2ab5cda5 100644 --- a/src/main/java/com/rebuild/core/service/trigger/aviator/OverOperatorType.java +++ b/src/main/java/com/rebuild/core/service/trigger/aviator/OverOperatorType.java @@ -30,6 +30,7 @@ public class OverOperatorType { * 日期加 */ static class DateAdd extends AbstractFunction { + private static final long serialVersionUID = -7871678038170332371L; @Override public String getName() { return OperatorType.ADD.getToken(); @@ -54,6 +55,7 @@ public class OverOperatorType { * 日期减 */ static class DateSub extends AbstractFunction { + private static final long serialVersionUID = 8208361199770129766L; @Override public String getName() { return OperatorType.SUB.getToken(); diff --git a/src/main/java/com/rebuild/utils/CommonsUtils.java b/src/main/java/com/rebuild/utils/CommonsUtils.java index 10f23cbdd..dc7bfdb23 100644 --- a/src/main/java/com/rebuild/utils/CommonsUtils.java +++ b/src/main/java/com/rebuild/utils/CommonsUtils.java @@ -82,9 +82,8 @@ public class CommonsUtils { * @return */ public static String maxstr(String text, int maxLength) { - if (text.length() > maxLength) { - return text.substring(0, maxLength); - } + if (text == null) return null; + if (text.length() > maxLength) return text.substring(0, maxLength); return text; } diff --git a/src/main/java/com/rebuild/web/admin/data/DataImportController.java b/src/main/java/com/rebuild/web/admin/data/DataImportController.java index fb0701f43..63b4bb9ea 100644 --- a/src/main/java/com/rebuild/web/admin/data/DataImportController.java +++ b/src/main/java/com/rebuild/web/admin/data/DataImportController.java @@ -93,11 +93,12 @@ public class DataImportController extends BaseController { } DataFileParser parser; - int count = -1; + int count; List preview; try { parser = new DataFileParser(tmp); - preview = parser.parse(11); + preview = parser.parse(101); + count = parser.getRowsCount(); } catch (Exception ex) { log.error("Parse excel error : " + file, ex); return RespBody.error(Language.L("无法解析数据，请检查数据文件格式")); diff --git a/src/main/java/com/rebuild/web/admin/metadata/MetaEntityController.java b/src/main/java/com/rebuild/web/admin/metadata/MetaEntityController.java index ea8c5c4f6..66b46aa95 100644 --- a/src/main/java/com/rebuild/web/admin/metadata/MetaEntityController.java +++ b/src/main/java/com/rebuild/web/admin/metadata/MetaEntityController.java @@ -13,6 +13,7 @@ import cn.devezhao.persist4j.Field; import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.rebuild.api.RespBody; import com.rebuild.core.Application; @@ -30,6 +31,7 @@ import com.rebuild.core.metadata.easymeta.EasyMetaFactory; import com.rebuild.core.metadata.impl.CopyEntity; import com.rebuild.core.metadata.impl.EasyEntityConfigProps; import com.rebuild.core.metadata.impl.Entity2Schema; +import com.rebuild.core.metadata.impl.ExcelEntity; import com.rebuild.core.metadata.impl.MetaEntityService; import com.rebuild.core.privileges.UserHelper; import com.rebuild.core.rbstore.MetaSchemaGenerator; @@ -356,4 +358,14 @@ public class MetaEntityController extends EntityController { mv.getModel().put("entities", entities); return mv; } + + @PostMapping("entity/entity-excel") + public RespBody entityExcelEvalft(HttpServletRequest request) { + final JSON post = ServletUtils.getRequestJson(request); + String entityLabel = ((JSONObject) post).getString("entityLabel"); + JSONArray fields = ((JSONObject) post).getJSONArray("fields"); + + String entityName = new ExcelEntity().imports(entityLabel, fields); + return RespBody.ok(entityName); + } } diff --git a/src/main/java/com/rebuild/web/commons/CommonPageView.java b/src/main/java/com/rebuild/web/commons/CommonPageView.java index 7cc88d9c5..cf5e5cb33 100644 --- a/src/main/java/com/rebuild/web/commons/CommonPageView.java +++ b/src/main/java/com/rebuild/web/commons/CommonPageView.java @@ -16,11 +16,11 @@ import com.rebuild.core.support.RebuildConfiguration; import com.rebuild.utils.AppUtils; import com.rebuild.utils.CommonsUtils; import com.rebuild.web.BaseController; -import com.rebuild.web.IdParam; import org.apache.commons.io.FileUtils; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.Cookie; @@ -87,11 +87,13 @@ public class CommonPageView extends BaseController { } @GetMapping("/app/home") - public void appHome(@IdParam(name = "n", required = false) ID useNav, - @IdParam(name = "d", required = false) ID useDash, + public void appHome(@RequestParam(name = "def", required = false) String def, HttpServletResponse response) throws IOException { - addCookie("AppHome.Nav", useNav, response); - addCookie("AppHome.Dash", useDash, response); + if (def != null && def.length() >= 20) { + String[] defs = def.split(":"); + addCookie("AppHome.Nav", ID.isId(defs[0]) ? ID.valueOf(defs[0]) : null, response); + addCookie("AppHome.Dash", defs.length > 1 && ID.isId(defs[1]) ? ID.valueOf(defs[1]) : null, response); + } response.sendRedirect("../dashboard/home"); } diff --git a/src/main/resources/web/admin/metadata/entities.html b/src/main/resources/web/admin/metadata/entities.html index a123792d6..48782afdf 100644 --- a/src/main/resources/web/admin/metadata/entities.html +++ b/src/main/resources/web/admin/metadata/entities.html @@ -70,6 +70,33 @@ .new-entity .card.entity .card-body .ml-7 .text-muted { display: none; } + .entity-new2 .dialog-footer { + margin: 15px -35px 10px; + padding-top: 25px; + } + + .entity-new2 .init-models { + margin-left: -10px; + margin-right: -10px; + } + .table.table-excel th, + .table.table-excel td { + padding: 3px; + border-width: 1px; + color: #222; + max-width: 200px; + } + .table.table-excel th { + text-align: center; + background-color: #dee2e6; + color: #444; + } + .table.table-excel .form-control { + width: 100%; + min-width: 140px; + /* padding: 4px; */ + /* height: auto !important; */ + } @@ -113,6 +140,9 @@ isSuperAdmin: '[[${isSuperAdmin}]]' === 'true', } + + + diff --git a/src/main/resources/web/admin/metadata/entity-new.html b/src/main/resources/web/admin/metadata/entity-new.html deleted file mode 100644 index b58f85111..000000000 --- a/src/main/resources/web/admin/metadata/entity-new.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - - [[${bundle.L('添加实体')}]] - - - -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -

    [[${bundle.L('不填写则不复制明细实体')}]]

    -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    -
    -
    - - - - - diff --git a/src/main/resources/web/admin/metadata/field-new.html b/src/main/resources/web/admin/metadata/field-new.html deleted file mode 100644 index c31937a51..000000000 --- a/src/main/resources/web/admin/metadata/field-new.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - [[${bundle.L('添加字段')}]] - - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    -
    -
    -
    - - - - - diff --git a/src/main/resources/web/admin/metadata/fields.html b/src/main/resources/web/admin/metadata/fields.html index b9d45ade5..2bcaed5d3 100644 --- a/src/main/resources/web/admin/metadata/fields.html +++ b/src/main/resources/web/admin/metadata/fields.html @@ -52,7 +52,7 @@
    - [[${bundle.L('批量添加')}]] + [[${bundle.L('批量添加')}]] [[${bundle.L('导出')}]] (CSV)
    @@ -101,5 +101,7 @@ + + diff --git a/src/main/resources/web/admin/metadata/form-design.html b/src/main/resources/web/admin/metadata/form-design.html index fe102238a..7c38a9ecb 100644 --- a/src/main/resources/web/admin/metadata/form-design.html +++ b/src/main/resources/web/admin/metadata/form-design.html @@ -35,7 +35,7 @@
    -
      + @@ -137,8 +137,9 @@ isSuperAdmin: '[[${isSuperAdmin}]]' === 'true', } - - + + + diff --git a/src/main/resources/web/assets/css/files.css b/src/main/resources/web/assets/css/files.css index ff1f85519..2a2211ad4 100644 --- a/src/main/resources/web/assets/css/files.css +++ b/src/main/resources/web/assets/css/files.css @@ -10,8 +10,8 @@ See LICENSE and COMMERCIAL in the project root for license information. } .file-header .file-path { - height: 46px; - padding: 9px 0; + height: 44px; + padding: 8px 0; background-color: #eee; } diff --git a/src/main/resources/web/assets/css/form-design.css b/src/main/resources/web/assets/css/form-design.css index dcf41abc7..b68d592f2 100644 --- a/src/main/resources/web/assets/css/form-design.css +++ b/src/main/resources/web/assets/css/form-design.css @@ -336,10 +336,6 @@ form.field-attr label > span { margin-right: 1.385rem; } -.field-aside .nav.nav-tabs { - margin-top: 7px; -} - .type-list .dd-handle { padding-left: 38px !important; } diff --git a/src/main/resources/web/assets/css/list-page.css b/src/main/resources/web/assets/css/list-page.css index d690073ba..f4df3b800 100644 --- a/src/main/resources/web/assets/css/list-page.css +++ b/src/main/resources/web/assets/css/list-page.css @@ -116,22 +116,30 @@ See LICENSE and COMMERCIAL in the project root for license information. .quick-filter-tabs { background-color: #fff; - padding: 0 18px; - margin-bottom: 12px; - border-radius: 2px; + padding: 0 20px; + position: absolute; + top: 0; + left: 0; + width: 100%; + border-bottom: 1px solid #e6e6e6; + height: 44px; } .quick-filter-tabs > div { font-size: 0; + margin-top: 6px; } .quick-filter-tabs > div .dropdown-item { display: inline-block; width: auto; line-height: 1; - padding: 15px 18px; + padding: 9px 20px; font-size: 1rem; cursor: pointer; + border-radius: 6px !important; + min-width: 60px; + text-align: center; } .quick-filter-tabs > div .dropdown-item:active { @@ -147,3 +155,18 @@ See LICENSE and COMMERCIAL in the project root for license information. .quick-filter-tabs > div .dropdown-item.active:active { color: #fff; } + +.page-aside.widgets .nav.nav-tabs { + min-height: 44px; +} + +.page-aside.widgets .nav.nav-tabs > li.nav-item > .nav-link { + padding-top: 12px; + padding-bottom: 10px; +} + +.quick-filter-tabs + .quick-filter-pane, +.quick-filter-tabs + .card-table, +.quick-filter-tabs + .nav-tabs { + margin-top: 44px; +} diff --git a/src/main/resources/web/assets/css/rb-page.css b/src/main/resources/web/assets/css/rb-page.css index eb1a2add3..0fcbb6eda 100644 --- a/src/main/resources/web/assets/css/rb-page.css +++ b/src/main/resources/web/assets/css/rb-page.css @@ -3711,7 +3711,6 @@ form { } .page-aside.widgets .tab-container { - margin-top: 2px; min-width: 279px; overflow: hidden; } @@ -3806,6 +3805,7 @@ form { #asideFilters .dropdown-item.active, #asideCategory .dropdown-item.active { background-color: #4285f4; + background-color: var(--rb-theme-color); color: #fff; } @@ -5414,4 +5414,11 @@ div.dataTables_wrapper.compact div.dataTables_oper .btn-space { .code-viewport:hover > a.copy { display: inline-block; -} \ No newline at end of file +} + +span.icon-append .icon { + float: left; + width: 22px; + font-size: 1.2rem; + padding-top: 2px; +} diff --git a/src/main/resources/web/assets/js/admin/apis-manager.js b/src/main/resources/web/assets/js/admin/apis-manager.js index 542f822ca..856fa4c90 100644 --- a/src/main/resources/web/assets/js/admin/apis-manager.js +++ b/src/main/resources/web/assets/js/admin/apis-manager.js @@ -165,80 +165,82 @@ class AppLogsViewer extends RbModal { const dataShow = this.state.dataShow return ( -
      -
      -
      -
      - { - if (e.keyCode === 13) { - this._loadNext(true, e.target.value) - } - }} - maxLength="40" - /> -
      -
      (this._$list = c)}> - {this.state.dataLogs.map((item) => { - const respOk = this._isRespOk(item[5]) - return ( - { - this.setState({ dataShow: item }) - }}> -
      - {item[3].split('?')[0]} -
      - {item[1].split('UTC')[0]} -
      - {respOk ? $L('成功') : $L('失败')} +
      +
      +
      + +
      + {dataShow ? ( +
      +
      +
      {$L('编号')} (X-RB-RequestId)
      +
      {dataShow[6]}
      +
      {$L('来源 IP')}
      +
      {dataShow[0]}
      +
      {$L('请求时间')}
      +
      {dataShow[1].substr(0, 19)}
      +
      {$L('响应时间')}
      +
      + {dataShow[2].substr(0, 19)} + {$moment(dataShow[2]).diff($moment(dataShow[1]), 'seconds')}s +
      +
      {$L('请求地址')}
      +
      {dataShow[3]}
      +
      {$L('请求数据')}
      +
      {dataShow[4] && }
      +
      {$L('响应数据')}
      +
      {dataShow[5] && }
      +
      +
      + ) : ( +
      +

      + +

      + {$L('暂无数据')} +
      + )}
      - {this.state.showMore && ( - - )} -
      -
      - {dataShow ? ( -
      -
      -
      {$L('编号')} (X-RB-RequestId)
      -
      {dataShow[6]}
      -
      {$L('来源 IP')}
      -
      {dataShow[0]}
      -
      {$L('请求时间')}
      -
      {dataShow[1].substr(0, 19)}
      -
      {$L('响应时间')}
      -
      - {dataShow[2].substr(0, 19)} - {$moment(dataShow[2]).diff($moment(dataShow[1]), 'seconds')}s -
      -
      {$L('请求地址')}
      -
      {dataShow[3]}
      -
      {$L('请求数据')}
      -
      {dataShow[4] && }
      -
      {$L('响应数据')}
      -
      {dataShow[5] && }
      -
      -
      - ) : ( -
      -

      - -

      - {$L('暂无数据')} -
      - )}
      diff --git a/src/main/resources/web/assets/js/admin/data-imports.js b/src/main/resources/web/assets/js/admin/data-imports.js index 3ec357f25..66c8ea165 100644 --- a/src/main/resources/web/assets/js/admin/data-imports.js +++ b/src/main/resources/web/assets/js/admin/data-imports.js @@ -23,6 +23,12 @@ let import_taskid const entity = $urlp('entity') _Config.entity = entity || null +_Config.file = $urlp('file') || null +if (_Config.file) { + _Config.file = $decode(_Config.file) + $('.J_upload-input').text($fileCutName(_Config.file)) +} + $(document).ready(() => { $.get('/commons/metadata/entities?detail=true', (res) => { $(res.data).each(function () { @@ -288,7 +294,6 @@ const step3_import_cancel = () => { } const _LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('') - // 渲染字段映射 const _fieldsMapping = (columns, fields) => { const canNullText = ` [${$L('必填')}]` diff --git a/src/main/resources/web/assets/js/charts/dashboard.js b/src/main/resources/web/assets/js/charts/dashboard.js index 82c1c04b9..60cf65971 100644 --- a/src/main/resources/web/assets/js/charts/dashboard.js +++ b/src/main/resources/web/assets/js/charts/dashboard.js @@ -339,7 +339,6 @@ class DlgAddChart extends RbFormHandler { this.__select2 = $entity.select2({ allowClear: false, placeholder: $L('选择数据来源'), - matcher: $select2MatcherAll, }) }) } diff --git a/src/main/resources/web/assets/js/general/rb-advfilter.js b/src/main/resources/web/assets/js/general/rb-advfilter.js index e932bb69a..8d14b40b4 100644 --- a/src/main/resources/web/assets/js/general/rb-advfilter.js +++ b/src/main/resources/web/assets/js/general/rb-advfilter.js @@ -583,10 +583,7 @@ class FilterItem extends React.Component { const that = this const $s2field = $(this._filterField) - .select2({ - allowClear: false, - matcher: $select2MatcherAll, - }) + .select2({ allowClear: false }) .on('change', function (e) { const fieldAndType = e.target.value.split(NT_SPLIT) that.setState({ field: fieldAndType[0], type: fieldAndType[1] }, () => $s2op.val(that.__op[0]).trigger('change')) diff --git a/src/main/resources/web/assets/js/general/rb-datalist.common.js b/src/main/resources/web/assets/js/general/rb-datalist.common.js index ddf440be9..3eac0ae48 100644 --- a/src/main/resources/web/assets/js/general/rb-datalist.common.js +++ b/src/main/resources/web/assets/js/general/rb-datalist.common.js @@ -1002,10 +1002,11 @@ class RbList extends React.Component { if (supportFixedColumns) $scroller.find('.table').addClass('table-header-fixed') $addResizeHandler(() => { - let mh = $(window).height() - 210 + 5 + let mh = $(window).height() - (61 + 20 + 61 + 60 + 2) /* Nav, MarginTop20, TableHeader, TableFooter */ if ($('.main-content>.nav-tabs-classic')[0]) mh -= 38 // Has detail-tab if ($('.main-content .quick-filter-pane')[0]) mh -= 75 // Has query-pane - if ($('.main-content .quick-filter-tabs')[0]) mh -= 55 // Has query-tabs + if ($('.main-content .quick-filter-tabs')[0]) mh -= 44 // Has query-tabs + $scroller.css({ maxHeight: mh }) $scroller.perfectScrollbar('update') })() 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 270a7d908..b04bd038d 100644 --- a/src/main/resources/web/assets/js/general/rb-forms.js +++ b/src/main/resources/web/assets/js/general/rb-forms.js @@ -586,7 +586,8 @@ class RbForm extends React.Component { } if (window.FrontJS) { - const ret = window.FrontJS.Form._trigger('fieldValueChange', [`${this.props.entity}.${field}`, value, this.props.id || null]) + const fieldKey = `${this.props.entity}.${field}` + const ret = window.FrontJS.Form._trigger('fieldValueChange', [fieldKey, value, this.props.id || null]) if (ret === false) return false } } @@ -2979,7 +2980,7 @@ const __calcFormula = function (_this) { if (res.data) _this.setValue(res.data) else _this.setValue(null) }) - }, 400) + }, 300) return true }) @@ -2990,5 +2991,5 @@ const __calcFormula = function (_this) { else _this.setValue(null) }) } - }, 400) // delay for init + }, 600) // delay for init } diff --git a/src/main/resources/web/assets/js/metadata/auto-fillin.js b/src/main/resources/web/assets/js/metadata/auto-fillin.js index 896ad7db0..0c4f008dc 100644 --- a/src/main/resources/web/assets/js/metadata/auto-fillin.js +++ b/src/main/resources/web/assets/js/metadata/auto-fillin.js @@ -172,7 +172,6 @@ class DlgRuleEdit extends RbFormHandler { const $s2target = $(this._targetField).select2({ placeholder: $L('选择字段'), allowClear: false, - matcher: $select2MatcherAll, }) this.__select2.push($s2target) @@ -184,7 +183,6 @@ class DlgRuleEdit extends RbFormHandler { .select2({ placeholder: $L('选择字段'), allowClear: false, - matcher: $select2MatcherAll, }) .on('change', (e) => this._renderTargetFields(e.target.value)) this.__select2.push($s2source) diff --git a/src/main/resources/web/assets/js/metadata/entity-advanced.js b/src/main/resources/web/assets/js/metadata/entity-advanced.js index 9e38cff5b..deb4e403f 100644 --- a/src/main/resources/web/assets/js/metadata/entity-advanced.js +++ b/src/main/resources/web/assets/js/metadata/entity-advanced.js @@ -183,7 +183,7 @@ class DlgMode1Option extends RbFormHandler {
      - {$L('常用查询')} + {$L('列表视图')}
      diff --git a/src/main/resources/web/assets/js/metadata/entity-new.js b/src/main/resources/web/assets/js/metadata/entity-new.js deleted file mode 100644 index fca927b05..000000000 --- a/src/main/resources/web/assets/js/metadata/entity-new.js +++ /dev/null @@ -1,165 +0,0 @@ -/*! -Copyright (c) REBUILD and/or its owners. All rights reserved. - -rebuild is dual-licensed under commercial and open source licenses (GPLv3). -See LICENSE and COMMERCIAL in the project root for license information. -*/ -/* global InitModels */ - -window.__LAB_SHOWNDETAIL = false -window.bosskeyTrigger = function () { - window.__LAB_SHOWNDETAIL = true -} - -$(document).ready(() => { - const $bnew = $('.btn-primary.new').on('click', () => { - const entityLabel = $val('#entityLabel'), - comments = $val('#comments') - if (!entityLabel) return RbHighbar.create($L('请输入实体名称')) - - const data = { - label: entityLabel, - comments: comments, - } - - if ($val('#isDetail')) { - data.mainEntity = $val('#mainEntity') - if (!data.mainEntity) return RbHighbar.create($L('请选择主实体')) - } - - $bnew.button('loading') - $.post(`/admin/entity/entity-new?nameField=${$val('#nameField')}&seriesField=${$val('#seriesField')}`, JSON.stringify(data), (res) => { - if (res.error_code === 0) parent.location.href = `${rb.baseUrl}/admin/entity/${res.data}/base` - else RbHighbar.error(res.error_msg) - }) - }) - - const $bcopy = $('.btn-primary.copy').on('click', () => { - const sourceEntity = $val('#copySourceEntity') - if (!sourceEntity) return RbHighbar.create($L('请选择从哪个实体复制')) - - const entityLabel = $val('#newEntityLabel') - if (!entityLabel) return RbHighbar.create($L('请输入实体名称')) - - const data = { - sourceEntity: sourceEntity, - entityName: entityLabel, - detailEntityName: $val('#newDetailLabel'), - keepConfig: [], - } - - $bcopy.button('loading') - $.post('/admin/entity/entity-copy', JSON.stringify(data), (res) => { - if (res.error_code === 0) parent.location.href = `${rb.baseUrl}/admin/entity/${res.data}/base` - else RbHighbar.error(res.error_msg) - }) - }) - - let entities - function _loadEntities(c) { - if (entities) { - typeof c === 'function' && c(entities) - } else { - $.get('/admin/entity/entity-list?detail=true', (res) => { - entities = res.data - typeof c === 'function' && c(entities) - }) - } - } - - _loadEntities((e) => { - e.forEach((item) => { - $(``).appendTo('#copySourceEntity') - }) - - $('#copySourceEntity') - .on('change', function () { - const $s = $('#copySourceEntity option:selected') - if ($s.data('detail')) $('.J_newDetailLabel').removeClass('hide') - else $('.J_newDetailLabel').addClass('hide') - - parent.RbModal.resize() - }) - .trigger('change') - - if (e.length === 0) $(``).appendTo('#copySourceEntity') - }) - - $('#isDetail').on('click', () => { - $('.J_mainEntity').toggleClass('hide') - parent.RbModal.resize() - - if ($('#mainEntity option').length === 0) { - _loadEntities((e) => { - e.forEach((item) => { - if (!item.mainEntity) { - if (window.__LAB_SHOWNDETAIL) { - $(``).appendTo('#mainEntity') - } else if (!item.detailEntity) { - $(``).appendTo('#mainEntity') - } - } - }) - - if ($('#mainEntity option').length === 0) $(``).appendTo('#mainEntity') - }) - } - }) - - let _MetaschemaList - $('.J_imports').on('click', () => { - if (_MetaschemaList) return - renderRbcomp(, 'metaschemas', function () { - _MetaschemaList = this - }) - }) - - $('.nav-tabs a').on('click', () => parent.RbModal.resize()) -}) - -class MetaschemaList extends React.Component { - render() { - return ( -
      - (this._InitModels = c)} onLoad={() => parent.RbModal.resize()} /> -
      -
      - -
      -
      -

      {$L('可在导入后根据自身需求做适当调整/修改')}

      -
      -
      -
      -
      - ) - } - - componentDidMount() { - parent.RbModal.resize() - } - - imports() { - const s = this._InitModels.getSelected() - if (s.length < 1) { - return RbHighbar.create($L('请选择要导入的实体')) - } - - const $btn = $(this._$btn).button('loading') - const $mp2 = parent && parent.$mp ? parent.$mp : $mp - $mp2.start() - $.post(`/admin/metadata/imports?key=${s.join(',')}`, (res) => { - $mp2.end() - $btn.button('reset') - - if (res.error_code === 0) { - RbHighbar.success($L('导入成功')) - setTimeout(() => parent.location.reload(), 1500) - } else { - RbHighbar.error(res.error_msg) - } - }) - } -} diff --git a/src/main/resources/web/assets/js/metadata/entity-new2.js b/src/main/resources/web/assets/js/metadata/entity-new2.js new file mode 100644 index 000000000..558328a56 --- /dev/null +++ b/src/main/resources/web/assets/js/metadata/entity-new2.js @@ -0,0 +1,572 @@ +/*! +Copyright (c) REBUILD and/or its owners. All rights reserved. + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +See LICENSE and COMMERCIAL in the project root for license information. +*/ +/* global InitModels, FIELD_TYPES */ + +window.__LAB_SHOWNDETAIL = false +window.bosskeyTrigger = function () { + window.__LAB_SHOWNDETAIL = true +} + +// ~~ 新建实体 +// eslint-disable-next-line no-unused-vars +class EntityNew2 extends RbModalHandler { + constructor(props) { + super(props) + this.state = { ...props } + } + + render() { + return ( + (this._dlg = c)} title={$L('添加实体')} className="entity-new2"> +
      (this._$container = c)}> + +
      +
      +
      +
      + +
      + (this._$entityLabel = c)} /> +
      +
      +
      + +
      +