github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: 小修改

pull/453/head
xiaojunnuo 2025-06-29 00:25:08 +08:00
parent acaa8b1731
commit a761989f3e
8 changed files with 205 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/ui/certd-client/src/components/plugins/common/remote-select.vue
View File

@ -189,6 +189,7 @@ watch(
const input = pluginType === "plugin" ? form.input : form; const input = pluginType === "plugin" ? form.input : form;
const watches = {}; const watches = {};
for (const key of props.watches) { for (const key of props.watches) {
//@ts-ignore
watches[key] = input[key]; watches[key] = input[key];
} }
return { return {
@ -198,10 +199,11 @@ watch(
}, },
async (value, oldValue) => { async (value, oldValue) => {
const { form } = value; const { form } = value;
const oldForm = oldValue.form; const oldForm = oldValue?.form;
let changed = oldForm == null || optionsRef.value.length == 0; let changed = oldForm == null || optionsRef.value.length == 0;
for (const key of props.watches) { for (const key of props.watches) {
if (form[key] != oldForm[key]) { //@ts-ignore
if (oldForm && form[key] != oldForm[key]) {
changed = true; changed = true;
break; break;
} }

2
packages/ui/certd-client/src/locales/i18n.ts
View File

@ -89,7 +89,7 @@ function loadLocalesMapFromDir(regexp: RegExp, modules: Record<string, () => Pro
* @param locale * @param locale
*/ */
function setI18nLanguage(locale: Locale) { function setI18nLanguage(locale: Locale) {
// setAntdvLocale(locale); setAntdvLocale(locale);
//@ts-ignore //@ts-ignore
i18n.global.locale.value = locale; i18n.global.locale.value = locale;

264
packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx
View File

@ -5,140 +5,140 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, Edi
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const { t } = useI18n(); const { t } = useI18n();
const { crudBinding } = crudExpose; const { crudBinding } = crudExpose;
const { props, ctx, api } = context; const { props, ctx, api } = context;
const lastResRef = ref(); const lastResRef = ref();
const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => { const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
return await context.api.GetList(query); return await context.api.GetList(query);
}; };
const editRequest = async (req: EditReq) => { const editRequest = async (req: EditReq) => {
const { form, row } = req; const { form, row } = req;
form.id = row.id; form.id = row.id;
form.type = props.type; form.type = props.type;
const res = await context.api.UpdateObj(form); const res = await context.api.UpdateObj(form);
lastResRef.value = res; lastResRef.value = res;
return res; return res;
}; };
const delRequest = async (req: DelReq) => { const delRequest = async (req: DelReq) => {
const { row } = req; const { row } = req;
return await context.api.DelObj(row.id); return await context.api.DelObj(row.id);
}; };
const addRequest = async (req: AddReq) => { const addRequest = async (req: AddReq) => {
const { form } = req; const { form } = req;
form.type = props.type; form.type = props.type;
const res = await context.api.AddObj(form); const res = await context.api.AddObj(form);
lastResRef.value = res; lastResRef.value = res;
return res; return res;
}; };
const selectedRowKey = ref([props.modelValue]); const selectedRowKey = ref([props.modelValue]);
const onSelectChange = (changed: any) => { const onSelectChange = (changed: any) => {
selectedRowKey.value = changed; selectedRowKey.value = changed;
ctx.emit("update:modelValue", changed[0]); ctx.emit("update:modelValue", changed[0]);
}; };
const typeRef = ref("aliyun"); const typeRef = ref("aliyun");
context.typeRef = typeRef; context.typeRef = typeRef;
const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api); const commonColumnsDefine = getCommonColumnDefine(crudExpose, typeRef, api);
commonColumnsDefine.type.form.component.disabled = true; commonColumnsDefine.type.form.component.disabled = true;
return { return {
typeRef, typeRef,
crudOptions: { crudOptions: {
request: { request: {
pageRequest, pageRequest,
addRequest, addRequest,
editRequest, editRequest,
delRequest, delRequest,
}, },
toolbar: { toolbar: {
show: false, show: false,
}, },
search: { search: {
show: false, show: false,
}, },
form: { form: {
wrapper: { wrapper: {
width: "1050px", width: "1050px",
}, },
}, },
rowHandle: { rowHandle: {
width: 200, width: 200,
}, },
table: { table: {
scroll: { scroll: {
x: 800, x: 800,
}, },
rowSelection: { rowSelection: {
type: "radio", type: "radio",
selectedRowKeys: selectedRowKey, selectedRowKeys: selectedRowKey,
onChange: onSelectChange, onChange: onSelectChange,
}, },
customRow: (record: any) => { customRow: (record: any) => {
return { return {
onClick: () => { onClick: () => {
onSelectChange([record.id]); onSelectChange([record.id]);
}, // 点击行 }, // 点击行
}; };
}, },
}, },
columns: { columns: {
id: { id: {
title: "ID", title: "ID",
key: "id", key: "id",
type: "number", type: "number",
column: { column: {
width: 50, width: 50,
}, },
form: { form: {
show: false, show: false,
}, },
}, },
name: { name: {
title: t("certd.name"), title: t("certd.name"),
search: { search: {
show: true, show: true,
}, },
type: ["text"], type: ["text"],
form: { form: {
rules: [{ required: true, message: t("certd.pleaseEnterName") }], rules: [{ required: true, message: t("certd.pleaseEnterName") }],
helper: t("certd.nameHelper"), helper: t("certd.nameHelper"),
}, },
column: { column: {
width: 200, width: 200,
}, },
}, },
from: { from: {
title: t("certd.level"), title: t("certd.level"),
type: "dict-select", type: "dict-select",
dict: dict({ dict: dict({
data: [ data: [
{ label: t("certd.system"), value: "sys" }, { label: t("certd.system"), value: "sys" },
{ label: t("certd.usera"), value: "user" }, { label: t("certd.usera"), value: "user" },
], ],
}), }),
search: { search: {
show: false, show: false,
}, },
form: { form: {
show: false, show: false,
}, },
column: { column: {
width: 100, width: 100,
align: "center", align: "center",
component: { component: {
color: "auto", color: "auto",
}, },
order: 10, order: 10,
}, },
valueBuilder: ({ row, key, value }) => { valueBuilder: ({ row, key, value }) => {
row[key] = row.userId > 0 ? "user" : "sys"; row[key] = row.userId > 0 ? "user" : "sys";
}, },
}, },
...commonColumnsDefine, ...commonColumnsDefine,
}, },
}, },
}; };
} }

12
packages/ui/certd-client/src/views/certd/access/access-selector/access/index.vue
View File

@ -15,13 +15,13 @@ export default defineComponent({
props: { props: {
type: { type: {
type: String, type: String,
default: "aliyun" default: "aliyun",
}, },
from: { from: {
type: String, //user | sys type: String, //user | sys
default: "user" default: "user",
}, },
modelValue: {} modelValue: {},
}, },
emits: ["update:modelValue"], emits: ["update:modelValue"],
setup(props, ctx) { setup(props, ctx) {
@ -39,7 +39,7 @@ export default defineComponent({
() => { () => {
return props.type; return props.type;
}, },
(value) => { value => {
console.log("access type changed:", value); console.log("access type changed:", value);
onTypeChanged(value); onTypeChanged(value);
} }
@ -51,9 +51,9 @@ export default defineComponent({
return { return {
crudBinding, crudBinding,
crudRef crudRef,
}; };
} },
}); });
</script> </script>
<style lang="less"> <style lang="less">

2
packages/ui/certd-client/src/views/certd/access/access-selector/access/secret-plain-getter.vue
View File

@ -6,7 +6,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, inject, ref } from "vue"; import { computed, inject, ref } from "vue";
defineOptions({ defineOptions({
name: "SecretPlainGetter" name: "SecretPlainGetter",
}); });
const props = defineProps<{ const props = defineProps<{

28
packages/ui/certd-client/src/views/certd/access/access-selector/index.vue
View File

@ -28,28 +28,28 @@ export default defineComponent({
props: { props: {
modelValue: { modelValue: {
type: [Number, String], type: [Number, String],
default: null default: null,
}, },
type: { type: {
type: String, type: String,
default: "aliyun" default: "aliyun",
}, },
placeholder: { placeholder: {
type: String, type: String,
default: "请选择" default: "请选择",
}, },
size: { size: {
type: String, type: String,
default: "middle" default: "middle",
}, },
from: { from: {
type: String, //user | sys type: String, //user | sys
default: "user" default: "user",
}, },
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
emits: ["update:modelValue", "change", "selectedChange"], emits: ["update:modelValue", "change", "selectedChange"],
setup(props, ctx) { setup(props, ctx) {
@ -92,7 +92,7 @@ export default defineComponent({
() => { () => {
return props.modelValue; return props.modelValue;
}, },
async (value) => { async value => {
selectedId.value = null; selectedId.value = null;
target.value = null; target.value = null;
if (value == null) { if (value == null) {
@ -101,7 +101,7 @@ export default defineComponent({
await refreshTarget(value); await refreshTarget(value);
}, },
{ {
immediate: true immediate: true,
} }
); );
@ -114,11 +114,11 @@ export default defineComponent({
() => { () => {
return props.type; return props.type;
}, },
async (value) => { async value => {
await refreshProviderDefine(value); await refreshProviderDefine(value);
}, },
{ {
immediate: true immediate: true,
} }
); );
@ -134,7 +134,7 @@ export default defineComponent({
console.log("choose ok:", selectedId.value); console.log("choose ok:", selectedId.value);
emitValue(selectedId.value); emitValue(selectedId.value);
chooseForm.show = false; chooseForm.show = false;
} },
}); });
return { return {
@ -142,9 +142,9 @@ export default defineComponent({
target, target,
selectedId, selectedId,
providerDefine, providerDefine,
chooseForm chooseForm,
}; };
} },
}); });
</script> </script>
<style lang="less"> <style lang="less">

9
packages/ui/certd-client/src/views/certd/access/common.tsx
View File

@ -95,9 +95,12 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
}, },
renderLabel(item: any) { renderLabel(item: any) {
return ( return (
<span class={"flex-o"}> <span class={"flex flex-between items-center"}>
<fs-icon icon={item.icon} class={"mr-5 fs-16 color-blue"} /> <span class={"flex items-center"}>
{item.label} <fs-icon icon={item.icon} class={"mr-5 fs-16 color-blue"} />
{item.label}
</span>
<span>{item.value}</span>
</span> </span>
); );
}, },

82
pnpm-lock.yaml
View File

@ -46,7 +46,7 @@ importers:
packages/core/acme-client: packages/core/acme-client:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../basic version: link:../basic
'@peculiar/x509': '@peculiar/x509':
specifier: ^1.11.0 specifier: ^1.11.0
@ -207,10 +207,10 @@ importers:
packages/core/pipeline: packages/core/pipeline:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../basic version: link:../basic
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../pro/plus-core version: link:../../pro/plus-core
dayjs: dayjs:
specifier: ^1.11.7 specifier: ^1.11.7
@ -415,7 +415,7 @@ importers:
packages/libs/lib-k8s: packages/libs/lib-k8s:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@kubernetes/client-node': '@kubernetes/client-node':
specifier: 0.21.0 specifier: 0.21.0
@ -455,16 +455,16 @@ importers:
packages/libs/lib-server: packages/libs/lib-server:
dependencies: dependencies:
'@certd/acme-client': '@certd/acme-client':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/acme-client version: link:../../core/acme-client
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../pro/plus-core version: link:../../pro/plus-core
'@midwayjs/cache': '@midwayjs/cache':
specifier: ~3.14.0 specifier: ~3.14.0
@ -607,16 +607,16 @@ importers:
packages/plugins/plugin-cert: packages/plugins/plugin-cert:
dependencies: dependencies:
'@certd/acme-client': '@certd/acme-client':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/acme-client version: link:../../core/acme-client
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-lib': '@certd/plugin-lib':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../plugin-lib version: link:../plugin-lib
'@google-cloud/publicca': '@google-cloud/publicca':
specifier: ^1.3.0 specifier: ^1.3.0
@ -698,10 +698,10 @@ importers:
specifier: ^3.787.0 specifier: ^3.787.0
version: 3.810.0(aws-crt@1.26.2) version: 3.810.0(aws-crt@1.26.2)
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@kubernetes/client-node': '@kubernetes/client-node':
specifier: 0.21.0 specifier: 0.21.0
@ -789,19 +789,19 @@ importers:
packages/pro/commercial-core: packages/pro/commercial-core:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@certd/lib-server': '@certd/lib-server':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-server version: link:../../libs/lib-server
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-plus': '@certd/plugin-plus':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../plugin-plus version: link:../plugin-plus
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../plus-core version: link:../plus-core
'@midwayjs/core': '@midwayjs/core':
specifier: ~3.20.3 specifier: ~3.20.3
@ -886,22 +886,22 @@ importers:
specifier: ^1.0.2 specifier: ^1.0.2
version: 1.0.3 version: 1.0.3
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@certd/lib-k8s': '@certd/lib-k8s':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-k8s version: link:../../libs/lib-k8s
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-cert': '@certd/plugin-cert':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../plugins/plugin-cert version: link:../../plugins/plugin-cert
'@certd/plugin-lib': '@certd/plugin-lib':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../plugins/plugin-lib version: link:../../plugins/plugin-lib
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../plus-core version: link:../plus-core
ali-oss: ali-oss:
specifier: ^6.21.0 specifier: ^6.21.0
@ -1004,7 +1004,7 @@ importers:
packages/pro/plus-core: packages/pro/plus-core:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
dayjs: dayjs:
specifier: ^1.11.7 specifier: ^1.11.7
@ -1294,10 +1294,10 @@ importers:
version: 0.1.3(zod@3.24.4) version: 0.1.3(zod@3.24.4)
devDependencies: devDependencies:
'@certd/lib-iframe': '@certd/lib-iframe':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-iframe version: link:../../libs/lib-iframe
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@rollup/plugin-commonjs': '@rollup/plugin-commonjs':
specifier: ^25.0.7 specifier: ^25.0.7
@ -1480,46 +1480,46 @@ importers:
specifier: ^3.705.0 specifier: ^3.705.0
version: 3.810.0(aws-crt@1.26.2) version: 3.810.0(aws-crt@1.26.2)
'@certd/acme-client': '@certd/acme-client':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/acme-client version: link:../../core/acme-client
'@certd/basic': '@certd/basic':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/basic version: link:../../core/basic
'@certd/commercial-core': '@certd/commercial-core':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../pro/commercial-core version: link:../../pro/commercial-core
'@certd/cv4pve-api-javascript': '@certd/cv4pve-api-javascript':
specifier: ^8.4.1 specifier: ^8.4.1
version: 8.4.1 version: 8.4.1
'@certd/jdcloud': '@certd/jdcloud':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-jdcloud version: link:../../libs/lib-jdcloud
'@certd/lib-huawei': '@certd/lib-huawei':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-huawei version: link:../../libs/lib-huawei
'@certd/lib-k8s': '@certd/lib-k8s':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-k8s version: link:../../libs/lib-k8s
'@certd/lib-server': '@certd/lib-server':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/lib-server version: link:../../libs/lib-server
'@certd/midway-flyway-js': '@certd/midway-flyway-js':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../libs/midway-flyway-js version: link:../../libs/midway-flyway-js
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-cert': '@certd/plugin-cert':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../plugins/plugin-cert version: link:../../plugins/plugin-cert
'@certd/plugin-lib': '@certd/plugin-lib':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../plugins/plugin-lib version: link:../../plugins/plugin-lib
'@certd/plugin-plus': '@certd/plugin-plus':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../pro/plugin-plus version: link:../../pro/plugin-plus
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.35.2 specifier: ^1.35.5
version: link:../../pro/plus-core version: link:../../pro/plus-core
'@huaweicloud/huaweicloud-sdk-cdn': '@huaweicloud/huaweicloud-sdk-cdn':
specifier: ^3.1.120 specifier: ^3.1.120