lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-05-16 21:27:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/v2-dev' into v2-dev-buy

Browse Source 
# Conflicts:
#	docs/.vitepress/config.ts
#	packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue
This commit is contained in:
xiaojunnuo
2025-09-22 22:29:59 +08:00
parent b5d8161bc2 e30db9ee77
commit 81e588a896
175 changed files with 4551 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
+2
View File
@@ -105,9 +105,11 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
form: {
rules: [{ required: true, message: t("certd.pleaseEnterName") }],
helper: t("certd.nameHelper"),
order: -2,
},
column: {
width: 200,
order: -2,
},
},
from: {
packages/ui/certd-client/src/views/certd/access/common.tsx
+1
View File
@@ -87,6 +87,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
order: -1,
},
form: {
order: -1,
component: {
disabled: false,
showSearch: true,
packages/ui/certd-client/src/views/certd/access/crud.tsx
+1
View File
@@ -79,6 +79,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
},
form: {
rules: [{ required: true, message: "必填项" }],
order: -11,
},
column: {
width: 300,
packages/ui/certd-client/src/views/certd/addon/addon-selector/index.vue
+178
View File
@@ -0,0 +1,178 @@
<template>
<div class="addon-selector">
<div class="flex-o w-100">
<!-- <fs-dict-select class="flex-1" :value="modelValue" :dict="optionsDictRef" :disabled="disabled" :render-label="renderLabel" :slots="selectSlots" :allow-clear="true" v-bind="select" @update:value="onChange" />-->
<span v-if="modelValue" class="mr-5 cd-flex-inline">
<a-tag class="mr-5" color="green">{{ target?.name || modelValue }}</a-tag>
<fs-icon class="cd-icon-button" icon="ion:close-circle-outline" @click="clear"></fs-icon>
</span>
<span v-else class="mlr-5 text-gray">{{ placeholder || t("certd.addonSelector.placeholder") }}</span>
<fs-table-select
ref="tableSelectRef"
class="flex-0"
:model-value="modelValue"
:dict="optionsDictRef"
:create-crud-options="createCrudOptionsWithApi"
:crud-options-override="{
search: { show: false },
table: {
scroll: {
x: 540,
},
},
}"
:show-current="false"
:show-select="false"
:dialog="{ width: 960 }"
:destroy-on-close="false"
height="400px"
v-bind="tableSelect"
@update:model-value="onChange"
@dialog-closed="doRefresh"
>
<template #default="scope">
<fs-button class="ml-5" :disabled="disabled" :size="size" type="primary" :text="t('certd.addonSelector.select')" @click="scope.open" />
</template>
</fs-table-select>
</div>
</div>
</template>
<script lang="tsx" setup>
import { inject, ref, Ref, watch } from "vue";
import { createAddonApi } from "../api";
import { message } from "ant-design-vue";
import { dict } from "@fast-crud/fast-crud";
import createCrudOptions from "../crud";
import { addonProvide } from "../common";
import { useUserStore } from "/@/store/user";
import { useI18n } from "/src/locales";
const { t } = useI18n();
defineOptions({
name: "AddonSelector",
});
const props = defineProps<{
modelValue?: number | string | number[] | string[];
type?: string;
placeholder?: string;
size?: string;
disabled?: boolean;
select?: any;
tableSelect?: any;
addonType: string;
from?: string;
}>();
const onChange = async (value: number) => {
await emitValue(value);
};
const emit = defineEmits(["update:modelValue", "selected-change", "change"]);
const api = createAddonApi({
from: props.from,
addonType: props.addonType,
});
addonProvide(api);
function createCrudOptionsWithApi(opts: any) {
opts.context = {
api,
addonType: props.addonType,
};
return createCrudOptions(opts);
}
const tableSelectRef = ref();
const optionsDictRef = dict({
url: `/addon/options?addonType=${props.addonType}`,
value: "id",
label: "name",
});
const renderLabel = (option: any) => {
return <span>{option.name}</span>;
};
async function openTableSelectDialog() {
selectOpened.value = false;
await tableSelectRef.value.open({});
await tableSelectRef.value.crudExpose.openAdd({});
}
const selectOpened = ref(false);
const selectSlots = ref({
dropdownRender({ menuNode, props }: any) {
const res = [];
res.push(menuNode);
// res.push(<a-divider style="margin: 4px 0" />);
// res.push(<a-space style="padding: 4px 8px" />);
// res.push(<fs-button class="w-100" type="text" icon="plus-outlined" text="新建通知渠道" onClick={openTableSelectDialog}></fs-button>);
return res;
},
});
const target: Ref<any> = ref({});
function clear() {
if (props.disabled) {
return;
}
emitValue(null);
}
const userStore = useUserStore();
async function emitValue(value: any) {
// target.value = optionsDictRef.dataMap[value];
const userId = userStore.userInfo.id;
if (pipeline?.value && pipeline.value.userId !== userId) {
message.error(`对不起，您不能修改他人流水线的${props.addonType}设置`);
return;
}
emit("change", value);
emit("update:modelValue", value);
}
async function refreshTarget(value: any) {
if (value > 0) {
target.value = await api.GetSimpleInfo(value);
} else {
target.value = {
//captchaType会监听此字段，给个默认值
type: "",
};
}
}
watch(
() => {
return props.modelValue;
},
async value => {
// await optionsDictRef.loadDict();
//@ts-ignore
await refreshTarget(value);
// target.value = optionsDictRef.dataMap[value];
emit("selected-change", target.value);
},
{
immediate: true,
}
);
//当不在pipeline中编辑时，可能为空
const pipeline = inject("pipeline", null);
async function doRefresh() {
await optionsDictRef.reloadDict();
}
</script>
<style lang="less">
.addon-selector {
width: 100%;
}
</style>
packages/ui/certd-client/src/views/certd/addon/api.ts
+142
View File
@@ -0,0 +1,142 @@
import { request } from "/src/api/service";
import { RequestHandleReq } from "/@/components/plugins/lib";
export function createAddonApi(opts: { from: any; addonType: string }) {
let apiPrefix = "/addon";
if (opts.from === "sys") {
apiPrefix = "/sys/addon";
}
return {
async GetList(query: any) {
return await request({
url: apiPrefix + "/page",
method: "post",
data: {
...query,
query: {
addonType: opts.addonType,
...query.query,
},
},
});
},
async AddObj(obj: any) {
return await request({
url: apiPrefix + "/add",
method: "post",
data: {
...obj,
addonType: opts.addonType,
},
});
},
async UpdateObj(obj: any) {
return await request({
url: apiPrefix + "/update",
method: "post",
data: obj,
});
},
async DelObj(id: number) {
return await request({
url: apiPrefix + "/delete",
method: "post",
params: { id },
});
},
async GetObj(id: number) {
return await request({
url: apiPrefix + "/info",
method: "post",
params: { id },
});
},
async GetOptions(id: number) {
return await request({
url: apiPrefix + `/options?addonType=${opts.addonType}`,
method: "post",
});
},
async SetDefault(id: number) {
return await request({
url: apiPrefix + "/setDefault",
method: "post",
params: { id },
});
},
async GetDefaultId() {
return await request({
url: apiPrefix + "/getDefaultId",
method: "post",
});
},
async GetSimpleInfo(id: number) {
return await request({
url: apiPrefix + `/simpleInfo?addonType=${opts.addonType}`,
method: "post",
params: { id },
});
},
async GetDefineTypes() {
return await request({
url: apiPrefix + `/getTypeDict?addonType=${opts.addonType}`,
method: "post",
});
},
async GetProviderDefine(type: string) {
return await request({
url: apiPrefix + `/define?addonType=${opts.addonType}`,
method: "post",
params: { type },
});
},
async GetProviderDefineByType(type: string) {
return await request({
url: apiPrefix + `/defineByType?addonType=${opts.addonType}`,
method: "post",
params: { type },
});
},
async Handle(req: RequestHandleReq, opts: any = {}) {
const url = `/handle/${req.type}?addonType=${opts.addonType}`;
const { typeName, action, data, input } = req;
const res = await request({
url,
method: "post",
data: {
typeName,
action,
data,
input,
},
...opts,
});
return res;
},
};
}
export const AddonTypeDefines = {
captcha: {
name: "captcha",
title: "验证码",
showDefault: false,
showTest: false,
},
};
export function getAddonTypeDefine(addonType: string) {
return AddonTypeDefines[addonType];
}
packages/ui/certd-client/src/views/certd/addon/common.tsx
+280
View File
@@ -0,0 +1,280 @@
import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
import { computed, provide, ref, toRef } from "vue";
import { useReference } from "/@/use/use-refrence";
import { forEach, get, merge, set } from "lodash-es";
import { Modal } from "ant-design-vue";
import { mitter } from "/@/utils/util.mitt";
import { useI18n } from "/src/locales";
import * as pipelineApi from "/@/views/certd/pipeline/api";
import { getAddonTypeDefine } from "/@/views/certd/addon/api";
export function addonProvide(api: any) {
provide("addonApi", api);
provide("get:plugin:type", () => {
return "addon";
});
}
export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any, addonType: string) {
const { t } = useI18n();
// const addonTypeTypeDictRef = dict({
// data: [{ value: "captcha", label: "验证码" }],
// });
const addonTypeDictRef = dict({
url: `/addon/getTypeDict?addonType=${addonType}`,
});
const defaultPluginConfig = {
component: {
name: "a-input",
vModel: "value",
},
};
function buildDefineFields(define: any, form: any, mode: string) {
const formWrapperRef = crudExpose.getFormWrapperRef();
const columnsRef = toRef(formWrapperRef.formOptions, "columns");
for (const key in columnsRef.value) {
if (key.indexOf(".") >= 0) {
delete columnsRef.value[key];
}
}
console.log('crudBinding.value[mode + "Form"].columns', columnsRef.value);
forEach(define.input, (value: any, mapKey: any) => {
const key = "body." + mapKey;
const field = {
...value,
key,
};
const column = merge({ title: key }, defaultPluginConfig, field);
//eval
useReference(column);
if (column.required) {
if (!column.rules) {
column.rules = [];
}
column.rules.push({ required: true, message: t("certd.requiredField") });
}
//设置默认值
if (column.value != null && get(form, key) == null) {
set(form, key, column.value);
}
//字段配置赋值
columnsRef.value[key] = column;
});
}
const currentDefine = ref();
return {
id: {
title: "ID",
key: "id",
type: "number",
column: {
width: 100,
},
form: {
show: false,
},
},
// addonType: {
// title: "Addon类型",
// type: "dict-select",
// dict: addonTypeTypeDictRef,
// search: {
// show: false,
// },
// column: {
// width: 200,
// component: {
// color: "auto",
// },
// },
// form: {
// onChange(ctx: { value: any }) {
// addonTypeDictRef.url = `/addon/getTypeDict?addonType=${ctx.value}`;
// },
// },
// editForm: {
// component: {
// disabled: false,
// },
// },
// },
type: {
title: t("certd.addonType"),
type: "dict-select",
dict: addonTypeDictRef,
search: {
show: false,
},
column: {
width: 200,
component: {
color: "auto",
},
},
editForm: {
component: {
disabled: false,
},
},
form: {
order: -22,
component: {
disabled: false,
showSearch: true,
filterOption: (input: string, option: any) => {
input = input?.toLowerCase();
return option.value.toLowerCase().indexOf(input) >= 0 || option.label.toLowerCase().indexOf(input) >= 0;
},
renderLabel(item: any) {
return (
<span class={"flex-o flex-between"}>
{item.label}
{item.needPlus && <fs-icon icon={"mingcute:vip-1-line"} className={"color-plus"}></fs-icon>}
</span>
);
},
},
rules: [{ required: true, message: t("certd.addonTypeSelect") }],
valueChange: {
immediate: true,
async handle({ value, mode, form, immediate }) {
if (value == null) {
return;
}
const lastTitle = currentDefine.value?.title;
const define = await api.GetProviderDefine(value);
currentDefine.value = define;
console.log("define", define);
if (!immediate) {
form.body = {};
if (define.needPlus) {
mitter.emit("openVipModal");
}
}
if (!form.name || form.name === lastTitle) {
form.name = define.title;
}
buildDefineFields(define, form, mode);
},
},
helper: computed(() => {
const define = currentDefine.value;
if (define == null) {
return "";
}
return define.desc;
}),
},
} as ColumnCompositionProps,
name: {
title: t("certd.addonName"),
search: {
show: true,
},
type: ["text"],
form: {
order: -2,
rules: [{ required: true, message: t("certd.enterName") }],
helper: t("certd.addonNameHelper"),
},
column: {
width: 200,
},
},
isDefault: {
title: t("certd.isDefault"),
type: "dict-switch",
dict: dict({
data: [
{ label: t("certd.yes"), value: true, color: "success" },
{ label: t("certd.no"), value: false, color: "default" },
],
}),
form: {
show: computed(() => {
return getAddonTypeDefine(addonType)?.showDefault ?? false;
}),
value: false,
rules: [{ required: true, message: t("certd.selectIsDefault") }],
order: 999,
},
column: {
align: "center",
width: 100,
show: computed(() => {
return getAddonTypeDefine(addonType)?.showDefault ?? false;
}),
component: {
name: "a-switch",
vModel: "checked",
disabled: compute(({ value }) => {
return value === true;
}),
on: {
// @ts-ignore
change({ row }) {
Modal.confirm({
title: t("certd.prompt"),
content: t("certd.confirmSetDefaultNotification"),
onOk: async () => {
await api.SetDefault(row.id);
await crudExpose.doRefresh();
},
onCancel: async () => {
await crudExpose.doRefresh();
},
});
},
},
},
},
},
test: {
title: t("certd.test"),
form: {
show: compute(({ form }) => {
return !!form.type && currentDefine.value?.showTest === true;
}),
component: {
name: "api-test",
action: "TestRequest",
},
order: 990,
col: {
span: 24,
},
},
column: {
show: false,
},
},
setting: {
column: { show: false },
form: {
show: false,
valueBuilder({ value, form }) {
form.body = {};
if (!value) {
return;
}
const setting = JSON.parse(value);
for (const key in setting) {
form.body[key] = setting[key];
}
},
valueResolve({ form }) {
const setting = form.body;
form.setting = JSON.stringify(setting);
},
},
} as ColumnCompositionProps,
};
}
packages/ui/certd-client/src/views/certd/addon/crud.tsx
+55
View File
@@ -0,0 +1,55 @@
import { ref } from "vue";
import { getCommonColumnDefine } from "./common";
import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const api = context.api;
const addonType = context.addonType;
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
return await api.GetList(query);
};
const editRequest = async (req: EditReq) => {
const { form, row } = req;
form.id = row.id;
const res = await api.UpdateObj(form);
return res;
};
const delRequest = async (req: DelReq) => {
const { row } = req;
return await api.DelObj(row.id);
};
const addRequest = async (req: AddReq) => {
const { form } = req;
const res = await api.AddObj(form);
return res;
};
const typeRef = ref();
const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api, addonType);
return {
crudOptions: {
request: {
pageRequest,
addRequest,
editRequest,
delRequest,
},
form: {
labelCol: {
//固定label宽度
span: null,
style: {
width: "145px",
},
},
},
rowHandle: {
width: 200,
},
columns: {
...commonColumnsDefine,
},
},
};
}
packages/ui/certd-client/src/views/certd/addon/index.vue
+41
View File
@@ -0,0 +1,41 @@
<template>
<fs-page>
<template #header>
<div class="title">
通知管理
<span class="sub">管理通知配置</span>
</div>
</template>
<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
</fs-page>
</template>
<script lang="ts">
import { defineComponent, onActivated, onMounted } from "vue";
import { useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud";
import { createAddonApi } from "./api";
import { addonProvide } from "/@/views/certd/addon/common";
export default defineComponent({
name: "AddonManager",
setup() {
const api = createAddonApi();
addonProvide(api);
const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
// 页面打开后获取列表数据
onMounted(() => {
crudExpose.doRefresh();
});
onActivated(() => {
crudExpose.doRefresh();
});
return {
crudBinding,
crudRef,
};
},
});
</script>
packages/ui/certd-client/src/views/certd/cname/record/index.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="title">
{{ t("certd.cnameRecord") }}
<span class="sub">
<a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
<a v-comm="false" href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
{{ t("certd.cname_feature_guide") }}
</a>
</span>
packages/ui/certd-client/src/views/certd/monitor/cert/crud.tsx
+30 -5
View File
@@ -220,22 +220,47 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
sorter: true,
conditionalRender: false,
cellRender({ row }) {
const value = row.expiresTime;
if (!value) {
const {
applyTime,
effectiveTime,
expiresTime,
} = row || {};
if (!expiresTime) {
return "-";
}
const expireDate = dayjs(value).format("YYYY-MM-DD");
const leftDays = dayjs(value).diff(dayjs(), "day");
// 申请时间 ps:此处为证书在certd创建的时间而非实际证书申请时间
const applyDate = dayjs(effectiveTime ?? applyTime ?? Date.now()).format("YYYY-MM-DD");
// 失效时间
const expireDate = dayjs(expiresTime).format("YYYY-MM-DD");
// 有效天数 ps:此处证书最小设置为90d
const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
// 距离失效时间剩余天数
const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
const color = leftDays < 20 ? "red" : "#389e0d";
const percent = (leftDays / 90) * 100;
const percent = (leftDays / effectiveDays) * 100;
const textColor = leftDays < 20 ? "red" : leftDays > 60 ? "#389e0d" : "";
const format = () => {
return <span style={{ color: textColor }}>{`${leftDays}${t("certd.days")}`}</span>;
};
// console.log('cellRender', 'effectiveDays', effectiveDays, 'expiresTime', expiresTime, 'applyTime', applyTime, 'percent', percent, row)
return <a-progress title={expireDate + t("certd.expires")} percent={percent} strokeColor={color} format={format} />;
},
},
},
effectiveTime: {
title: t("certd.effectiveTime"),
search: {
show: false,
},
type: "datetime",
form: {
show: false,
},
column: {
sorter: true,
show: false,
},
},
expiresTime: {
title: t("certd.expireTime"),
search: {
packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx
+45 -6
View File
@@ -345,25 +345,64 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
align: "center",
},
},
certEffectiveTime: {
title: t("certd.monitor.certEffectiveTime"),
search: {
show: false,
},
type: "datetime",
form: {
show: false,
},
column: {
sorter: true,
width: 155,
},
},
certExpiresTime: {
title: t("certd.monitor.certExpiresTime"),
search: {
show: false,
},
type: "datetime",
form: {
show: false,
},
column: {
sorter: true,
width: 155,
},
},
remainingValidity: {
title: t("certd.monitor.remainingValidity"),
search: {
show: false,
},
type: "date",
form: {
show: false,
},
column: {
sorter: true,
cellRender({ value }) {
if (!value) {
conditionalRender: false,
cellRender({ row }) {
const {
certEffectiveTime: effectiveTime,
certExpiresTime: expiresTime,
} = row || {};
if (!expiresTime) {
return "-";
}
const expireDate = dayjs(value).format("YYYY-MM-DD");
const leftDays = dayjs(value).diff(dayjs(), "day");
// 申请时间 ps:此处为证书在certd创建的时间而非实际证书申请时间
const applyDate = dayjs(effectiveTime ?? Date.now()).format("YYYY-MM-DD");
// 失效时间
const expireDate = dayjs(expiresTime).format("YYYY-MM-DD");
// 有效天数 ps:此处证书最小设置为90d
const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
// 距离失效时间剩余天数
const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
const color = leftDays < 20 ? "red" : "#389e0d";
const percent = (leftDays / 90) * 100;
const percent = (leftDays / effectiveDays) * 100;
// console.log('cellRender', 'effectiveDays', effectiveDays, 'expiresTime', expiresTime, 'applyTime', applyTime, 'percent', percent, row)
return <a-progress title={expireDate + t("certd.monitor.expired")} percent={percent} strokeColor={color} format={(percent: number) => `${leftDays}${t("certd.monitor.days")}`} />;
},
},
packages/ui/certd-client/src/views/certd/notification/common.tsx
+2
View File
@@ -96,6 +96,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
},
},
form: {
order: -3,
component: {
disabled: false,
showSearch: true,
@@ -153,6 +154,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
},
type: ["text"],
form: {
order: -2,
rules: [{ required: true, message: t("certd.enterName") }],
helper: t("certd.helperNotificationName"),
},
packages/ui/certd-client/src/views/certd/open/openkey/index.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<template #header>
<div class="title">开放接口密钥管理</div>
<div class="more">
<a :href="OPEN_API_DOC" target="_blank">开放接口文档</a>
<a v-comm="false" :href="OPEN_API_DOC" target="_blank">开放接口文档</a>
</div>
</template>
<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx
+21 -2
View File
@@ -22,7 +22,7 @@ export function fillPipelineByDefaultForm(pipeline: any, form: any) {
if (form.notification != null) {
notifications.push({
type: "custom",
when: ["error", "turnToSuccess", "success"],
when: form.notificationWhen || ["error", "turnToSuccess"],
notificationId: form.notification,
title: form.notificationTarget?.name || "自定义通知",
});
@@ -223,6 +223,25 @@ export function useCertPipelineCreator() {
helper: t("certd.pipelineForm.notificationHelper"),
},
},
notificationWhen: {
title: t("certd.pipelineForm.notificationWhen"),
type: "text",
form: {
value: ["error", "turnToSuccess"],
component: {
name: "a-select",
vModel: "value",
mode: "multiple",
options: [
{ value: "start", label: t("certd.start_time") },
{ value: "success", label: t("certd.success_time") },
{ value: "turnToSuccess", label: t("certd.fail_to_success_time") },
{ value: "error", label: t("certd.fail_time") },
],
},
order: 102,
},
},
groupId: {
title: t("certd.pipelineForm.groupIdTitle"),
type: "dict-select",
@@ -268,7 +287,7 @@ export function useCertPipelineCreator() {
async function doSubmit({ form }: any) {
// const certDetail = readCertDetail(form.cert.crt);
// 添加certd pipeline
const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "certApplyPlugin", "groupId"]);
const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "notificationWhen", "certApplyPlugin", "groupId"]);
let pipeline: any = {
title: form.domains[0] + "证书自动化",
runnableType: "pipeline",
packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+31 -5
View File
@@ -366,23 +366,49 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
},
column: {
cellRender({ row }) {
const value = row.lastVars?.certExpiresTime;
if (!value) {
const {
certEffectiveTime: effectiveTime,
certExpiresTime: expiresTime,
} = row?.lastVars || {};
if (!expiresTime) {
return "-";
}
const expireDate = dayjs(value).format("YYYY-MM-DD");
const leftDays = dayjs(value).diff(dayjs(), "day");
// 申请时间 ps:此处为证书在certd创建的时间而非实际证书申请时间
const applyDate = dayjs(effectiveTime ?? Date.now()).format("YYYY-MM-DD");
// 失效时间
const expireDate = dayjs(expiresTime).format("YYYY-MM-DD");
// 有效天数 ps:此处证书最小设置为90d
const effectiveDays = Math.max(90, dayjs(expiresTime).diff(applyDate, "day"));
// 距离失效时间剩余天数
const leftDays = dayjs(expiresTime).diff(dayjs(), "day");
const color = leftDays < 20 ? "red" : "#389e0d";
const percent = (leftDays / 90) * 100;
const percent = (leftDays / effectiveDays) * 100;
const textColor = leftDays < 20 ? "red" : leftDays > 60 ? "#389e0d" : "";
const format = () => {
return <span style={{ color: textColor }}>{`${leftDays}${t("certd.days")}`}</span>;
};
// console.log('cellRender', 'effectiveDays', effectiveDays, 'expiresTime', expiresTime, 'applyTime', applyTime, 'percent', percent, row)
return <a-progress title={expireDate + t("certd.expires")} percent={percent} strokeColor={color} format={format} />;
},
width: 150,
},
},
"lastVars.certEffectiveTime": {
title: t("certd.fields.effectiveTime"),
search: {
show: false,
},
type: "datetime",
form: {
show: false,
},
column: {
sorter: false,
show: false,
width: 150,
align: "center",
},
},
"lastVars.certExpiresTime": {
title: t("certd.fields.expiryTime"),
search: {
packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
+2
View File
@@ -313,6 +313,8 @@ function useStepForm() {
};
const stepDelete = () => {
//检查输出依赖
Modal.confirm({
title: "确认",
content: `确定要删除此步骤吗？`,
packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue
+24 -6
View File
@@ -279,7 +279,7 @@
</fs-page>
</template>
<script lang="ts">
<script lang="tsx">
import { computed, defineComponent, onMounted, onUnmounted, provide, ref, Ref, watch } from "vue";
import { useRouter } from "vue-router";
import PiTaskForm from "./component/task-form/index.vue";
@@ -758,9 +758,12 @@ export default defineComponent({
//检查输出的stepid是否存在
let hasError = false;
let errorMessage = "";
let errorMessages: any = [];
let errorIndex = 1;
eachSteps(pp, (step: any, task: any, stage: any) => {
stepIds.push(step.id);
if (step.disabled !== true) {
stepIds.push(step.id);
}
if (step.input) {
for (const key in step.input) {
const value = step.input[key];
@@ -775,21 +778,36 @@ export default defineComponent({
const paramName = arr[2];
if (!stepIds.includes(stepId)) {
hasError = true;
const message = `任务${step.title}的前置输出步骤${paramName}不存在，请重新修改此任务`;
const message = `${step.title}的前置输出步骤${paramName}不存在或已被禁用`;
errorIndex++;
addValidateError(task.id, {
message,
});
addValidateError(step.id, {
message,
});
errorMessage += message + "；";
errorMessages.push(message);
}
}
}
});
if (hasError) {
notification.error({ message: errorMessage });
notification.error({
message: () => {
const nodes = [];
let i = 0;
for (const error of errorMessages) {
i++;
nodes.push(
<div>
{i}.{error}
</div>
);
}
return nodes;
},
});
throw new Error(errorMessage);
}
}
packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue
+8 -4
View File
@@ -4,10 +4,14 @@
<div class="title">
{{ t("certd.subdomainHosting") }}
<span class="sub">
{{ t("certd.subdomainHostingHint") }}； {{ t("certd.subdomainHelpText") }}
<a href="https://certd.docmirror.cn/guide/use/cert/subdomain.html" target="_blank">
{{ t("certd.subdomainManagement") }}
</a>
{{ t("certd.subdomainHostingHint") }}；
<span v-comm="false">
{{ t("certd.subdomainHelpText") }}
<a href="https://certd.docmirror.cn/guide/use/cert/subdomain.html" target="_blank">
{{ t("certd.subdomainManagement") }}
</a>
</span>
</span>
</div>
</template>
packages/ui/certd-client/src/views/certd/suite/mine/api.ts
+2
View File
@@ -9,6 +9,8 @@ export type SuiteValue = {
export type SuiteDetail = {
enabled?: boolean;
suites?: any[];
suiteList?: any[];
addonList?: any[];
expiresTime?: number;
pipelineCount?: SuiteValue;
domainCount?: SuiteValue;
packages/ui/certd-client/src/views/certd/suite/order-modal.vue
+2 -1
View File
@@ -1,5 +1,5 @@
<template>
<a-modal v-model:open="openRef" class="order-modal" :title="$t('certd.order.confirmTitle')" @ok="orderCreate">
<a-modal v-model:open="openRef" class="order-modal" :title="$t('certd.order.confirmTitle')" :width="670" @ok="orderCreate">
<div v-if="product" class="order-box">
<div class="flex-o mt-5">
<span class="label">{{ $t("certd.order.package") }}：</span>{{ product.title }}
@@ -13,6 +13,7 @@
<span class="flex-o"> {{ $t("certd.order.pipeline") }}<suite-value class="ml-5" :model-value="product.content.maxPipelineCount" :unit="$t('certd.order.unit.pieces')" />； </span>
<span class="flex-o"> {{ $t("certd.order.domain") }}<suite-value class="ml-5" :model-value="product.content.maxDomainCount" :unit="$t('certd.order.unit.count')" />； </span>
<span class="flex-o"> {{ $t("certd.order.deployTimes") }}<suite-value class="ml-5" :model-value="product.content.maxDeployCount" :unit="$t('certd.order.unit.times')" />； </span>
<span class="flex-o"> {{ $t("certd.order.monitorCount") }}<suite-value class="ml-5" :model-value="product.content.maxMonitorCount" :unit="$t('certd.order.unit.times')" />； </span>
</span>
</div>
packages/ui/certd-client/src/views/framework/forgot-password/index.vue
+20 -32
View File
@@ -11,7 +11,7 @@
@finish="handleFinish"
@finish-failed="handleFinishFailed"
>
<a-tabs v-model:active-key="forgotPasswordType" :destroyInactiveTabPane="true">
<a-tabs v-model:active-key="forgotPasswordType" :destroy-inactive-tab-pane="true">
<a-tab-pane key="email" tab="邮箱找回">
<a-form-item has-feedback name="input" label="邮箱">
<a-input v-model:value="formState.input" placeholder="邮箱" size="large" autocomplete="off">
@@ -20,14 +20,11 @@
</template>
</a-input>
</a-form-item>
<a-form-item has-feedback name="captchaForEmail" label="验证码">
<CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
</a-form-item>
<a-form-item has-feedback name="validateCode" label="邮件验证码">
<email-code
v-model:value="formState.validateCode"
:img-code="formState.imgCode"
:email="formState.input"
:random-str="formState.randomStr"
verification-type="forgotPassword"
/>
<email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.input" :random-str="formState.randomStr" verification-type="forgotPassword" />
</a-form-item>
</a-tab-pane>
<a-tab-pane key="mobile" tab="手机号找回">
@@ -38,23 +35,15 @@
</template>
</a-input>
</a-form-item>
<a-form-item has-feedback name="captchaForSms" label="验证码">
<CaptchaInput v-model:model-value="formState.captchaForSms"></CaptchaInput>
</a-form-item>
<a-form-item name="validateCode" label="手机验证码">
<sms-code
v-model:value="formState.validateCode"
:img-code="formState.imgCode"
:mobile="formState.input"
:phone-code="formState.phoneCode"
:random-str="formState.randomStr"
verification-type="forgotPassword"
/>
<sms-code v-model:value="formState.validateCode" :captcha="formState.captchaForSms" :mobile="formState.input" :phone-code="formState.phoneCode" verification-type="forgotPassword" />
</a-form-item>
</a-tab-pane>
</a-tabs>
<a-form-item has-feedback name="imgCode" label="图片验证码">
<image-code ref="imageCodeRef" v-model:value="formState.imgCode" v-model:random-str="formState.randomStr"></image-code>
</a-form-item>
<a-form-item has-feedback name="password" label="新密码">
<a-input-password v-model:value="formState.password" placeholder="新密码" size="large" autocomplete="off">
<template #prefix>
@@ -72,8 +61,10 @@
<a-form-item>
<a-button type="primary" size="large" html-type="submit" class="submit-button"> 找回密码</a-button>
<div class="mt-2">
<a href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a>
<div class="mt-2 flex-between">
<a v-comm="false" href="https://certd.docmirror.cn/guide/use/forgotpasswd/" target="_blank"> 管理员无绑定通信方式或MFA丢失找回 </a>
<router-link :to="{ name: 'login' }"> 返回登录 </router-link>
</div>
</a-form-item>
</a-form>
@@ -82,12 +73,12 @@
<script setup lang="ts">
import { onMounted, reactive, ref, toRaw, watch } from "vue";
import ImageCode from "/@/views/framework/login/image-code.vue";
import EmailCode from "/@/views/framework/register/email-code.vue";
import SmsCode from "/@/views/framework/login/sms-code.vue";
import { utils } from "@fast-crud/fast-crud";
import { useUserStore } from "/@/store/user";
import { useSettingStore } from "/@/store/settings";
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
defineOptions({
name: "ForgotPasswordPage",
});
@@ -95,7 +86,8 @@ defineOptions({
const rules = {
input: [{ required: true }],
validateCode: [{ required: true }],
imgCode: [{ required: true }, { min: 4, max: 4, message: "请输入4位图片验证码" }],
captchaForEmail: [{ required: true }],
captchaForSms: [{ required: true }],
password: [
{ required: true, trigger: "change", message: "请输入密码" },
{ min: 6, message: "至少输入6位密码" },
@@ -123,16 +115,15 @@ const layout = {
const forgotPasswordType = ref();
const userStore = useUserStore();
const settingStore = useSettingStore();
const formRef = ref();
const imageCodeRef = ref();
const formState: any = reactive({
input: "",
randomStr: "",
imgCode: "",
captchaForSms: null,
captchaForEmail: null,
phoneCode: "86",
validateCode: "",
password: "",
confirmPassword: "",
});
@@ -146,7 +137,6 @@ onMounted(() => {
watch(forgotPasswordType, () => {
formState.input = "";
formState.validateCode = "";
imageCodeRef.value.resetImageCode();
formRef.value.clearValidate(Object.keys(formState).filter(key => !["password", "confirmPassword"].includes(key)));
});
@@ -155,8 +145,6 @@ const handleFinish = async (values: any) => {
toRaw({
type: forgotPasswordType.value,
input: formState.input,
randomStr: formState.randomStr,
imgCode: formState.imgCode,
validateCode: formState.validateCode,
password: formState.password,
confirmPassword: formState.confirmPassword,
packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue
+16 -2
View File
@@ -3,7 +3,16 @@
<div class="flex-o flex-wrap">
<a-popover>
<template #content>
<div>
<div style="width: 300px">
<div v-if="detail.addonList.length > 0" class="flex flex-wrap">
<a-tag v-for="(item, index) of detail.addonList" :key="index" color="green" class="pointer flex-o m-1">
<span class="mr-5">
{{ item.title }}
</span>
<span>(<expires-time-text :value="item.expiresTime" />)</span>
</a-tag>
<a-divider class="m-5" />
</div>
<div class="flex-between mt-5">
<div class="flex-o"><fs-icon icon="ant-design:check-outlined" class="color-green mr-5" /> 流水线条数：</div>
<suite-value :model-value="detail.pipelineCount.max" :used="detail.pipelineCount.used" unit="条" />
@@ -30,12 +39,13 @@
</template>
<div class="flex-o">
<fs-icon icon="ant-design:gift-outlined" class="color-green mr-5" />
<a-tag v-for="(item, index) of detail.suites" :key="index" color="green" class="pointer flex-o">
<a-tag v-for="(item, index) of detail.suiteList" :key="index" color="green" class="pointer flex-o">
<span class="mr-5">
{{ item.title }}
</span>
<span>(<expires-time-text :value="item.expiresTime" />)</span>
</a-tag>
<a-tag v-if="detail.addonList.length > 0" color="green" class="pointer flex-o">加量包+{{ detail.addonList.length }}</a-tag>
<div v-if="detail.suites?.length === 0" class="flex-o ml-5">暂无套餐 <a-button class="ml-5" type="primary" size="small" @click="goBuy">去购买</a-button></div>
</div>
</a-popover>
@@ -59,6 +69,10 @@ const detail = ref<SuiteDetail>({});
async function loadSuiteDetail() {
detail.value = await mySuiteApi.SuiteDetailGet();
const suites = detail.value.suites.filter(item => item.productType === "suite");
const addons = detail.value.suites.filter(item => item.productType === "addon");
detail.value.suiteList = suites;
detail.value.addonList = addons;
}
loadSuiteDetail();
packages/ui/certd-client/src/views/framework/login/image-code.vue
-41
View File
@@ -1,41 +0,0 @@
<template>
<div class="flex">
<a-input :value="value" placeholder="请输入图片验证码" autocomplete="off" @update:value="onChange">
<template #prefix>
<fs-icon icon="ion:image-outline"></fs-icon>
</template>
</a-input>
<div class="input-right pointer" title="点击刷新">
<img class="image-code" :src="imageCodeUrl" @click="resetImageCode" />
</div>
</div>
</template>
<script setup lang="ts">
import { ref, useAttrs, defineExpose } from "vue";
import { nanoid } from "nanoid";
const props = defineProps<{
randomStr?: string;
value?: string;
}>();
const emit = defineEmits(["update:value", "update:randomStr", "change"]);
function onChange(value: string) {
emit("update:value", value);
emit("change", value);
}
const imageCodeUrl = ref();
function resetImageCode() {
const randomStr = nanoid(10);
let url = "api/basic/code/captcha";
imageCodeUrl.value = url + "?randomStr=" + randomStr;
emit("update:randomStr", randomStr);
}
defineExpose({
resetImageCode,
})
resetImageCode();
</script>
packages/ui/certd-client/src/views/framework/login/index.vue
+38 -8
View File
@@ -20,6 +20,10 @@
</template>
</a-input-password>
</a-form-item>
<a-form-item v-if="settingStore.sysPublic.captchaEnabled" has-feedback required name="captcha" :rules="rules.captcha">
<CaptchaInput v-model:model-value="formState.captcha"></CaptchaInput>
</a-form-item>
</template>
</a-tab-pane>
<a-tab-pane v-if="sysPublicSettings.smsLoginEnabled === true" key="sms" :tab="t('authentication.smsTab')">
@@ -32,12 +36,12 @@
</a-input>
</a-form-item>
<a-form-item has-feedback name="imgCode">
<image-code v-model:value="formState.imgCode" v-model:random-str="formState.randomStr"></image-code>
<a-form-item has-feedback name="smsCaptcha">
<CaptchaInput v-model:model-value="formState.smsCaptcha"></CaptchaInput>
</a-form-item>
<a-form-item name="smsCode" :rules="rules.smsCode">
<sms-code v-model:value="formState.smsCode" :img-code="formState.imgCode" :mobile="formState.mobile" :phone-code="formState.phoneCode" :random-str="formState.randomStr" />
<sms-code v-model:value="formState.smsCode" :captcha="formState.smsCaptcha" :mobile="formState.mobile" :phone-code="formState.phoneCode" />
</a-form-item>
</template>
</a-tab-pane>
@@ -87,14 +91,13 @@ import { defineComponent, nextTick, reactive, ref, toRaw } from "vue";
import { useUserStore } from "/src/store/user";
import { useSettingStore } from "/@/store/settings";
import { utils } from "@fast-crud/fast-crud";
import ImageCode from "/@/views/framework/login/image-code.vue";
import SmsCode from "/@/views/framework/login/sms-code.vue";
import { useI18n } from "/@/locales";
import { LanguageToggle } from "/@/vben/layouts";
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
export default defineComponent({
name: "LoginPage",
components: { LanguageToggle, SmsCode, ImageCode },
components: { LanguageToggle, SmsCode, CaptchaInput },
setup() {
const { t } = useI18n();
const verifyCodeInputRef = ref();
@@ -108,9 +111,9 @@ export default defineComponent({
mobile: "",
password: "",
loginType: "password", //password
imgCode: "",
smsCode: "",
randomStr: "",
captcha: null,
smsCaptcha: null,
});
const rules = {
@@ -138,6 +141,12 @@ export default defineComponent({
message: "请输入短信验证码",
},
],
captcha: [
{
required: true,
message: "请进行验证码验证",
},
],
};
const layout = {
labelCol: {
@@ -160,6 +169,10 @@ export default defineComponent({
const handleFinish = async (values: any) => {
loading.value = true;
try {
// formState.captcha = await doCaptchaValidate();
// if (!formState.captcha) {
// return;
// }
const loginType = formState.loginType;
await userStore.login(loginType, toRaw(formState));
} catch (e: any) {
@@ -194,6 +207,21 @@ export default defineComponent({
return sysPublicSettings.registerEnabled && (sysPublicSettings.usernameRegisterEnabled || sysPublicSettings.emailRegisterEnabled);
}
const captchaInputRef = ref();
const captchaInputForSmsCode = ref();
async function doCaptchaValidate() {
if (!sysPublicSettings.captchaEnabled) {
return {};
}
const res = await captchaInputRef.value.getValidatedForm();
if (!res) {
return false;
}
return {
...res,
};
}
return {
t,
loading,
@@ -211,6 +239,8 @@ export default defineComponent({
handleTwoFactorSubmit,
verifyCodeInputRef,
settingStore,
captchaInputRef,
captchaInputForSmsCode,
};
},
});
packages/ui/certd-client/src/views/framework/login/sms-code.vue
+5 -7
View File
@@ -5,7 +5,7 @@
<fs-icon icon="ion:mail-outline"></fs-icon>
</template>
</a-input>
<div class="input-right">
<div class="input-right ml-5">
<a-button class="getCaptcha" type="primary" tabindex="-1" :disabled="smsSendBtnDisabled" @click="sendSmsCode">
{{ smsTime <= 0 ? "发送" : smsTime + " s" }}
</a-button>
@@ -21,8 +21,7 @@ const props = defineProps<{
value?: string;
mobile?: string;
phoneCode?: string;
imgCode?: string;
randomStr?: string;
captcha?: any;
verificationType?: string;
}>();
const emit = defineEmits(["update:value", "change"]);
@@ -48,8 +47,8 @@ async function sendSmsCode() {
notification.error({ message: "请输入手机号" });
return;
}
if (!props.imgCode) {
notification.error({ message: "请输入图片验证码" });
if (!props.captcha) {
notification.error({ message: "请输入验证码" });
return;
}
loading.value = true;
@@ -57,8 +56,7 @@ async function sendSmsCode() {
await api.sendSmsCode({
phoneCode: props.phoneCode,
mobile: props.mobile,
imgCode: props.imgCode,
randomStr: props.randomStr,
captcha: props.captcha,
verificationType: props.verificationType,
});
} finally {
packages/ui/certd-client/src/views/framework/register/email-code.vue
+5 -7
View File
@@ -5,7 +5,7 @@
<fs-icon icon="ion:mail-outline"></fs-icon>
</template>
</a-input>
<div class="input-right">
<div class="input-right ml-5">
<a-button class="getCaptcha" type="primary" tabindex="-1" :disabled="smsSendBtnDisabled" @click="sendSmsCode">
{{ smsTime <= 0 ? "发送" : smsTime + " s" }}
</a-button>
@@ -20,8 +20,7 @@ import * as api from "/@/store/settings/api.basic";
const props = defineProps<{
value?: string;
email?: string;
imgCode?: string;
randomStr?: string;
captcha?: any;
verificationType?: string;
}>();
const emit = defineEmits(["update:value", "change"]);
@@ -44,16 +43,15 @@ async function sendSmsCode() {
notification.error({ message: "请输入邮箱" });
return;
}
if (!props.imgCode) {
notification.error({ message: "请输入图片验证码" });
if (!props.captcha) {
notification.error({ message: "请输入验证码" });
return;
}
loading.value = true;
try {
await api.sendEmailCode({
email: props.email,
imgCode: props.imgCode,
randomStr: props.randomStr,
captcha: props.captcha,
verificationType: props.verificationType,
});
} finally {
packages/ui/certd-client/src/views/framework/register/index.vue
+9 -30
View File
@@ -25,8 +25,8 @@
</template>
</a-input-password>
</a-form-item>
<a-form-item has-feedback name="imgCode" label="图片验证码" :rules="rules.imgCode">
<image-code v-model:value="formState.imgCode" v-model:random-str="formState.randomStr"></image-code>
<a-form-item has-feedback name="captcha" label="验证码" :rules="rules.captcha">
<CaptchaInput v-model:model-value="formState.captcha"></CaptchaInput>
</a-form-item>
</template>
</a-tab-pane>
@@ -61,12 +61,12 @@
</a-input-password>
</a-form-item>
<a-form-item has-feedback name="imgCode" label="图片验证码" :rules="rules.imgCode">
<image-code v-model:value="formState.imgCode" v-model:random-str="formState.randomStr"></image-code>
<a-form-item has-feedback name="imgCode" label="验证码" :rules="rules.imgCode">
<CaptchaInput v-model:model-value="formState.captchaForEmail"></CaptchaInput>
</a-form-item>
<a-form-item has-feedback name="validateCode" :rules="rules.validateCode" label="邮件验证码">
<email-code v-model:value="formState.validateCode" :img-code="formState.imgCode" :email="formState.email" :random-str="formState.randomStr" />
<email-code v-model:value="formState.validateCode" :captcha="formState.captchaForEmail" :email="formState.email" />
</a-form-item>
</template>
</a-tab-pane>
@@ -86,13 +86,13 @@
import { defineComponent, reactive, ref, toRaw } from "vue";
import { useUserStore } from "/src/store/user";
import { utils } from "@fast-crud/fast-crud";
import ImageCode from "/@/views/framework/login/image-code.vue";
import EmailCode from "./email-code.vue";
import { useSettingStore } from "/@/store/settings";
import { notification } from "ant-design-vue";
import CaptchaInput from "/@/components/captcha/captcha-input.vue";
export default defineComponent({
name: "RegisterPage",
components: { EmailCode, ImageCode },
components: { CaptchaInput, EmailCode },
setup() {
const settingsStore = useSettingStore();
const registerType = ref("email");
@@ -114,7 +114,7 @@ export default defineComponent({
username: "",
password: "",
confirmPassword: "",
randomStr: "",
captcha: null,
});
const rules = {
@@ -159,17 +159,6 @@ export default defineComponent({
},
],
imgCode: [
{
required: true,
message: "请输入图片验证码",
},
{
min: 4,
max: 4,
message: "请输入4位图片验证码",
},
],
smsCode: [
{
required: true,
@@ -198,9 +187,8 @@ export default defineComponent({
type: registerType.value,
password: formState.password,
username: formState.username,
imgCode: formState.imgCode,
randomStr: formState.randomStr,
email: formState.email,
captcha: formState.captcha,
validateCode: formState.validateCode,
}) as any
);
@@ -214,16 +202,7 @@ export default defineComponent({
formRef.value.resetFields();
};
const imageCodeUrl = ref();
function resetImageCode() {
let url = "/basic/code";
imageCodeUrl.value = url + "?t=" + new Date().getTime();
}
resetImageCode();
return {
resetImageCode,
imageCodeUrl,
formState,
formRef,
rules,
packages/ui/certd-client/src/views/sys/plugin/edit.vue
+3 -2
View File
@@ -25,7 +25,7 @@
<a-tab-pane key="editor" tab="元数据"> </a-tab-pane>
</a-tabs>
<div class="metadata-body">
<code-editor id="metadata" v-model:model-value="plugin.metadata" language="yaml" @save="doSave"></code-editor>
<code-editor :id="`metadata_${idRef}`" v-model:model-value="plugin.metadata" language="yaml" @save="doSave"></code-editor>
</div>
</div>
<div class="script">
@@ -33,7 +33,7 @@
<a-tab-pane key="script" tab="脚本"> </a-tab-pane>
</a-tabs>
<div class="script-body">
<code-editor id="content" v-model:model-value="plugin.content" language="javascript" @save="doSave"></code-editor>
<code-editor :id="`content_${idRef}`" v-model:model-value="plugin.content" language="javascript" @save="doSave"></code-editor>
</div>
</div>
</div>
@@ -83,6 +83,7 @@ function initFormOptions() {
}
initFormOptions();
const idRef = ref(route.query.id);
async function getPlugin() {
const id = route.query.id;
const pluginObj = await api.GetObj(id);
packages/ui/certd-client/src/views/sys/plugin/use-import.ts
+5 -3
View File
@@ -1,12 +1,14 @@
import * as api from "/@/views/sys/plugin/api";
import { useFormWrapper } from "@fast-crud/fast-crud";
import { dict, useFormWrapper } from "@fast-crud/fast-crud";
import { useI18n } from "/@/locales";
import { Modal, notification } from "ant-design-vue";
import { notification } from "ant-design-vue";
export function usePluginImport() {
const { openCrudFormDialog } = useFormWrapper();
const { t } = useI18n();
async function openImportDialog({ crudExpose }) {
async function openImportDialog(opts: any) {
const { crudExpose } = opts;
function createCrudOptions() {
return {
crudOptions: {
packages/ui/certd-client/src/views/sys/settings/index.vue
+7 -5
View File
@@ -5,17 +5,17 @@
<!-- </template>-->
<div class="sys-settings-body md:p-5">
<a-tabs :active-key="activeKey" type="card" class="sys-settings-tabs" @update:active-key="onChange">
<a-tab-pane key="base" tab="基本设置">
<a-tab-pane key="base" :tab="t('certd.sys.setting.baseSetting')">
<SettingBase v-if="activeKey === 'base'" />
</a-tab-pane>
<a-tab-pane key="register" tab="注册设置">
<a-tab-pane key="register" :tab="t('certd.sys.setting.registerSetting')">
<SettingRegister v-if="activeKey === 'register'" />
</a-tab-pane>
<a-tab-pane v-if="settingsStore.isComm" key="payment" tab="支付设置">
<a-tab-pane v-if="settingsStore.isComm" key="payment" :tab="t('certd.sys.setting.paymentSetting')">
<SettingPayment v-if="activeKey === 'payment'" />
</a-tab-pane>
<a-tab-pane key="save" tab="安全设置">
<SettingSafe v-if="activeKey === 'save'" />
<a-tab-pane key="safe" :tab="t('certd.sys.setting.safeSetting')">
<SettingSafe v-if="activeKey === 'safe'" />
</a-tab-pane>
</a-tabs>
</div>
@@ -30,9 +30,11 @@ import SettingSafe from "/@/views/sys/settings/tabs/safe.vue";
import { useRoute, useRouter } from "vue-router";
import { ref } from "vue";
import { useSettingStore } from "/@/store/settings";
import { useI18n } from "/@/locales";
defineOptions({
name: "SysSettings",
});
const { t } = useI18n();
const settingsStore = useSettingStore();
const activeKey = ref("base");
const route = useRoute();
packages/ui/certd-client/src/views/sys/settings/tabs/base.vue
+17 -1
View File
@@ -47,6 +47,18 @@
<div class="helper" v-html="t('certd.commonCnameHelper')"></div>
</a-form-item>
<a-form-item :label="t('certd.sys.setting.captchaEnabled')" :name="['public', 'captchaEnabled']">
<a-switch v-model:checked="formState.public.captchaEnabled" />
<div class="helper" v-html="t('certd.sys.setting.captchaHelper')"></div>
</a-form-item>
<a-form-item :label="t('certd.sys.setting.captchaType')" :name="['public', 'captchaAddonId']">
<addon-selector v-model:model-value="formState.public.captchaAddonId" addon-type="captcha" from="sys" @selected-change="onAddonChanged" />
</a-form-item>
<a-form-item :name="['public', 'captchaType']" class="hidden">
<a-input v-model:model-value="formState.public.captchaType"></a-input>
</a-form-item>
<a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
<a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
</a-form-item>
@@ -63,7 +75,7 @@ import { useSettingStore } from "/@/store/settings";
import { notification } from "ant-design-vue";
import { util } from "/@/utils";
import { useI18n } from "/src/locales";
import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
const { t } = useI18n();
defineOptions({
@@ -115,6 +127,10 @@ async function stopOtherUserTimer() {
});
}
function onAddonChanged(target: any) {
formState.public.captchaType = target.type;
}
const testProxyLoading = ref(false);
async function testProxy() {
testProxyLoading.value = true;