Merge branch 'v2-dev' into v2-dev-buy

packages/ui/certd-client/src/components/index.ts

@@ -4,8 +4,8 @@ import vip from "./vip-button/install.js";
 import { CheckCircleOutlined, InfoCircleOutlined, UndoOutlined } from "@ant-design/icons-vue";
 import CronEditor from "./cron-editor/index.vue";
 import FoldBox from "./fold-box.vue";
-import { CronLight } from "@vue-js-cron/light";
-import "@vue-js-cron/light/dist/light.css";
+import { CronLight } from "@certd/vue-js-cron-light";
+import "@certd/vue-js-cron-light/dist/light.css";
 import Plugins from "./plugins/index";
 import LoadingButton from "./loading-button.vue";
 import IconSelect from "./icon-select.vue";

packages/ui/certd-client/src/plugin/fast-crud/index.tsx

@@ -95,7 +95,7 @@ function install(app: App, options: any = {}) {
 
               //不能用 !scope.value ， 否则switch组件设置为关之后就消失了
               const { value, key, props } = scope;
-              return !value && key != "_index" && value != false;
+              return !value && key != "_index" && value != false && value != 0;
             },
             render() {
               return "-";

packages/ui/certd-client/src/views/certd/access/crud.tsx

@@ -44,6 +44,20 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       rowHandle: {
         width: 200,
+        buttons: {
+          copy: {
+            async click(ctx: any) {
+              const { row, index } = ctx;
+              await crudExpose.openCopy({
+                row: {
+                  ...row,
+                  _copyFrom: row.id,
+                },
+                index: index,
+              });
+            },
+          },
+        },
       },
       columns: {
         id: {

packages/ui/certd-client/src/views/framework/home/dashboard/charts/pie-count.vue

@@ -41,7 +41,7 @@ const option = ref({
       center: ["60%", "50%"],
       name: "状态",
       type: "pie",
-      radius: "80%",
+      radius: ["30%", "70%"],
       avoidLabelOverlap: false,
       itemStyle: {
         borderRadius: 0,

packages/ui/certd-client/src/views/sys/settings/tabs/base.vue

@@ -47,10 +47,6 @@
         <div class="helper" v-html="t('certd.commonCnameHelper')"></div>
       </a-form-item>
 
-      <a-form-item :label="t('certd.enableCommonSelfServicePasswordRetrieval')" :name="['public', 'selfServicePasswordRetrievalEnabled']">
-        <a-switch v-model:checked="formState.public.selfServicePasswordRetrievalEnabled" />
-      </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>

packages/ui/certd-client/src/views/sys/settings/tabs/payment.vue

@@ -8,7 +8,7 @@
       <a-form-item v-if="formState.yizhifu.enabled" label="易支付配置" :name="['yizhifu', 'accessId']" :required="true">
         <access-selector v-model="formState.yizhifu.accessId" type="yizhifu" from="sys" />
         <div class="helper">
-          <a href="https://certd.docmirror.cn/comm/payments/yizhifu.html">彩虹易支付配置帮助文档</a>
+          <a href="https://certd.docmirror.cn/guide/use/comm/payments/yizhifu.html">彩虹易支付配置帮助文档</a>
         </div>
       </a-form-item>
 
@@ -17,7 +17,7 @@
       </a-form-item>
       <a-form-item v-if="formState.alipay.enabled" label="支付宝配置" :name="['alipay', 'accessId']" :required="true">
         <access-selector v-model="formState.alipay.accessId" type="alipay" from="sys" />
-        <div class="helper">需要开通电脑网站支付， <a href="https://certd.docmirror.cn/comm/payments/alipay.html">支付宝配置帮助文档</a></div>
+        <div class="helper">需要开通电脑网站支付， <a href="https://certd.docmirror.cn/guide/use/comm/payments/alipay.html">支付宝配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item label="微信支付" :name="['wxpay', 'enabled']" :required="true">
@@ -25,7 +25,7 @@
       </a-form-item>
       <a-form-item v-if="formState.wxpay.enabled" label="微信支付配置" :name="['wxpay', 'accessId']" :required="true">
         <access-selector v-model="formState.wxpay.accessId" type="wxpay" from="sys" />
-        <div class="helper">需要开通Native支付， <a href="https://certd.docmirror.cn/comm/payments/wxpay.html">微信配置帮助文档</a></div>
+        <div class="helper">需要开通Native支付， <a href="https://certd.docmirror.cn/guide/use/comm/payments/wxpay.html">微信配置帮助文档</a></div>
       </a-form-item>
 
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 16 }">

packages/ui/certd-client/src/views/sys/settings/tabs/register.vue

@@ -11,6 +11,9 @@
       <a-form-item :label="t('certd.enableSelfRegistration')" :name="['public', 'registerEnabled']">
         <a-switch v-model:checked="formState.public.registerEnabled" />
       </a-form-item>
+      <a-form-item :label="t('certd.enableCommonSelfServicePasswordRetrieval')" :name="['public', 'selfServicePasswordRetrievalEnabled']">
+        <a-switch v-model:checked="formState.public.selfServicePasswordRetrievalEnabled" />
+      </a-form-item>
       <a-form-item :label="t('certd.enableUserValidityPeriod')" :name="['public', 'userValidTimeEnabled']">
         <div class="flex-o">
           <a-switch v-model:checked="formState.public.userValidTimeEnabled" :disabled="!settingsStore.isPlus" />