Merge branch 'release/1.9.14'
This commit is contained in:
commit
0112e94049
163 changed files with 1543 additions and 517 deletions
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>account-applications</artifactId>
|
||||
<version>1.9.12</version>
|
||||
<version>1.9.14</version>
|
||||
</parent>
|
||||
<groupId>ru.micord.ervu.account_applications</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
package ru.micord.ervu.account_applications.component.dao;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
|
||||
import org.jooq.DSLContext;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
|
||||
import static ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList.USER_APPLICATION_LIST;
|
||||
import static ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
|
||||
|
||||
/**
|
||||
* @author Eduard Tihomirov
|
||||
*/
|
||||
@Repository
|
||||
public class AuditDao {
|
||||
|
||||
private final DSLContext dslContext;
|
||||
|
||||
public AuditDao(DSLContext dslContext) {
|
||||
this.dslContext = dslContext;
|
||||
}
|
||||
|
||||
public void insert(Long listId, String fio, String login, String status, Timestamp timestamp) {
|
||||
dslContext.insertInto(USER_APPLICATION_LIST_AUDIT)
|
||||
.set(USER_APPLICATION_LIST_AUDIT.USER_APPLICATION_LIST_ID, listId)
|
||||
.set(USER_APPLICATION_LIST_AUDIT.FIO, fio)
|
||||
.set(USER_APPLICATION_LIST_AUDIT.STATUS, status)
|
||||
.set(USER_APPLICATION_LIST_AUDIT.DATE, timestamp)
|
||||
.set(USER_APPLICATION_LIST_AUDIT.LOGIN, login)
|
||||
.execute();
|
||||
}
|
||||
|
||||
public List<Long> selectAppListIdsByTraceId(String traceId) {
|
||||
return dslContext.select(USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID)
|
||||
.from(USER_APPLICATION_LIST)
|
||||
.where(USER_APPLICATION_LIST.TRACE_ID.eq(traceId))
|
||||
.fetch(USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
package ru.micord.ervu.account_applications.component.service;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import dao.container.FormDaoImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.micord.ervu.account_applications.component.dao.AuditDao;
|
||||
import ru.micord.ervu.account_applications.security.context.SecurityContext;
|
||||
import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
|
||||
|
||||
import ru.cg.webbpm.modules.database.api.bean.TableFieldData;
|
||||
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
|
||||
|
||||
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.SENT;
|
||||
|
||||
/**
|
||||
* @author Eduard Tihomirov
|
||||
*/
|
||||
@Service
|
||||
public class AuditFormDaoImpl extends FormDaoImpl {
|
||||
|
||||
@Autowired
|
||||
private SecurityContext securityContext;
|
||||
@Autowired
|
||||
private AuditDao auditDao;
|
||||
|
||||
@Override
|
||||
public List<TableFieldData> save(Map<EntityColumn, Object> map) {
|
||||
List<TableFieldData> tableFieldData = super.save(map);
|
||||
UserSession userSession = securityContext.getUserSession();
|
||||
Optional<String> status = map.entrySet().stream()
|
||||
.filter(entry -> entry.getKey().getName().equals("application_status"))
|
||||
.map(entry -> entry.getValue().toString())
|
||||
.findAny();
|
||||
|
||||
Optional<Long> appListId = tableFieldData.stream()
|
||||
.filter(data -> data.getField().getName().equals("user_application_list_id"))
|
||||
.map(data -> (Long) data.getData())
|
||||
.findAny();
|
||||
if (status.isPresent() && appListId.isPresent() && !status.get().equals(SENT.name())) {
|
||||
auditDao.insert(appListId.get(), userSession.name(), userSession.userId(), status.get(), Timestamp.valueOf(
|
||||
LocalDateTime.now()));
|
||||
}
|
||||
return tableFieldData;
|
||||
}
|
||||
}
|
||||
|
|
@ -20,6 +20,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
|
|||
import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.DatabasechangeloglockRecord;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.JobPositionRecord;
|
||||
|
|
@ -30,6 +31,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.records.LinkU
|
|||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.RecruitmentRecord;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.ShedlockRecord;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationDocumentRecord;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationListAuditRecord;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationListRecord;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationRoleRecord;
|
||||
|
||||
|
|
@ -60,6 +62,7 @@ public class Keys {
|
|||
public static final UniqueKey<ShedlockRecord> SHEDLOCK_PK = Internal.createUniqueKey(Shedlock.SHEDLOCK, DSL.name("shedlock_pk"), new TableField[] { Shedlock.SHEDLOCK.NAME }, true);
|
||||
public static final UniqueKey<UserApplicationDocumentRecord> PK_USER_APPLICATION_DOCUMENT = Internal.createUniqueKey(UserApplicationDocument.USER_APPLICATION_DOCUMENT, DSL.name("pk_user_application_document"), new TableField[] { UserApplicationDocument.USER_APPLICATION_DOCUMENT.USER_APPLICATION_DOCUMENT_ID }, true);
|
||||
public static final UniqueKey<UserApplicationListRecord> PK_USER_APPLICATION_LIST = Internal.createUniqueKey(UserApplicationList.USER_APPLICATION_LIST, DSL.name("pk_user_application_list"), new TableField[] { UserApplicationList.USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID }, true);
|
||||
public static final UniqueKey<UserApplicationListAuditRecord> USER_APPLICATION_LIST_AUDIT_PKEY = Internal.createUniqueKey(UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT, DSL.name("user_application_list_audit_pkey"), new TableField[] { UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT.ID }, true);
|
||||
public static final UniqueKey<UserApplicationRoleRecord> USER_APPLICATION_ROLE_PKEY = Internal.createUniqueKey(UserApplicationRole.USER_APPLICATION_ROLE, DSL.name("user_application_role_pkey"), new TableField[] { UserApplicationRole.USER_APPLICATION_ROLE.USER_ROLE_ID }, true);
|
||||
public static final UniqueKey<UserApplicationRoleRecord> USER_APPLICATION_ROLE_ROLE_NAME_KEY = Internal.createUniqueKey(UserApplicationRole.USER_APPLICATION_ROLE, DSL.name("user_application_role_role_name_key"), new TableField[] { UserApplicationRole.USER_APPLICATION_ROLE.ROLE_NAME }, true);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
|
|||
import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
|
||||
|
||||
|
||||
|
|
@ -97,6 +98,11 @@ public class Public extends SchemaImpl {
|
|||
*/
|
||||
public final UserApplicationList USER_APPLICATION_LIST = UserApplicationList.USER_APPLICATION_LIST;
|
||||
|
||||
/**
|
||||
* The table <code>public.user_application_list_audit</code>.
|
||||
*/
|
||||
public final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
|
||||
|
||||
/**
|
||||
* The table <code>public.user_application_role</code>.
|
||||
*/
|
||||
|
|
@ -139,6 +145,7 @@ public class Public extends SchemaImpl {
|
|||
Shedlock.SHEDLOCK,
|
||||
UserApplicationDocument.USER_APPLICATION_DOCUMENT,
|
||||
UserApplicationList.USER_APPLICATION_LIST,
|
||||
UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT,
|
||||
UserApplicationRole.USER_APPLICATION_ROLE
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import ru.micord.ervu.account_applications.db_beans.public_.tables.Recruitment;
|
|||
import ru.micord.ervu.account_applications.db_beans.public_.tables.Shedlock;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationDocument;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationRole;
|
||||
|
||||
|
||||
|
|
@ -81,6 +82,11 @@ public class Tables {
|
|||
*/
|
||||
public static final UserApplicationList USER_APPLICATION_LIST = UserApplicationList.USER_APPLICATION_LIST;
|
||||
|
||||
/**
|
||||
* The table <code>public.user_application_list_audit</code>.
|
||||
*/
|
||||
public static final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT;
|
||||
|
||||
/**
|
||||
* The table <code>public.user_application_role</code>.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
/*
|
||||
* This file is generated by jOOQ.
|
||||
*/
|
||||
package ru.micord.ervu.account_applications.db_beans.public_.tables;
|
||||
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Collection;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.jooq.Condition;
|
||||
import org.jooq.Field;
|
||||
import org.jooq.Identity;
|
||||
import org.jooq.Name;
|
||||
import org.jooq.PlainSQL;
|
||||
import org.jooq.QueryPart;
|
||||
import org.jooq.SQL;
|
||||
import org.jooq.Schema;
|
||||
import org.jooq.Select;
|
||||
import org.jooq.Stringly;
|
||||
import org.jooq.Table;
|
||||
import org.jooq.TableField;
|
||||
import org.jooq.TableOptions;
|
||||
import org.jooq.UniqueKey;
|
||||
import org.jooq.impl.DSL;
|
||||
import org.jooq.impl.SQLDataType;
|
||||
import org.jooq.impl.TableImpl;
|
||||
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.Keys;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.Public;
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.records.UserApplicationListAuditRecord;
|
||||
|
||||
|
||||
/**
|
||||
* This class is generated by jOOQ.
|
||||
*/
|
||||
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
|
||||
public class UserApplicationListAudit extends TableImpl<UserApplicationListAuditRecord> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* The reference instance of <code>public.user_application_list_audit</code>
|
||||
*/
|
||||
public static final UserApplicationListAudit USER_APPLICATION_LIST_AUDIT = new UserApplicationListAudit();
|
||||
|
||||
/**
|
||||
* The class holding records for this type
|
||||
*/
|
||||
@Override
|
||||
public Class<UserApplicationListAuditRecord> getRecordType() {
|
||||
return UserApplicationListAuditRecord.class;
|
||||
}
|
||||
|
||||
/**
|
||||
* The column <code>public.user_application_list_audit.id</code>.
|
||||
*/
|
||||
public final TableField<UserApplicationListAuditRecord, UUID> ID = createField(DSL.name("id"), SQLDataType.UUID.nullable(false).defaultValue(DSL.field(DSL.raw("uuid_generate_v4()"), SQLDataType.UUID)), this, "");
|
||||
|
||||
/**
|
||||
* The column
|
||||
* <code>public.user_application_list_audit.user_application_list_id</code>.
|
||||
*/
|
||||
public final TableField<UserApplicationListAuditRecord, Long> USER_APPLICATION_LIST_ID = createField(DSL.name("user_application_list_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
|
||||
|
||||
/**
|
||||
* The column <code>public.user_application_list_audit.date</code>.
|
||||
*/
|
||||
public final TableField<UserApplicationListAuditRecord, Timestamp> DATE = createField(DSL.name("date"), SQLDataType.TIMESTAMP(0).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, "");
|
||||
|
||||
/**
|
||||
* The column <code>public.user_application_list_audit.status</code>.
|
||||
*/
|
||||
public final TableField<UserApplicationListAuditRecord, String> STATUS = createField(DSL.name("status"), SQLDataType.VARCHAR(100), this, "");
|
||||
|
||||
/**
|
||||
* The column <code>public.user_application_list_audit.fio</code>.
|
||||
*/
|
||||
public final TableField<UserApplicationListAuditRecord, String> FIO = createField(DSL.name("fio"), SQLDataType.VARCHAR(1000), this, "");
|
||||
|
||||
/**
|
||||
* The column <code>public.user_application_list_audit.login</code>.
|
||||
*/
|
||||
public final TableField<UserApplicationListAuditRecord, String> LOGIN = createField(DSL.name("login"), SQLDataType.VARCHAR(1000), this, "");
|
||||
|
||||
private UserApplicationListAudit(Name alias, Table<UserApplicationListAuditRecord> aliased) {
|
||||
this(alias, aliased, (Field<?>[]) null, null);
|
||||
}
|
||||
|
||||
private UserApplicationListAudit(Name alias, Table<UserApplicationListAuditRecord> aliased, Field<?>[] parameters, Condition where) {
|
||||
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an aliased <code>public.user_application_list_audit</code> table
|
||||
* reference
|
||||
*/
|
||||
public UserApplicationListAudit(String alias) {
|
||||
this(DSL.name(alias), USER_APPLICATION_LIST_AUDIT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an aliased <code>public.user_application_list_audit</code> table
|
||||
* reference
|
||||
*/
|
||||
public UserApplicationListAudit(Name alias) {
|
||||
this(alias, USER_APPLICATION_LIST_AUDIT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a <code>public.user_application_list_audit</code> table reference
|
||||
*/
|
||||
public UserApplicationListAudit() {
|
||||
this(DSL.name("user_application_list_audit"), null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Schema getSchema() {
|
||||
return aliased() ? null : Public.PUBLIC;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Identity<UserApplicationListAuditRecord, Long> getIdentity() {
|
||||
return (Identity<UserApplicationListAuditRecord, Long>) super.getIdentity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public UniqueKey<UserApplicationListAuditRecord> getPrimaryKey() {
|
||||
return Keys.USER_APPLICATION_LIST_AUDIT_PKEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserApplicationListAudit as(String alias) {
|
||||
return new UserApplicationListAudit(DSL.name(alias), this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserApplicationListAudit as(Name alias) {
|
||||
return new UserApplicationListAudit(alias, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserApplicationListAudit as(Table<?> alias) {
|
||||
return new UserApplicationListAudit(alias.getQualifiedName(), this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit rename(String name) {
|
||||
return new UserApplicationListAudit(DSL.name(name), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit rename(Name name) {
|
||||
return new UserApplicationListAudit(name, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit rename(Table<?> name) {
|
||||
return new UserApplicationListAudit(name.getQualifiedName(), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit where(Condition condition) {
|
||||
return new UserApplicationListAudit(getQualifiedName(), aliased() ? this : null, null, condition);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit where(Collection<? extends Condition> conditions) {
|
||||
return where(DSL.and(conditions));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit where(Condition... conditions) {
|
||||
return where(DSL.and(conditions));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit where(Field<Boolean> condition) {
|
||||
return where(DSL.condition(condition));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public UserApplicationListAudit where(SQL condition) {
|
||||
return where(DSL.condition(condition));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public UserApplicationListAudit where(@Stringly.SQL String condition) {
|
||||
return where(DSL.condition(condition));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public UserApplicationListAudit where(@Stringly.SQL String condition, Object... binds) {
|
||||
return where(DSL.condition(condition, binds));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
@PlainSQL
|
||||
public UserApplicationListAudit where(@Stringly.SQL String condition, QueryPart... parts) {
|
||||
return where(DSL.condition(condition, parts));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit whereExists(Select<?> select) {
|
||||
return where(DSL.exists(select));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create an inline derived table from this table
|
||||
*/
|
||||
@Override
|
||||
public UserApplicationListAudit whereNotExists(Select<?> select) {
|
||||
return where(DSL.notExists(select));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
/*
|
||||
* This file is generated by jOOQ.
|
||||
*/
|
||||
package ru.micord.ervu.account_applications.db_beans.public_.tables.records;
|
||||
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.jooq.Record1;
|
||||
import org.jooq.impl.UpdatableRecordImpl;
|
||||
|
||||
import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationListAudit;
|
||||
|
||||
|
||||
/**
|
||||
* This class is generated by jOOQ.
|
||||
*/
|
||||
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
|
||||
public class UserApplicationListAuditRecord extends UpdatableRecordImpl<UserApplicationListAuditRecord> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* Setter for <code>public.user_application_list_audit.id</code>.
|
||||
*/
|
||||
public void setId(UUID value) {
|
||||
set(0, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>public.user_application_list_audit.id</code>.
|
||||
*/
|
||||
public UUID getId() {
|
||||
return (UUID) get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for
|
||||
* <code>public.user_application_list_audit.user_application_list_id</code>.
|
||||
*/
|
||||
public void setUserApplicationListId(Long value) {
|
||||
set(1, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for
|
||||
* <code>public.user_application_list_audit.user_application_list_id</code>.
|
||||
*/
|
||||
public Long getUserApplicationListId() {
|
||||
return (Long) get(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>public.user_application_list_audit.date</code>.
|
||||
*/
|
||||
public void setDate(Timestamp value) {
|
||||
set(2, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>public.user_application_list_audit.date</code>.
|
||||
*/
|
||||
public Timestamp getDate() {
|
||||
return (Timestamp) get(2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>public.user_application_list_audit.status</code>.
|
||||
*/
|
||||
public void setStatus(String value) {
|
||||
set(3, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>public.user_application_list_audit.status</code>.
|
||||
*/
|
||||
public String getStatus() {
|
||||
return (String) get(3);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>public.user_application_list_audit.fio</code>.
|
||||
*/
|
||||
public void setFio(String value) {
|
||||
set(4, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>public.user_application_list_audit.fio</code>.
|
||||
*/
|
||||
public String getFio() {
|
||||
return (String) get(4);
|
||||
}
|
||||
|
||||
/**
|
||||
* Setter for <code>public.user_application_list_audit.login</code>.
|
||||
*/
|
||||
public void setLogin(String value) {
|
||||
set(5, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for <code>public.user_application_list_audit.login</code>.
|
||||
*/
|
||||
public String getLogin() {
|
||||
return (String) get(5);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// Primary key information
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public Record1<UUID> key() {
|
||||
return (Record1) super.key();
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// Constructors
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Create a detached UserApplicationListAuditRecord
|
||||
*/
|
||||
public UserApplicationListAuditRecord() {
|
||||
super(UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a detached, initialised UserApplicationListAuditRecord
|
||||
*/
|
||||
public UserApplicationListAuditRecord(UUID id, Long userApplicationListId, Timestamp date, String status, String fio, String login) {
|
||||
super(UserApplicationListAudit.USER_APPLICATION_LIST_AUDIT);
|
||||
|
||||
setId(id);
|
||||
setUserApplicationListId(userApplicationListId);
|
||||
setDate(date);
|
||||
setStatus(status);
|
||||
setFio(fio);
|
||||
setLogin(login);
|
||||
resetChangedOnNotNull();
|
||||
}
|
||||
}
|
||||
|
|
@ -23,4 +23,24 @@ public class ErvuDirectoriesListener {
|
|||
public void listenKafkaRole(String kafkaMessage) {
|
||||
ervuDirectoriesService.upsertKafkaRoleMessage(kafkaMessage);
|
||||
}
|
||||
// Пока не заведены, обещают в будущих апдейтах создать
|
||||
// @KafkaListener(id = "${kafka.role.updated.group.id}", topics = "${kafka.role.updated}")
|
||||
// public void listenKafkaRoleUpdated(String kafkaMessage) {
|
||||
// ervuDirectoriesService.upsertKafkaRoleMessage(kafkaMessage);
|
||||
// }
|
||||
|
||||
// @KafkaListener(id = "${kafka.role.created.group.id}", topics = "${kafka.role.created}")
|
||||
// public void listenKafkaRoleUpdated(String kafkaMessage) {
|
||||
// ervuDirectoriesService.upsertKafkaRoleMessage(kafkaMessage);
|
||||
// }
|
||||
|
||||
@KafkaListener(id = "${kafka.domain.updated.group.id}", topics = "${kafka.domain.updated}")
|
||||
public void listenKafkaDomainUpdated(String kafkaMessage) {
|
||||
ervuDirectoriesService.upsertKafkaDomainMessage(kafkaMessage);
|
||||
}
|
||||
|
||||
@KafkaListener(id = "${kafka.domain.created.group.id}", topics = "${kafka.domain.created}")
|
||||
public void listenKafkaDomainCreated(String kafkaMessage) {
|
||||
ervuDirectoriesService.upsertKafkaDomainMessage(kafkaMessage);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ import org.springframework.context.annotation.Bean;
|
|||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.kafka.annotation.EnableKafka;
|
||||
import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
|
||||
import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
|
||||
import org.springframework.kafka.core.ConsumerFactory;
|
||||
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
|
||||
import org.springframework.kafka.support.serializer.JsonDeserializer;
|
||||
|
||||
/**
|
||||
* @author Eduard Tihomirov
|
||||
|
|
@ -40,6 +40,11 @@ public class KafkaConfig {
|
|||
return new DefaultKafkaConsumerFactory<>(consumerConfigs());
|
||||
}
|
||||
|
||||
@Bean
|
||||
public KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry() {
|
||||
return new KafkaListenerEndpointRegistry();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public Map<String, Object> consumerConfigs() {
|
||||
Map<String, Object> props = new HashMap<>();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
package ru.micord.ervu.account_applications.kafka;
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.DependsOn;
|
||||
import org.springframework.stereotype.Component;
|
||||
import ru.micord.ervu.account_applications.service.ErvuDirectoriesService;
|
||||
|
||||
/**
|
||||
* @author Eduard Tihomirov
|
||||
*/
|
||||
@Component
|
||||
@DependsOn("ervuDirectoriesListener")
|
||||
public class KafkaConsumerInitializer {
|
||||
@Value("${load.directories:true}")
|
||||
private Boolean loadDirectories;
|
||||
|
||||
private final ErvuDirectoriesService ervuDirectoriesService;
|
||||
|
||||
public KafkaConsumerInitializer(ErvuDirectoriesService ervuDirectoriesService) {
|
||||
this.ervuDirectoriesService = ervuDirectoriesService;
|
||||
}
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
if (loadDirectories) {
|
||||
new Thread(this::runWithSleep).start();
|
||||
}
|
||||
}
|
||||
|
||||
private void runWithSleep() {
|
||||
try {
|
||||
Thread.sleep(10000);
|
||||
}
|
||||
catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
ervuDirectoriesService.updateDirectories();
|
||||
}
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@ import java.util.ArrayList;
|
|||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
|
|
@ -34,14 +35,16 @@ import ru.micord.ervu.account_applications.model.RoleResponse;
|
|||
* @author Eduard Tihomirov
|
||||
*/
|
||||
@Service
|
||||
@DependsOn({"liquibase", "ervuDirectoriesListener"})
|
||||
@DependsOn("liquibase")
|
||||
public class ErvuDirectoriesService {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(
|
||||
MethodHandles.lookup().lookupClass());
|
||||
@Value("${idm.url}")
|
||||
private String idmUrl;
|
||||
@Value("${ervu.collection:domain, role}")
|
||||
private String ervuCollection;
|
||||
@Value("${ervu.directories:domain, role}")
|
||||
private String ervuDirectories;
|
||||
@Value("${ervu.admin.role:gomu_supervisor, system_administrator, security_administrator, Responsible_for_internal_control}")
|
||||
private String ervuAdminRole;
|
||||
@Autowired
|
||||
private RestTemplate restTemplate;
|
||||
@Autowired
|
||||
|
|
@ -56,9 +59,9 @@ public class ErvuDirectoriesService {
|
|||
})
|
||||
public void updateDirectories() {
|
||||
try {
|
||||
String[] ervuCollectionArray = ervuCollection.split(",");
|
||||
Arrays.stream(ervuCollectionArray).forEach(ervuCollection -> {
|
||||
String targetUrl = idmUrl + "/reconcile/"+ ervuCollection + "/to/kafka/v1";
|
||||
String[] ervuDirectoriesArray = ervuDirectories.split(",");
|
||||
Arrays.stream(ervuDirectoriesArray).forEach(ervuCollection -> {
|
||||
String targetUrl = idmUrl + "/reconcile/"+ ervuCollection.trim() + "/to/kafka/v1";
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
||||
String emptyJson = "{}";
|
||||
|
|
@ -163,6 +166,7 @@ public class ErvuDirectoriesService {
|
|||
}
|
||||
|
||||
private void upsertRoleData(List<RoleResponse.Data> dataList) {
|
||||
String[] adminRoles = ervuAdminRole.split(",");
|
||||
List<UserApplicationRoleRecord> newRoleRecords = new ArrayList<>();
|
||||
List<UserApplicationRoleRecord> roleRecords = new ArrayList<>();
|
||||
List<String> ids = ervuDirectoriesDaoService.getRoleIds();
|
||||
|
|
@ -183,6 +187,12 @@ public class ErvuDirectoriesService {
|
|||
roleRecord.setCreated(createdAt);
|
||||
roleRecord.setUpdated(updatedAt);
|
||||
roleRecord.setFinished(finishAt);
|
||||
Optional<String> adminRoleOptional = Arrays.stream(adminRoles)
|
||||
.filter(role -> role.trim().equals(data.getName()))
|
||||
.findAny();
|
||||
if (adminRoleOptional.isPresent()) {
|
||||
roleRecord.setAdminRole(true);
|
||||
}
|
||||
if (ids.contains(data.getId())) {
|
||||
roleRecords.add(roleRecord);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
package ru.micord.ervu.account_applications.service;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import net.javacrumbs.shedlock.core.SchedulerLock;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import static org.springframework.scheduling.config.ScheduledTaskRegistrar.CRON_DISABLED;
|
||||
|
||||
/**
|
||||
* @author Eduard Tihomirov
|
||||
*/
|
||||
@Service
|
||||
public class ErvuDirectoriesUpdateShedulerService {
|
||||
|
||||
@Autowired
|
||||
private ErvuDirectoriesService ervuDirectoriesService;
|
||||
|
||||
@Value("${directory.update.cron:0 0 */1 * * *}")
|
||||
private String cronLoad;
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
if (!cronLoad.equals(CRON_DISABLED)) {
|
||||
new Thread(this::runWithSleep).start();
|
||||
}
|
||||
}
|
||||
|
||||
private void runWithSleep() {
|
||||
try {
|
||||
Thread.sleep(100000);
|
||||
}
|
||||
catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
run();
|
||||
}
|
||||
|
||||
@Scheduled(cron = "${directory.update.cron:0 0 */1 * * *}")
|
||||
@SchedulerLock(name = "updateDirectories")
|
||||
public void run() {
|
||||
ervuDirectoriesService.updateDirectories();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,19 @@
|
|||
package ru.micord.ervu.account_applications.service;
|
||||
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.kafka.common.protocol.types.Field;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.micord.ervu.account_applications.component.dao.AuditDao;
|
||||
import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
|
||||
import ru.micord.ervu.account_applications.security.context.SecurityContext;
|
||||
import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
|
||||
|
||||
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.ACCEPTED;
|
||||
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.AGREED;
|
||||
|
||||
/**
|
||||
* @author gulnaz
|
||||
|
|
@ -11,9 +22,13 @@ import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
|
|||
public class UserApplicationListService {
|
||||
|
||||
private final UserApplicationListDao dao;
|
||||
private final AuditDao auditDao;
|
||||
private final SecurityContext securityContext;
|
||||
|
||||
public UserApplicationListService(UserApplicationListDao dao) {
|
||||
public UserApplicationListService(UserApplicationListDao dao, AuditDao auditDao, SecurityContext securityContext) {
|
||||
this.dao = dao;
|
||||
this.auditDao = auditDao;
|
||||
this.securityContext = securityContext;
|
||||
}
|
||||
|
||||
public void saveTraceId(String traceId, long appNumber) {
|
||||
|
|
@ -22,6 +37,7 @@ public class UserApplicationListService {
|
|||
|
||||
public void savePassword(String traceId, String encodedPass) {
|
||||
dao.savePassword(traceId, encodedPass);
|
||||
saveAuditStatusByTraceId(traceId, ACCEPTED.name());
|
||||
}
|
||||
|
||||
public boolean userExists(String login){
|
||||
|
|
@ -30,6 +46,7 @@ public class UserApplicationListService {
|
|||
|
||||
public void saveAcceptedStatus(String traceId) {
|
||||
dao.saveAcceptedStatus(traceId);
|
||||
saveAuditStatusByTraceId(traceId, ACCEPTED.name());
|
||||
}
|
||||
|
||||
public void saveAgreedStatus(long appNumber) {
|
||||
|
|
@ -38,5 +55,16 @@ public class UserApplicationListService {
|
|||
|
||||
public void saveError(String traceId, String errorMsg) {
|
||||
dao.saveError(traceId, errorMsg);
|
||||
saveAuditStatusByTraceId(traceId, AGREED.name());
|
||||
}
|
||||
|
||||
private void saveAuditStatusByTraceId(String traceId, String status) {
|
||||
List<Long> appListIds = auditDao.selectAppListIdsByTraceId(traceId);
|
||||
UserSession userSession = securityContext.getUserSession();
|
||||
String name = userSession.name();
|
||||
String userId = userSession.userId();
|
||||
appListIds.forEach(id -> {
|
||||
auditDao.insert(id, name, userId, status, Timestamp.valueOf(LocalDateTime.now()));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog
|
||||
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
|
||||
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
|
||||
|
||||
<changeSet id="0001" author="tihomirov">
|
||||
<comment>add audit table</comment>
|
||||
<sql>
|
||||
CREATE TABLE IF NOT EXISTS public.user_application_list_audit (
|
||||
id uuid NOT NULL DEFAULT uuid_generate_v4(),
|
||||
user_application_list_id bigserial,
|
||||
date TIMESTAMP WITHOUT TIME ZONE DEFAULT now(),
|
||||
status character varying(100),
|
||||
fio character varying(1000),
|
||||
login character varying(1000)
|
||||
)
|
||||
TABLESPACE pg_default;
|
||||
|
||||
ALTER TABLE IF EXISTS public.user_application_list_audit
|
||||
OWNER TO ervu_account_applications;
|
||||
|
||||
GRANT ALL ON TABLE public.user_application_role TO ervu_account_applications;
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog
|
||||
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
|
||||
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
|
||||
|
||||
<changeSet id="0001" author="tihomirov">
|
||||
<comment>add pk audit table</comment>
|
||||
<sql>
|
||||
ALTER TABLE public.user_application_list_audit ADD PRIMARY KEY (id)
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
|
|
@ -20,4 +20,6 @@
|
|||
<include file="20250324-SUPPORT-9023_add_sent_date.xml" relativeToChangelogFile="true"/>
|
||||
<include file="20250404-SUPPORT-9080_add_role_code.xml" relativeToChangelogFile="true"/>
|
||||
<include file="20250410-SUPPORT-9098_admin_role.xml" relativeToChangelogFile="true"/>
|
||||
<include file="20250411_SUPPORT-9099_add_audit.xml" relativeToChangelogFile="true"/>
|
||||
<include file="20250415_SUPPORT-9099_add_pk.xml" relativeToChangelogFile="true"/>
|
||||
</databaseChangeLog>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
|
||||
ARG BACKEND_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20241225
|
||||
ARG FRONTEND_IMAGE=nginx:1.24-alpine-slim
|
||||
ARG FRONTEND_IMAGE=nginx:1.26.3-alpine-slim
|
||||
|
||||
FROM $BUILDER_IMAGE AS builder
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ KAFKA_USER=user1
|
|||
KAFKA_PASS=Blfi9d2OFG
|
||||
KAFKA_CONSUMER_GROUP_ID=1
|
||||
KAFKA_DOMAIN_GROUP_ID=ervu-account-applications-backend-domain
|
||||
KAFKA_DOMAIN_UPDATED_GROUP_ID=ervu-account-applications-backend-domain-updated
|
||||
KAFKA_DOMAIN_CREATED_GROUP_ID=ervu-account-applications-backend-domain-updated
|
||||
KAFKA_ROLE_GROUP_ID=ervu-account-applications-backend-role
|
||||
IDM_URL=http://idm
|
||||
|
||||
|
|
@ -28,4 +30,6 @@ ERVU_HTTP_TIMEOUT=30
|
|||
ERVU_PWD_SIGN_SECRET_KEY=xoL2Y3VRdQ4phXG85o6dRqcgqb4bk6ULdkJJdlRLhZM=
|
||||
KAFKA_ROLE_RECONCILIATION=idmv2.role.reconciliation
|
||||
KAFKA_DOMAIN_RECONCILIATION=idmv2.domain.reconciliation
|
||||
KAFKA_DOMAIN_UPDATED=idmv2.domain.created
|
||||
KAFKA_DOMAIN_CREATED=idmv2.domain.updated
|
||||
ERVU_ROLE_ADMIN=security_administrator
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>account-applications</artifactId>
|
||||
<version>1.9.12</version>
|
||||
<version>1.9.14</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ru.micord.ervu.account_applications</groupId>
|
||||
|
|
|
|||
6
frontend/package-lock.json
generated
6
frontend/package-lock.json
generated
|
|
@ -1726,9 +1726,9 @@
|
|||
}
|
||||
},
|
||||
"@webbpm/base-package": {
|
||||
"version": "3.192.6",
|
||||
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.6.tgz",
|
||||
"integrity": "sha512-ID4VCBD3ds7tPFaokDTfJ4GcPjtiGMUSJ5vvUobg4wmC4M+AKTS50ZpsovhxGGzOQlS+uk0MCCoX5KzgMmQbZA==",
|
||||
"version": "3.192.9",
|
||||
"resolved": "https://repo.micord.ru/repository/npm-all/@webbpm/base-package/-/base-package-3.192.9.tgz",
|
||||
"integrity": "sha512-W93LcQTm/OUGwRLJqyffNOqs0Uv9F4bdV26SqZr4QWngPeWKQ0pO8Jg5Lsy7d0xTVN4rfMM/NEaU2FYCC/yKzw==",
|
||||
"requires": {
|
||||
"tslib": "^1.9.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
"@angular/platform-browser-dynamic": "7.2.15",
|
||||
"@angular/router": "7.2.15",
|
||||
"@ng-bootstrap/ng-bootstrap": "4.2.2-micord.1",
|
||||
"@webbpm/base-package": "3.192.6",
|
||||
"@webbpm/base-package": "3.192.9",
|
||||
"ag-grid-angular": "29.0.0-micord.4",
|
||||
"ag-grid-community": "29.0.0-micord.4",
|
||||
"angular-calendar": "0.28.28",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ru.micord.ervu</groupId>
|
||||
<artifactId>account-applications</artifactId>
|
||||
<version>1.9.12</version>
|
||||
<version>1.9.14</version>
|
||||
</parent>
|
||||
|
||||
<groupId>ru.micord.ervu.account_applications</groupId>
|
||||
|
|
|
|||
|
|
@ -300,6 +300,10 @@
|
|||
.webbpm.account-applications dropdown-tree-view .bi-caret-right-fill::before {
|
||||
content: "\f4fd";
|
||||
}
|
||||
.webbpm.account-applications dropdown-tree-view :focus {
|
||||
outline: none !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
/* DropDownTree end */
|
||||
|
||||
.webbpm.account-applications .selectize-dropdown,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[hidden]="!label" class="control-label">
|
||||
<span>{{label}}<span *ngIf="isRequired()" class="alarm"> *</span></span>
|
||||
</label>
|
||||
<div>
|
||||
<div tabindex="0" (keydown)="onKeyDown($event)">
|
||||
<ngx-dropdown-treeview-select
|
||||
[items]="items"
|
||||
[maxHeight]="maxHeight"
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import {
|
|||
import {
|
||||
AdvancedProperty,
|
||||
Event,
|
||||
EventUtils,
|
||||
InputControl,
|
||||
LocalStorageService,
|
||||
NotNull,
|
||||
|
|
@ -269,6 +270,15 @@ export class DropdownTreeViewComponent extends InputControl {
|
|||
return null;
|
||||
}
|
||||
|
||||
onKeyDown(event: KeyboardEvent): void {
|
||||
const isInput = (event.target as HTMLElement).tagName === 'INPUT';
|
||||
if (EventUtils.isKeyBackspace(event) && !isInput && this.value) {
|
||||
this.clearValue();
|
||||
event.stopPropagation();
|
||||
event.preventDefault();
|
||||
}
|
||||
}
|
||||
|
||||
onChange() {
|
||||
super.onChange();
|
||||
this.valueChangeEvent.trigger(this.value);
|
||||
|
|
|
|||
|
|
@ -5,11 +5,6 @@ import {RolesGuard} from "./guard/RolesGuard";
|
|||
|
||||
|
||||
const appRoutes: Routes = [
|
||||
{
|
||||
path: 'home',
|
||||
loadChildren: 'generated-sources/page-home.module#PagehomeModule',
|
||||
canActivate: [ConfirmExitGuard, RolesGuard]
|
||||
},
|
||||
{
|
||||
path: 'app_list',
|
||||
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
|
|||
},
|
||||
{
|
||||
path: '',
|
||||
loadChildren: 'generated-sources/page-home.module#PagehomeModule',
|
||||
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
||||
canActivate: [ConfirmExitGuard, RolesGuard],
|
||||
pathMatch: 'full',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
|
|||
},
|
||||
{
|
||||
path: '',
|
||||
loadChildren: 'generated-sources/page-home.module#PagehomeModule',
|
||||
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
||||
canActivate: [ConfirmExitGuard, RolesGuard],
|
||||
pathMatch: 'full',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>resources</artifactId>
|
||||
<version>3.192.6</version>
|
||||
<version>3.192.9</version>
|
||||
<organization>
|
||||
<name>Micord</name>
|
||||
</organization>
|
||||
|
|
@ -28,13 +28,13 @@
|
|||
<jooq.version>3.19.3</jooq.version>
|
||||
<jupiter.version>5.10.2</jupiter.version>
|
||||
<enforcer.manageVersions>true</enforcer.manageVersions>
|
||||
<webbpm-platform.version>3.192.6</webbpm-platform.version>
|
||||
<webbpm-platform.version>3.192.9</webbpm-platform.version>
|
||||
<h2.version>1.4.200</h2.version>
|
||||
<build.timestamp>0402110850</build.timestamp>
|
||||
<build.timestamp>0416115255</build.timestamp>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<junit.platform.version>1.10.0</junit.platform.version>
|
||||
<enforcer.manageExclusions>true</enforcer.manageExclusions>
|
||||
<revision>3.192.6</revision>
|
||||
<revision>3.192.9</revision>
|
||||
<metadata.ts.filename>typescript.metadata.json</metadata.ts.filename>
|
||||
<package.repository.url>https://repo.micord.ru</package.repository.url>
|
||||
<maven.build.timestamp.format>MMddHHmmss</maven.build.timestamp.format>
|
||||
|
|
@ -47,19 +47,19 @@
|
|||
<dependency>
|
||||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>converters</artifactId>
|
||||
<version>3.192.6</version>
|
||||
<version>3.192.9</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>3.192.6</version>
|
||||
<version>3.192.9</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>frontend</artifactId>
|
||||
<version>3.192.6</version>
|
||||
<version>3.192.9</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Manifest-Version: 1.0
|
||||
Created-By: Maven Jar Plugin 3.2.0
|
||||
Build-Jdk-Spec: 17
|
||||
|
||||
Manifest-Version: 1.0
|
||||
Created-By: Maven Jar Plugin 3.2.0
|
||||
Build-Jdk-Spec: 17
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
<ul>
|
||||
|
||||
<li>Образец внешней ссылки: <code>https://www.wildberries.ru/catalog/${sku}/detail.aspx</code></li>
|
||||
<li>Образец внутренней ссылки: <code>products/ru.cg.webbpm.packages.base:resources:jar:3.192.6</code></li>
|
||||
<li>Образец внутренней ссылки: <code>products/ru.cg.webbpm.packages.base:resources:jar:3.192.9</code></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -4,17 +4,17 @@
|
|||
<description>Base webbpm package</description>
|
||||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>resources</artifactId>
|
||||
<version>3.192.6</version>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<version>3.192.9</version>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
|
||||
<backendModule>
|
||||
<groupId>ru.cg.webbpm.packages.base</groupId>
|
||||
<artifactId>backend</artifactId>
|
||||
<version>3.192.6</version>
|
||||
<version>3.192.9</version>
|
||||
</backendModule>
|
||||
<frontendModule>
|
||||
<packageName>@webbpm/base-package</packageName>
|
||||
<version>3.192.6</version>
|
||||
<version>3.192.9</version>
|
||||
</frontendModule>
|
||||
</packageInfo>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_отмены.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_очистки_фильтра.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_удаления.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_загрузки.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_вызова_ошибки.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<documentation>component/buttons/Кнопка_выполнения_бизнес-процесса.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_выполнения_SQL.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_для_фильтрации.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_навигации.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_сохранения.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_выбора.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_подписи.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/Кнопка_запуска_бизнес-процесса.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/reporting/Кнопка_печати_из_графа_сущности.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/buttons/reporting/Кнопка_печати_отчета_из_формы.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Сворачиваемая_панель.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Диалог.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Контейнер_с_кнопками.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Группа_полей.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Набор_фильтров.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Форма.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Горизонтальный_контейнер.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Контейнер_вкладок.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Вкладка.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Вертикальный_контейнер.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/containers/Окно.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/editable-grids/EditableGrid.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/autocomplete</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/check-box</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/combo-box</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/date-time-picker</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/money-field</localization>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/number-field</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/one-to-many</localization>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/one-to-many</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/read-only</localization>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
<category>editable-grids</category>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>Статичный_выпадающий_список_колонки_таблицы.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/text-area</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/text-field</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<localization>META-INF/components/localization/editable-grids/time-picker</localization>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/ФИАС.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Поле_ввода_с_подбором_значения.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Флаг.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Выпадающий_список.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Дата.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/EditableOneToMany.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Файл.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Файл.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/ManyToMany.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/ManyToManyField.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Денежное_поле.html</documentation>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Числовое_поле.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/OneToMany.html</documentation>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/OneToMany.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Переключатель.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/SignVerification.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Статичный_выпадающий_список.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Статичный_переключатель.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Текст.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Многострочное_поле.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Текстовое_поле.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/Время.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
<documentation>component/fields/TreeField.html</documentation>
|
||||
<internal>false</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
<localization>META-INF/components/localization/editable-grid</localization>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
<name>EditableOneToManyForm</name>
|
||||
<internal>true</internal>
|
||||
<versions>
|
||||
<studioVersion>3.192.6</studioVersion>
|
||||
<studioVersion>3.192.9</studioVersion>
|
||||
<packageVersions>
|
||||
<entry>
|
||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
||||
<value>3.192.6</value>
|
||||
<value>3.192.9</value>
|
||||
</entry>
|
||||
</packageVersions>
|
||||
</versions>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue