From be45f03006a3cf43dd773b58c94d7b04d9e99cda Mon Sep 17 00:00:00 2001
From: juetan <contact@juetan.cn>
Date: Wed, 11 Oct 2023 22:48:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=92=8C=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  9 ++--
 src/components/editor/blocks/date/index.ts    | 42 +++++++++++++++++++
 .../editor/blocks/date/interface.ts           |  9 ++++
 src/components/editor/blocks/date/option.vue  | 27 ++++++++++++
 src/components/editor/blocks/date/render.vue  | 22 ++++++++++
 src/components/editor/blocks/font/option.vue  | 12 +++---
 src/components/editor/blocks/index.ts         |  4 ++
 src/components/editor/blocks/text/option.vue  | 16 +++----
 src/components/editor/blocks/time/index.ts    | 42 +++++++++++++++++++
 .../editor/blocks/time/interface.ts           |  9 ++++
 src/components/editor/blocks/time/option.vue  | 34 +++++++++++++++
 src/components/editor/blocks/time/render.vue  | 35 ++++++++++++++++
 src/components/editor/panel-left/index.vue    |  2 +-
 src/pages/my/index.vue                        |  4 +-
 src/pages/post/media/index.vue                |  4 +-
 src/types/auto-component.d.ts                 | 32 +++++++++++---
 16 files changed, 275 insertions(+), 28 deletions(-)
 create mode 100644 src/components/editor/blocks/date/index.ts
 create mode 100644 src/components/editor/blocks/date/interface.ts
 create mode 100644 src/components/editor/blocks/date/option.vue
 create mode 100644 src/components/editor/blocks/date/render.vue
 create mode 100644 src/components/editor/blocks/time/index.ts
 create mode 100644 src/components/editor/blocks/time/interface.ts
 create mode 100644 src/components/editor/blocks/time/option.vue
 create mode 100644 src/components/editor/blocks/time/render.vue

diff --git a/src/App.vue b/src/App.vue
index 6feeac0..2c7a76e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,17 +1,16 @@
 <template>
-  <!-- <a-config-provider>
+  <a-config-provider>
     <router-view v-slot="{ Component }">
       <page-403 v-if="Math.random() > 0.999"></page-403>
       <component v-else :is="Component"></component>
     </router-view>
-  </a-config-provider> -->
-  <div>
+  </a-config-provider>
+  <!-- <div>
     <my-editor></my-editor>
-  </div>
+  </div> -->
 </template>
 
 <script setup lang="ts">
-import MyEditor from './components/editor/index.vue';
 </script>
 
 <style scoped></style>
diff --git a/src/components/editor/blocks/date/index.ts b/src/components/editor/blocks/date/index.ts
new file mode 100644
index 0000000..2a33077
--- /dev/null
+++ b/src/components/editor/blocks/date/index.ts
@@ -0,0 +1,42 @@
+import { defineBlocker } from "../../config";
+import { DateData } from "./interface";
+import Option from "./option.vue";
+import Render from "./render.vue";
+
+export default defineBlocker<DateData>({
+  type: "date",
+  icon: "icon-park-outline-calendar",
+  title: "日期组件",
+  description: "文字",
+  render: Render,
+  option: Option,
+  initial: {
+    id: "",
+    type: "date",
+    x: 0,
+    y: 0,
+    w: 300,
+    h: 100,
+    xFixed: false,
+    yFixed: false,
+    bgImage: "",
+    bgColor: "",
+    meta: {},
+    actived: false,
+    resizable: true,
+    draggable: true,
+    data: {
+      format: "YYYY-MM-DD",
+      fontCh: {
+        content: "请输入文字",
+        family: "微软雅黑",
+        size: 14,
+        color: "#000000",
+        bold: false,
+        italic: false,
+        underline: false,
+        align: 3,
+      },
+    },
+  },
+});
diff --git a/src/components/editor/blocks/date/interface.ts b/src/components/editor/blocks/date/interface.ts
new file mode 100644
index 0000000..c05638e
--- /dev/null
+++ b/src/components/editor/blocks/date/interface.ts
@@ -0,0 +1,9 @@
+import { Font } from "../font";
+
+export interface DateData {
+  /**
+   * 日期格式
+   */
+  format: 'YYYY-MM-DD' | 'YYYY年MM月DD日';
+  fontCh: Font;
+}
\ No newline at end of file
diff --git a/src/components/editor/blocks/date/option.vue b/src/components/editor/blocks/date/option.vue
new file mode 100644
index 0000000..63f7f2d
--- /dev/null
+++ b/src/components/editor/blocks/date/option.vue
@@ -0,0 +1,27 @@
+<template>
+  <base-option :data="data"></base-option>
+  <font-option :data="data.data.fontCh"></font-option>
+</template>
+
+<script setup lang="ts">
+import { PropType } from "vue";
+import BaseOption from "../../components/BaseOption.vue";
+import { Block } from "../../config";
+import { FontOption } from "../font";
+import { DateData } from "./interface";
+
+defineProps({
+  data: {
+    type: Object as PropType<Block<DateData>>,
+    required: true,
+  },
+});
+</script>
+
+<style lang="less" scoped>
+.dir-radio {
+  .arco-radio-button-content {
+    padding: 0;
+  }
+}
+</style>
diff --git a/src/components/editor/blocks/date/render.vue b/src/components/editor/blocks/date/render.vue
new file mode 100644
index 0000000..94a554f
--- /dev/null
+++ b/src/components/editor/blocks/date/render.vue
@@ -0,0 +1,22 @@
+<template>
+  <font-render :data="data.data.fontCh">
+    {{ dayjs().format(data.data.format) }}
+  </font-render>
+</template>
+
+<script setup lang="ts">
+import { dayjs } from '@/libs/dayjs';
+import { PropType } from "vue";
+import { Block } from "../../config";
+import { FontRender } from "../font";
+import { DateData } from "./interface";
+
+const props = defineProps({
+  data: {
+    type: Object as PropType<Block<DateData>>,
+    required: true,
+  },
+});
+</script>
+
+<style scoped></style>
diff --git a/src/components/editor/blocks/font/option.vue b/src/components/editor/blocks/font/option.vue
index ff70001..95e3ff7 100644
--- a/src/components/editor/blocks/font/option.vue
+++ b/src/components/editor/blocks/font/option.vue
@@ -1,8 +1,10 @@
 <template>
   <div>
-    <a-form-item label="内容">
-      <a-textarea v-model="data.content" placeholder="输入内容..."></a-textarea>
-    </a-form-item>
+    <slot name="content">
+      <a-form-item label="内容">
+        <a-textarea v-model="data.content" placeholder="输入内容..."></a-textarea>
+      </a-form-item>
+    </slot>
 
     <a-form-item label="颜色">
       <input-color v-model="data.color"></input-color>
@@ -56,7 +58,7 @@
 <script setup lang="ts">
 import { PropType } from "vue";
 import InputColor from "../../components/InputColor.vue";
-import { Font, AlignOptions, FontFamilyOptions } from "./interface";
+import { AlignOptions, Font, FontFamilyOptions } from "./interface";
 
 defineProps({
   data: {
@@ -67,4 +69,4 @@ defineProps({
 </script>
 
 <style scoped></style>
-./types
\ No newline at end of file
+./types
diff --git a/src/components/editor/blocks/index.ts b/src/components/editor/blocks/index.ts
index 96140f6..df35df1 100644
--- a/src/components/editor/blocks/index.ts
+++ b/src/components/editor/blocks/index.ts
@@ -1,7 +1,11 @@
+import Date from './date';
 import Text from "./text";
+import Time from "./time";
 
 export const BlockerMap = {
   [Text.type]: Text,
+  [Date.type]: Date,
+  [Time.type]: Time,
 };
 
 export const getBlockerRender = (type: string) => {
diff --git a/src/components/editor/blocks/text/option.vue b/src/components/editor/blocks/text/option.vue
index 15be301..f51cf83 100644
--- a/src/components/editor/blocks/text/option.vue
+++ b/src/components/editor/blocks/text/option.vue
@@ -4,18 +4,18 @@
   </div>
   <div>
     <a-divider></a-divider>
-    <div class="muti-form-item grid grid-cols-2 gap-4">
+    <div class="muti-form-item grid grid-cols-2 gap-x-4">
       <a-form-item label="是否滚动">
         <a-radio-group type="button" v-model="data.data.marquee" class="!w-full">
           <a-radio :value="false">否</a-radio>
           <a-radio :value="true">是</a-radio>
         </a-radio-group>
       </a-form-item>
-      <a-form-item v-show="data.data.marquee" label="滚动速度">
+      <a-form-item v-if="data.data.marquee" label="滚动速度">
         <a-input-number v-model="data.data.marqueeSpeed" :min="10" :step="10"></a-input-number>
       </a-form-item>
     </div>
-    <a-form-item v-show="data.data.marquee" label="滚动方向">
+    <a-form-item v-if="data.data.marquee" label="滚动方向">
       <a-radio-group type="button" v-model="data.data.marqueeDirection" class="!w-full">
         <a-radio v-for="item in DirectionOptions" :key="item.value" :value="item.value" class="dir-radio">
           <i :class="item.icon"></i>
@@ -23,9 +23,9 @@
       </a-radio-group>
     </a-form-item>
   </div>
+  <a-divider :margin="0"></a-divider>
   <div>
-    <a-divider></a-divider>
-    <div class="mb-4 leading-0">
+    <div class="my-4 leading-0">
       <i class="icon-park-outline-text-style"></i>
       内容(中文)
     </div>
@@ -35,10 +35,10 @@
 
 <script setup lang="ts">
 import { PropType } from "vue";
-import { FontOption } from "../font";
-import { Block } from "../../config";
-import { TextData, DirectionOptions } from "./interface";
 import BaseOption from "../../components/BaseOption.vue";
+import { Block } from "../../config";
+import { FontOption } from "../font";
+import { DirectionOptions, TextData } from "./interface";
 
 defineProps({
   data: {
diff --git a/src/components/editor/blocks/time/index.ts b/src/components/editor/blocks/time/index.ts
new file mode 100644
index 0000000..4c2c693
--- /dev/null
+++ b/src/components/editor/blocks/time/index.ts
@@ -0,0 +1,42 @@
+import { defineBlocker } from "../../config";
+import { TimeData } from "./interface";
+import Option from "./option.vue";
+import Render from "./render.vue";
+
+export default defineBlocker<TimeData>({
+  type: "time",
+  icon: "icon-park-outline-time",
+  title: "时间组件",
+  description: "文字",
+  render: Render,
+  option: Option,
+  initial: {
+    id: "",
+    type: "time",
+    x: 0,
+    y: 0,
+    w: 300,
+    h: 100,
+    xFixed: false,
+    yFixed: false,
+    bgImage: "",
+    bgColor: "",
+    meta: {},
+    actived: false,
+    resizable: true,
+    draggable: true,
+    data: {
+      format: "HH:mm:ss",
+      fontCh: {
+        content: "请输入文字",
+        family: "微软雅黑",
+        size: 14,
+        color: "#000000",
+        bold: false,
+        italic: false,
+        underline: false,
+        align: 3,
+      },
+    },
+  },
+});
diff --git a/src/components/editor/blocks/time/interface.ts b/src/components/editor/blocks/time/interface.ts
new file mode 100644
index 0000000..734d937
--- /dev/null
+++ b/src/components/editor/blocks/time/interface.ts
@@ -0,0 +1,9 @@
+import { Font } from "../font";
+
+export interface TimeData {
+  /**
+   * 日期格式
+   */
+  format: string;
+  fontCh: Font;
+}
\ No newline at end of file
diff --git a/src/components/editor/blocks/time/option.vue b/src/components/editor/blocks/time/option.vue
new file mode 100644
index 0000000..ceec580
--- /dev/null
+++ b/src/components/editor/blocks/time/option.vue
@@ -0,0 +1,34 @@
+<template>
+  <base-option :data="data"></base-option>
+  <a-divider></a-divider>
+  <font-option :data="data.data.fontCh">
+    <template #content>
+      <a-form-item label="时间格式">
+        <a-input v-model="data.data.fontCh.content" placeholder="例如 HH:mm:ss"></a-input>
+      </a-form-item>
+    </template>
+  </font-option>
+</template>
+
+<script setup lang="ts">
+import { PropType } from "vue";
+import BaseOption from "../../components/BaseOption.vue";
+import { Block } from "../../config";
+import { FontOption } from "../font";
+import { TimeData } from "./interface";
+
+defineProps({
+  data: {
+    type: Object as PropType<Block<TimeData>>,
+    required: true,
+  },
+});
+</script>
+
+<style lang="less" scoped>
+.dir-radio {
+  .arco-radio-button-content {
+    padding: 0;
+  }
+}
+</style>
diff --git a/src/components/editor/blocks/time/render.vue b/src/components/editor/blocks/time/render.vue
new file mode 100644
index 0000000..e1438e1
--- /dev/null
+++ b/src/components/editor/blocks/time/render.vue
@@ -0,0 +1,35 @@
+<template>
+  <font-render :data="data.data.fontCh">
+    {{ currentTime }}
+  </font-render>
+</template>
+
+<script setup lang="ts">
+import { dayjs } from "@/libs/dayjs";
+import { PropType, onMounted, onUnmounted, ref } from "vue";
+import { Block } from "../../config";
+import { FontRender } from "../font";
+import { TimeData } from "./interface";
+
+const props = defineProps({
+  data: {
+    type: Object as PropType<Block<TimeData>>,
+    required: true,
+  },
+});
+
+const currentTime = ref("");
+const timer: any = null;
+
+onMounted(() => {
+  const timer = setInterval(() => {
+    currentTime.value = dayjs().format(props.data.data.format);
+  }, 1000);
+});
+
+onUnmounted(() => {
+  clearInterval(timer);
+});
+</script>
+
+<style scoped></style>
diff --git a/src/components/editor/panel-left/index.vue b/src/components/editor/panel-left/index.vue
index 52b379f..851ad0c 100644
--- a/src/components/editor/panel-left/index.vue
+++ b/src/components/editor/panel-left/index.vue
@@ -41,7 +41,7 @@
           v-for="item in blocks"
           :key="item.type"
           :draggable="true"
-          :data-type="'text'"
+          :data-type="item.type"
           class="flex items-center justify-between gap-2 bg-gray-100 text-gray-500 px-2 py-1 rounded cursor-move"
         >
           <div class="">
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index 0633cd7..0775031 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -19,11 +19,11 @@
                 <template #help> 支持 5MB 以内大小, png 或 jpg 格式的图片 </template>
               </a-form-item>
               <a-form-item label="用户昵称">
-                <a-input v-model="user.nickname" placeholder="请输入" class="!w-[432px]"></a-input>
+                <a-input v-model="user.nickname" placeholder="请输入" class="!w-[432px]" :max-length="24" :show-word-limit="true"></a-input>
                 <template #help> 用作系统内显示的名称，可在后台修改 </template>
               </a-form-item>
               <a-form-item label="个人描述">
-                <a-textarea v-model="user.description" placeholder="请输入" class="!w-[432px] h-24"></a-textarea>
+                <a-textarea v-model="user.description" placeholder="请输入" class="!w-[432px] h-24" :max-length="140" :show-word-limit="true"></a-textarea>
               </a-form-item>
               <a-form-item label="性别">
                 <a-radio-group v-model="user.gender" type="button">
diff --git a/src/pages/post/media/index.vue b/src/pages/post/media/index.vue
index 6d61df0..6851beb 100644
--- a/src/pages/post/media/index.vue
+++ b/src/pages/post/media/index.vue
@@ -1,7 +1,7 @@
 <template>
   <BreadPage>
     <div class="min-h-full grid grid-cols-[auto_auto_1fr]">
-      <div class="w-[220px]">
+      <div class="w-[200px]">
         <!-- <div class="h-6 flex items-end justify-between gap-2">
           <div class="text-base">
             素材分组
@@ -23,7 +23,7 @@
           v-for="i in 10" 
           class="group flex items-center justify-between gap-2 h-8 rounded mb-1 pl-2 hover:bg-gray-100 cursor-pointer">
           <div>
-            <i class="icon-file-folder"></i>
+            <i class="icon-file-folder text-gray-600"></i>
             日常素材
             <span class="text-xs text-gray-400">(10)</span>
           </div>
diff --git a/src/types/auto-component.d.ts b/src/types/auto-component.d.ts
index 0bb0cab..4b6f5d7 100644
--- a/src/types/auto-component.d.ts
+++ b/src/types/auto-component.d.ts
@@ -7,36 +7,59 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    AAlert: typeof import('@arco-design/web-vue')['Alert']
+    AAvatar: typeof import('@arco-design/web-vue')['Avatar']
+    ABreadcrumb: typeof import('@arco-design/web-vue')['Breadcrumb']
+    ABreadcrumbItem: typeof import('@arco-design/web-vue')['BreadcrumbItem']
     AButton: typeof import('@arco-design/web-vue')['Button']
+    ACard: typeof import('@arco-design/web-vue')['Card']
     ACheckbox: typeof import('@arco-design/web-vue')['Checkbox']
+    ACheckboxGroup: typeof import('@arco-design/web-vue')['CheckboxGroup']
+    AConfigProvider: typeof import('@arco-design/web-vue')['ConfigProvider']
+    ADatePicker: typeof import('@arco-design/web-vue')['DatePicker']
     ADivider: typeof import('@arco-design/web-vue')['Divider']
     ADoption: typeof import('@arco-design/web-vue')['Doption']
+    ADrawer: typeof import('@arco-design/web-vue')['Drawer']
+    ADropdown: typeof import('@arco-design/web-vue')['Dropdown']
     ADropdownButton: typeof import('@arco-design/web-vue')['DropdownButton']
     AEmpty: typeof import('@arco-design/web-vue')['Empty']
     AForm: typeof import('@arco-design/web-vue')['Form']
     AFormItem: typeof import('@arco-design/web-vue')['FormItem']
+    AImage: typeof import('@arco-design/web-vue')['Image']
     AInput: typeof import('@arco-design/web-vue')['Input']
     AInputNumber: typeof import('@arco-design/web-vue')['InputNumber']
     AInputPassword: typeof import('@arco-design/web-vue')['InputPassword']
     AInputSearch: typeof import('@arco-design/web-vue')['InputSearch']
+    ALayout: typeof import('@arco-design/web-vue')['Layout']
+    ALayoutContent: typeof import('@arco-design/web-vue')['LayoutContent']
+    ALayoutHeader: typeof import('@arco-design/web-vue')['LayoutHeader']
+    ALayoutSider: typeof import('@arco-design/web-vue')['LayoutSider']
     ALink: typeof import('@arco-design/web-vue')['Link']
+    AList: typeof import('@arco-design/web-vue')['List']
+    AListItem: typeof import('@arco-design/web-vue')['ListItem']
+    AListItemMeta: typeof import('@arco-design/web-vue')['ListItemMeta']
     AMenu: typeof import('@arco-design/web-vue')['Menu']
     AMenuItem: typeof import('@arco-design/web-vue')['MenuItem']
+    AMenuItemGroup: typeof import('@arco-design/web-vue')['MenuItemGroup']
     AModal: typeof import('@arco-design/web-vue')['Modal']
     APagination: typeof import('@arco-design/web-vue')['Pagination']
     APopover: typeof import('@arco-design/web-vue')['Popover']
     ARadio: typeof import('@arco-design/web-vue')['Radio']
-    ARadioButton: typeof import('@arco-design/web-vue')['RadioButton']
     ARadioGroup: typeof import('@arco-design/web-vue')['RadioGroup']
+    AScrollbar: typeof import('@arco-design/web-vue')['Scrollbar']
     ASelect: typeof import('@arco-design/web-vue')['Select']
     ASpace: typeof import('@arco-design/web-vue')['Space']
     ASpin: typeof import('@arco-design/web-vue')['Spin']
+    ASwitch: typeof import('@arco-design/web-vue')['Switch']
+    ATabPane: typeof import('@arco-design/web-vue')['TabPane']
+    ATabs: typeof import('@arco-design/web-vue')['Tabs']
     ATag: typeof import('@arco-design/web-vue')['Tag']
     ATextarea: typeof import('@arco-design/web-vue')['Textarea']
     ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
+    ATree: typeof import('@arco-design/web-vue')['Tree']
+    AUpload: typeof import('@arco-design/web-vue')['Upload']
     BaseOption: typeof import('./../components/editor/components/BaseOption.vue')['default']
     Block: typeof import('./../components/editor/panel-main/components/block.vue')['default']
-    BlockAttr: typeof import('./../components/editor/panel-right/block-attr.vue')['default']
     BreadCrumb: typeof import('./../components/breadcrumb/bread-crumb.vue')['default']
     BreadPage: typeof import('./../components/breadcrumb/bread-page.vue')['default']
     ColorPicker: typeof import('./../components/editor/components/ColorPicker.vue')['default']
@@ -47,17 +70,16 @@ declare module '@vue/runtime-core' {
     InputColor: typeof import('./../components/editor/components/InputColor.vue')['default']
     InputImage: typeof import('./../components/editor/components/InputImage.vue')['default']
     Marquee: typeof import('./../components/editor/blocks/text/marquee.vue')['default']
-    Option: typeof import('./../components/editor/blocks/font/option.vue')['default']
+    Option: typeof import('./../components/editor/blocks/date/option.vue')['default']
     Page403: typeof import('./../components/error/page-403.vue')['default']
     PanelHeader: typeof import('./../components/editor/panel-header/index.vue')['default']
     PanelLeft: typeof import('./../components/editor/panel-left/index.vue')['default']
     PanelMain: typeof import('./../components/editor/panel-main/index.vue')['default']
     PanelRight: typeof import('./../components/editor/panel-right/index.vue')['default']
     Preview: typeof import('./../components/editor/preview/index.vue')['default']
-    Render: typeof import('./../components/editor/blocks/font/render.vue')['default']
+    Render: typeof import('./../components/editor/blocks/date/render.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    TextAttr: typeof import('./../components/editor/panel-right/text-attr.vue')['default']
     Texter: typeof import('./../components/editor/panel-main/components/texter.vue')['default']
     Toast: typeof import('./../components/toast/toast.vue')['default']
   }