diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/FormSchema.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/FormSchema.java deleted file mode 100644 index 897ed7c6..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/FormSchema.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema; - -import java.util.Map; - -import lombok.Data; - -/** - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:17 - */ -@Data -public class FormSchema { - /** - * type: 'object'(固定配置) - */ - private String type = "object"; - - /** - * 表单项 label 布局方式:row | column | inline - */ - private DisplayType displayType = DisplayType.row; - - /** - * 表单布局:一行多列 - */ - private Integer column; - - /** - * 固定表单标签的宽度 - */ - private Integer labelWidth; - - /** - * labelCol - */ - private Integer labelCol = 6; - - /** - * fieldCol - */ - private Integer fieldCol = 14; - - /** - * 表单元素集合 - */ - private Map properties; - - /** - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:16 - */ - public enum DisplayType { - /** - * row - */ - row, - /** - * column - */ - column, - /** - * inline - */ - inline - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Checkbox.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Checkbox.java deleted file mode 100644 index ba3e971f..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Checkbox.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * Checkbox 单选 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:31 - */ -public class Checkbox extends Field { - public Checkbox(String title) { - super("boolean", "checkbox"); - this.title = title; - } -} \ No newline at end of file diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Checkboxes.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Checkboxes.java deleted file mode 100644 index 02666f27..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Checkboxes.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -import java.util.List; - -/** - * Checkbox 多选 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:31 - */ -public class Checkboxes extends Field { - - public Checkboxes(String title, List options) { - super("array", "checkboxes"); - this.title = title; - this.props.put("options", options); - } - -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Date.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Date.java deleted file mode 100644 index f238d7e7..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Date.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 日期选择 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:28 - */ -public class Date extends Field { - - public Date(String title) { - super("string"); - this.format = "date"; - this.title = title; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/DateTime.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/DateTime.java deleted file mode 100644 index 07c6795d..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/DateTime.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 日期时间范围 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:17 - */ -public class DateTime extends Field { - - public DateTime(String title) { - super("string"); - this.format = "dateTime"; - this.title = title; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/DateTimeRange.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/DateTimeRange.java deleted file mode 100644 index fa43d641..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/DateTimeRange.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 日期时间范围 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:17 - */ -public class DateTimeRange extends Field { - - public DateTimeRange(String title) { - super("range"); - this.format = "dateTime"; - this.title = title; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Field.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Field.java deleted file mode 100644 index 11ff040c..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Field.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.commons.collections4.map.HashedMap; - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 基础控件配置项基类 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:27 - */ -@Data -@Accessors(chain = true) -public abstract class Field { - /** - *标题 - */ - protected String title; - /** - * 输入内容提示 - */ - protected List placeholder; - /** - * 副标题描述 - */ - protected String description; - /** - * 气泡提示,支持 html 格式 - */ - protected Tooltip tooltip; - /** - * 更多说明信息:extra 可以是 html string,也可以是纯文案,会展示在元素下面一行紧贴。 - */ - protected String extra; - /** - * 校验规则,以 ant design Form rules 为准 - */ - protected List rules; - /** - *隐藏 - */ - protected Boolean hidden; - /** - *禁用 - */ - protected Boolean disabled; - /** - * 只读 - */ - protected Boolean readOnly; - /** - * 额外属性 - */ - protected Map props; - - /** - * 数据类型:(参考form-render) - */ - protected final String type; - /** - * 组件名称(参考form-render) - */ - protected String widget; - /** - * format - */ - protected String format; - - public Field(String type, String widget) { - this.type = type; - this.widget = widget; - this.props = new HashedMap<>(1); - } - - public Field(String type) { - this.type = type; - this.props = new HashedMap<>(1); - } - - @Data - public static class Tooltip { - private String title; - - public Tooltip(String title) { - this.title = title; - } - } - - /** - * 规则,ant design Form 校验规则 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:44 - */ - @Data - public static class Rule { - /** - * 是否必填 - */ - private Boolean required; - - /** - * 如果字段仅包含空格则校验不通过,只在 type: 'string' 时生效 - */ - private Boolean whitespace; - - /** - * 错误提示 - */ - private String message; - /** - * 正则表达式 - */ - private String pattern; - /** - * 最小 - */ - private Integer min; - /** - * 最大 - */ - private Integer max; - /** - * 类型,常见有 string |number |boolean |url | email。 - * 更多请参考:... - */ - private String type; - - public Rule required(Boolean required) { - this.required = required; - return this; - } - - public Rule message(String message) { - this.message = message; - return this; - } - - public Rule pattern(String pattern) { - this.pattern = pattern; - return this; - } - - public Rule min(Integer min) { - this.min = min; - return this; - } - - public Rule max(Integer max) { - this.max = max; - return this; - } - - public Rule whitespace(Boolean whitespace) { - this.whitespace = whitespace; - return this; - } - - public Rule type(String type) { - this.type = type; - return this; - } - } - - public Field addRule(Rule rule) { - if (this.rules == null) { - this.rules = new ArrayList<>(); - } - this.rules.add(rule); - return this; - } - - public Field addProps(Map props) { - getProps().putAll(props); - return this; - } - - public Field addProps(String key, Object value) { - getProps().put(key, value); - return this; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Month.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Month.java deleted file mode 100644 index f6703dfe..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Month.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 月份 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:07 - */ -public class Month extends Field { - public Month(String title) { - super("string"); - this.title = title; - this.format = "month"; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/MultiSelect.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/MultiSelect.java deleted file mode 100644 index 2fa3c1fa..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/MultiSelect.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -import java.util.List; - -/** - * 多选 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:29 - */ -public class MultiSelect extends Field { - - public MultiSelect(String title, List options) { - super("array", "multiSelect"); - this.props.put("options", options); - this.title = title; - } -} \ No newline at end of file diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/NumberInput.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/NumberInput.java deleted file mode 100644 index 1ac74a06..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/NumberInput.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 数字Input - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:28 - */ -public class NumberInput extends Field { - - public NumberInput(String title) { - super("number"); - this.title = title; - } -} \ No newline at end of file diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Option.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Option.java deleted file mode 100644 index 05c1c247..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Option.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -import lombok.Data; - -/** - * 选项 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:29 - */ -@Data -public class Option { - private String label; - private String value; - - public Option(String label, String value) { - this.label = label; - this.value = value; - } - -} \ No newline at end of file diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Quarter.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Quarter.java deleted file mode 100644 index 51fe55db..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Quarter.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 季度 - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:09 - */ -public class Quarter extends Field { - public Quarter(String title) { - super("string"); - this.title = title; - this.format = "quarter"; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Radio.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Radio.java deleted file mode 100644 index c92a76be..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Radio.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -import java.util.List; - -/** - * 单选 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:31 - */ -public class Radio extends Field { - - public Radio(String title, List options) { - super("string", "radio"); - this.props.put("options", options); - this.title = title; - } - -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Select.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Select.java deleted file mode 100644 index f9611c95..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Select.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -import java.util.List; - -/** - * 选择 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:29 - */ -public class Select extends Field { - - public Select(String title, List options) { - super("string", "select"); - this.title = title; - this.props.put("options", options); - } - -} \ No newline at end of file diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Switch.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Switch.java deleted file mode 100644 index 55f10e52..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Switch.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * Switch - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:28 - */ -public class Switch extends Field { - - public Switch(String title) { - super("boolean", "switch"); - this.title = title; - } -} \ No newline at end of file diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/TextArea.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/TextArea.java deleted file mode 100644 index 25b0cb44..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/TextArea.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 大文本 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:31 - */ -public class TextArea extends Field { - - public TextArea(String title) { - super("string"); - this.format = "textarea"; - this.title = title; - } - -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Time.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Time.java deleted file mode 100644 index 4044114e..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Time.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 时间选择 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:28 - */ -public class Time extends Field { - - public Time(String title) { - super("string"); - this.format = "time"; - this.title = title; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/TimeRange.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/TimeRange.java deleted file mode 100644 index 6a30bba1..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/TimeRange.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 时间范围 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:17 - */ -public class TimeRange extends Field { - - public TimeRange(String title) { - super("range"); - this.format = "time"; - this.title = title; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Week.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Week.java deleted file mode 100644 index 0a987081..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Week.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * 周选择 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:10 - */ -public class Week extends Field { - public Week(String title) { - super("string"); - this.title = title; - this.format = "week"; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Year.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Year.java deleted file mode 100644 index 80cc708d..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/field/Year.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema.field; - -/** - * Year选择 - * - * @author TopIAM - * Created by support@topiam.cn on 2023/4/12 21:10 - */ -public class Year extends Field { - public Year(String title) { - super("string"); - this.title = title; - this.format = "year"; - } -} diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/schema/package-info.java b/eiam-common/src/main/java/cn/topiam/employee/common/schema/package-info.java deleted file mode 100644 index 5817275e..00000000 --- a/eiam-common/src/main/java/cn/topiam/employee/common/schema/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * eiam-common - Employee Identity and Access Management - * Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package cn.topiam.employee.common.schema; \ No newline at end of file diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 772887fe..af7794bc 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -50,7 +50,7 @@ "@ant-design/pro-components": "^2.6.19", "ahooks": "^3.7.8", "antd": "^5.9.1", - "antd-img-crop": "^4.12.2", + "antd-img-crop": "^4.13.0", "antd-style": "^3.4.6", "classnames": "^2.3.2", "codemirror": "^5.65.5", diff --git a/eiam-console/src/main/console-fe/src/components/About/About.tsx b/eiam-console/src/main/console-fe/src/components/About/About.tsx index 07bc8531..71244a37 100644 --- a/eiam-console/src/main/console-fe/src/components/About/About.tsx +++ b/eiam-console/src/main/console-fe/src/components/About/About.tsx @@ -16,8 +16,8 @@ * along with this program. If not, see . */ import React from 'react'; -import { Image, Modal, Space, Typography } from 'antd'; -import { InfoCircleFilled } from '@ant-design/icons'; +import { Col, Image, Modal, Row, Space, Typography } from 'antd'; +import { CopyrightOutlined, InfoCircleFilled } from '@ant-design/icons'; import { FormattedMessage } from '@umijs/max'; import { useSafeState } from 'ahooks'; import { createStyles } from 'antd-style'; @@ -26,14 +26,12 @@ const { Text, Link } = Typography; const useStyle = createStyles({ main: { - display: 'flex', - gap: '40px', - padding: '20px 0', + padding: '10px 0', }, }); const About: React.FC = () => { const { styles } = useStyle(); - + const currentYear = new Date().getFullYear(); const [aboutOpen, setAboutOpen] = useSafeState(false); return ( @@ -53,14 +51,27 @@ const About: React.FC = () => { onCancel={() => setAboutOpen(false)} > - - - 产品:TopIAM 企业数字身份管控平台 - 版本:社区版 1.0.1 - - https://eiam.topiam.cn - - + + + + + + + 产品:TOPIAM 企业数字身份管控平台 + 版本:社区版 1.1.0 + + 版权所有 {'济南源创网络科技有限公司'} 2022-{currentYear} + 。保留一切权利。 + + + 警告:本软件受著作权法和国际版权条约的保护,未经授权擅自复制修改分发本程序的全部或任何部分,将要承担一切由此导致的民事或刑事责任。 + + + https://eiam.topiam.cn + + + + > diff --git a/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts b/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts index e26d15c8..a29e2b84 100644 --- a/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts +++ b/eiam-console/src/main/console-fe/src/locales/zh-CN/menu.ts @@ -43,6 +43,10 @@ export default { 'menu.app.group': '应用分组', 'menu.app.create': '创建应用', 'menu.app.detail': '应用详情', + 'menu.permission': '权限管理', + 'menu.permission.space': '权限空间', + 'menu.permission.resource': '权限资源', + 'menu.permission.role': '角色管理', 'menu.account': '账户管理', 'menu.account.user': '组织与用户', 'menu.account.user.detail': '用户详情', diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index 0970138e..26e743ea 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -51,7 +51,7 @@ "@ant-design/pro-components": "^2.6.19", "ahooks": "^3.7.8", "antd": "^5.9.1", - "antd-img-crop": "^4.12.2", + "antd-img-crop": "^4.13.0", "antd-style": "^3.4.6", "classnames": "^2.3.2", "crypto-js": "^4.1.1", diff --git a/eiam-portal/src/main/portal-fe/src/components/About/About.tsx b/eiam-portal/src/main/portal-fe/src/components/About/About.tsx index c75b11a3..8e10434a 100644 --- a/eiam-portal/src/main/portal-fe/src/components/About/About.tsx +++ b/eiam-portal/src/main/portal-fe/src/components/About/About.tsx @@ -16,8 +16,8 @@ * along with this program. If not, see . */ import React from 'react'; -import { Image, Modal, Space, Typography } from 'antd'; -import { InfoCircleFilled } from '@ant-design/icons'; +import { Col, Image, Modal, Row, Space, Typography } from 'antd'; +import { CopyrightOutlined, InfoCircleFilled } from '@ant-design/icons'; import { FormattedMessage } from '@umijs/max'; import { useSafeState } from 'ahooks'; import { createStyles } from 'antd-style'; @@ -26,14 +26,12 @@ const { Text, Link } = Typography; const useStyle = createStyles({ main: { - display: 'flex', - gap: '40px', - padding: '20px 0', + padding: '10px 0', }, }); const About: React.FC = () => { const { styles } = useStyle(); - + const currentYear = new Date().getFullYear(); const [aboutOpen, setAboutOpen] = useSafeState(false); return ( @@ -53,14 +51,27 @@ const About: React.FC = () => { onCancel={() => setAboutOpen(false)} > - - - 产品:TopIAM 企业数字身份管控平台 - 版本:社区版 1.0.1 - - https://eiam.topiam.cn - - + + + + + + + 产品:TOPIAM 企业数字身份管控平台 + 版本:社区版 1.1.0 + + 版权所有 {'济南源创网络科技有限公司'} 2022-{currentYear} + 。保留一切权利。 + + + 警告:本软件受著作权法和国际版权条约的保护,未经授权擅自复制、修改、分发本程序的全部或任何部分,将要承担一切由此导致的民事或刑事责任。 + + + https://eiam.topiam.cn + + + + >