From 7bc8c16581a476c55b04c711a6188e2822418600 Mon Sep 17 00:00:00 2001
From: IMyself <365172043@qq.com>
Date: Mon, 10 Jul 2023 08:21:10 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=B3=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=92=E7=99=BD=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chart/ContentEdit/components/EditRule/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/chart/ContentEdit/components/EditRule/index.vue b/src/views/chart/ContentEdit/components/EditRule/index.vue
index e200bee7..27abb9b6 100644
--- a/src/views/chart/ContentEdit/components/EditRule/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRule/index.vue
@@ -27,7 +27,7 @@
       </div>
     </div>
     <!-- 修复右下角白点用的 -->
-    <div v-if="designStore.getDarkTheme" class="fix-edit-screens-block"></div>
+    <!-- <div v-if="designStore.getDarkTheme" class="fix-edit-screens-block"></div> -->
   </div>
 </template>
 <script setup lang="ts">
@@ -319,6 +319,10 @@ window.onKeySpacePressHold = (isHold: boolean) => {
       border-radius: 5px;
       background-color: rgba(144, 146, 152, 0.3);
     }
+    // 修复右下角白点用的
+    &::-webkit-scrollbar-corner {
+      background-color: transparent;
+    }
   }
 
   .fix-edit-screens-block {

From 307cdd9e9a551addf6285a6c646ae55a4f8d2afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E8=83=9C?= <857949055@qq.com>
Date: Mon, 10 Jul 2023 11:06:19 +0800
Subject: [PATCH 02/25] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E6=97=8B=E8=BD=AC=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=86=E7=BB=84=E5=86=8D=E6=AC=A1=E6=97=8B?=
 =?UTF-8?q?=E8=BD=AC=E9=A2=84=E8=A7=88=E9=94=99=E4=BD=8D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/preview/components/PreviewRenderList/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue
index 07675175..4d44e678 100644
--- a/src/views/preview/components/PreviewRenderList/index.vue
+++ b/src/views/preview/components/PreviewRenderList/index.vue
@@ -10,7 +10,8 @@
       ...getTransformStyle(item.styles),
       ...getStatusStyle(item.status),
       ...getPreviewConfigStyle(item.preview),
-      ...getBlendModeStyle(item.styles) as any
+      ...getBlendModeStyle(item.styles) as any,
+      ...getSizeStyle(item.attr)
     }"
   >
     <!-- 分组 -->

From c3140d3746638d20ac25b2d079991c93d786671c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Sat, 15 Jul 2023 14:13:40 +0800
Subject: [PATCH 03/25] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=20axios=20loc?=
 =?UTF-8?q?k=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   |  2 +-
 pnpm-lock.yaml | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d261a95b..bd5acbb0 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "@types/keymaster": "^1.6.30",
     "@types/lodash": "^4.14.184",
     "animate.css": "^4.1.1",
-    "axios": "^0.27.2",
+    "axios": "^1.4.0",
     "color": "^4.2.3",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e1d3498b..8d00e0ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 dependencies:
   '@amap/amap-jsapi-loader':
     specifier: ^1.0.1
@@ -23,8 +27,8 @@ dependencies:
     specifier: ^4.1.1
     version: 4.1.1
   axios:
-    specifier: ^0.27.2
-    version: 0.27.2
+    specifier: ^1.4.0
+    version: 1.4.0
   color:
     specifier: ^4.2.3
     version: 4.2.3
@@ -2064,11 +2068,12 @@ packages:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: false
 
-  /axios@0.27.2:
-    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
+  /axios@1.4.0:
+    resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
     dependencies:
       follow-redirects: 1.15.1
       form-data: 4.0.0
+      proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
     dev: false
@@ -4826,6 +4831,10 @@ packages:
       asap: 2.0.6
     dev: true
 
+  /proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+    dev: false
+
   /pug-attrs@3.0.0:
     resolution: {integrity: sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==}
     dependencies:

From 91c4cca62e71696f731ec9aae564ccefcb846190 Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Mon, 17 Jul 2023 18:53:33 +0800
Subject: [PATCH 04/25] =?UTF-8?q?fix:=20=E7=B2=98=E8=B4=B4=E5=9D=90?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/chartEditStore/chartEditStore.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts
index ec9c3be9..88179263 100644
--- a/src/store/modules/chartEditStore/chartEditStore.ts
+++ b/src/store/modules/chartEditStore/chartEditStore.ts
@@ -500,8 +500,8 @@ export const useChartEditStore = defineStore({
         }
         const parseHandle = (e: CreateComponentType | CreateComponentGroupType) => {
           e = cloneDeep(e)
-          e.attr.x = this.getMousePosition.x + 30
-          e.attr.y = this.getMousePosition.y + 30
+          e.attr.x = this.getMousePosition.startX
+          e.attr.y = this.getMousePosition.startY
           // 外层生成新 id
           e.id = getUUID()
           // 分组列表生成新 id
@@ -510,11 +510,11 @@ export const useChartEditStore = defineStore({
               item.id = getUUID()
             })
           }
-        
+
           return e
         }
         const isCut = recordCharts.type === HistoryActionTypeEnum.CUT
-        const targetList = Array.isArray(recordCharts.charts) ? recordCharts.charts : [ recordCharts.charts ]
+        const targetList = Array.isArray(recordCharts.charts) ? recordCharts.charts : [recordCharts.charts]
         // 多项
         targetList.forEach((e: CreateComponentType | CreateComponentGroupType) => {
           this.addComponentList(parseHandle(e), undefined, true)

From bb1828b4787705946fbd2b83963997ec8a3c0c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E5=A8=81?= <daidaibg@163.com>
Date: Thu, 20 Jul 2023 14:28:31 +0800
Subject: [PATCH 05/25] =?UTF-8?q?fix:=20=E5=B7=A6=E4=BE=A7=E5=88=BB?=
 =?UTF-8?q?=E5=BA=A6=E5=B0=BA=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chart/ContentEdit/components/EditRule/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/chart/ContentEdit/components/EditRule/index.vue b/src/views/chart/ContentEdit/components/EditRule/index.vue
index 521ac009..800a1fa5 100644
--- a/src/views/chart/ContentEdit/components/EditRule/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRule/index.vue
@@ -290,7 +290,6 @@ window.onKeySpacePressHold = (isHold: boolean) => {
 
 <style lang="scss" scoped>
 @include go('sketch-rule') {
-  position: relative;
   overflow: hidden;
   width: 100%;
   height: 100%;
@@ -341,7 +340,7 @@ window.onKeySpacePressHold = (isHold: boolean) => {
 
   .canvas {
     position: absolute;
-    top: 50%;
+    top:50%;
     left: 50%;
     transform-origin: 50% 0;
     transform: translateY(-50%);

From f528eb29bcd609d7f36e9de2210fceb2fcd1048c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Fri, 21 Jul 2023 16:43:05 +0800
Subject: [PATCH 06/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E9=93=BE=E6=8E=A5=E5=86=85=E5=AE=B9=E5=B0=B1=E4=BC=9A?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Informations/Texts/TextBarrage/config.vue | 178 +++++++++---------
 .../Informations/Texts/TextCommon/index.vue   |   2 +-
 .../Texts/TextGradient/config.vue             |  90 ++++-----
 3 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/src/packages/components/Informations/Texts/TextBarrage/config.vue b/src/packages/components/Informations/Texts/TextBarrage/config.vue
index e2a5ad59..c149102d 100644
--- a/src/packages/components/Informations/Texts/TextBarrage/config.vue
+++ b/src/packages/components/Informations/Texts/TextBarrage/config.vue
@@ -1,89 +1,89 @@
-<template>
-  <collapse-item name="信息" :expanded="true">
-    <setting-item-box name="文字" :alone="true">
-      <setting-item>
-        <n-input v-model:value="optionData.dataset" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-
-  <collapse-item name="样式" :expanded="true">
-    <setting-item-box name="文字">
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.fontColor"></n-color-picker>
-      </setting-item>
-      <setting-item name="字体大小">
-        <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
-      </setting-item>
-      <setting-item name="字体粗细">
-        <n-select v-model:value="optionData.fontWeight" size="small" :options="fontWeightOptions" />
-      </setting-item>
-
-      <setting-item name="字间距">
-        <n-input-number v-model:value="optionData.letterSpacing" size="small" placeholder="输入字间距"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="阴影">
-      <setting-item>
-        <n-space>
-          <n-switch v-model:value="optionData.showShadow" size="small" />
-          <n-text>展示阴影</n-text>
-        </n-space>
-      </setting-item>
-      <setting-item name="颜色">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.colorShadow"></n-color-picker
-      ></setting-item>
-      <setting-item name="x">
-        <n-input-number v-model:value="optionData.hShadow" size="small"></n-input-number
-      ></setting-item>
-      <setting-item name="y">
-        <n-input-number v-model:value="optionData.vShadow" size="small"></n-input-number
-      ></setting-item>
-      <setting-item name="模糊">
-        <n-input-number v-model:value="optionData.blurShadow" size="small"></n-input-number
-      ></setting-item>
-    </setting-item-box>
-
-    <setting-item-box name="动画">
-      <setting-item name="动画速度">
-        <n-input-number
-          v-model:value="optionData.animationSpeed"
-          size="small"
-          placeholder="动画速度"
-          :min="0"
-        ></n-input-number>
-      </setting-item>
-      <setting-item name="动画间隔">
-        <n-input-number
-          v-model:value="optionData.animationTime"
-          size="small"
-          placeholder="动画间隔"
-          :min="0"
-        ></n-input-number>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { option, FontWeightEnum, FontWeightObject } from './config'
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-
-const fontWeightOptions = [
-  {
-    label: FontWeightEnum.NORMAL,
-    value: FontWeightObject[FontWeightEnum.NORMAL]
-  },
-  {
-    label: FontWeightEnum.BOLD,
-    value: FontWeightObject[FontWeightEnum.BOLD]
-  }
-]
-</script>
+<template>
+  <collapse-item name="信息" :expanded="true">
+    <setting-item-box name="文字" :alone="true">
+      <setting-item>
+        <n-input v-model:value="optionData.dataset" type="textarea" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+
+  <collapse-item name="样式" :expanded="true">
+    <setting-item-box name="文字">
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.fontColor"></n-color-picker>
+      </setting-item>
+      <setting-item name="字体大小">
+        <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+      <setting-item name="字体粗细">
+        <n-select v-model:value="optionData.fontWeight" size="small" :options="fontWeightOptions" />
+      </setting-item>
+
+      <setting-item name="字间距">
+        <n-input-number v-model:value="optionData.letterSpacing" size="small" placeholder="输入字间距"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="阴影">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="optionData.showShadow" size="small" />
+          <n-text>展示阴影</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.colorShadow"></n-color-picker
+      ></setting-item>
+      <setting-item name="x">
+        <n-input-number v-model:value="optionData.hShadow" size="small"></n-input-number
+      ></setting-item>
+      <setting-item name="y">
+        <n-input-number v-model:value="optionData.vShadow" size="small"></n-input-number
+      ></setting-item>
+      <setting-item name="模糊">
+        <n-input-number v-model:value="optionData.blurShadow" size="small"></n-input-number
+      ></setting-item>
+    </setting-item-box>
+
+    <setting-item-box name="动画">
+      <setting-item name="动画速度">
+        <n-input-number
+          v-model:value="optionData.animationSpeed"
+          size="small"
+          placeholder="动画速度"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+      <setting-item name="动画间隔">
+        <n-input-number
+          v-model:value="optionData.animationTime"
+          size="small"
+          placeholder="动画间隔"
+          :min="0"
+        ></n-input-number>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { option, FontWeightEnum, FontWeightObject } from './config'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+
+const fontWeightOptions = [
+  {
+    label: FontWeightEnum.NORMAL,
+    value: FontWeightObject[FontWeightEnum.NORMAL]
+  },
+  {
+    label: FontWeightEnum.BOLD,
+    value: FontWeightObject[FontWeightEnum.BOLD]
+  }
+]
+</script>
diff --git a/src/packages/components/Informations/Texts/TextCommon/index.vue b/src/packages/components/Informations/Texts/TextCommon/index.vue
index 9cd16502..6732df8c 100644
--- a/src/packages/components/Informations/Texts/TextCommon/index.vue
+++ b/src/packages/components/Informations/Texts/TextCommon/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="go-text-box">
     <div class="content">
-      <span style="cursor: pointer; white-space: pre-wrap" v-if="link" @click="click"></span>
+      <span style="cursor: pointer; white-space: pre-wrap" v-if="link" @click="click">{{ option.dataset }}</span>
       <span style="white-space: pre-wrap" v-else>{{ option.dataset }}</span>
     </div>
   </div>
diff --git a/src/packages/components/Informations/Texts/TextGradient/config.vue b/src/packages/components/Informations/Texts/TextGradient/config.vue
index 44e08757..a7ff8ebe 100644
--- a/src/packages/components/Informations/Texts/TextGradient/config.vue
+++ b/src/packages/components/Informations/Texts/TextGradient/config.vue
@@ -1,45 +1,45 @@
-<template>
-  <collapse-item name="信息" :expanded="true">
-    <setting-item-box name="文字" :alone="true">
-      <setting-item>
-        <n-input v-model:value="optionData.dataset" size="small"></n-input>
-      </setting-item>
-    </setting-item-box>
-  </collapse-item>
-  <collapse-item name="样式" :expanded="true">
-    <setting-item-box name="文字">
-      <setting-item name="字体大小">
-        <n-input-number v-model:value="optionData.size" size="small" placeholder="字体大小"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-    <setting-item-box name="渐变色参数">
-      <setting-item name="起始值">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.from"></n-color-picker>
-      </setting-item>
-      <setting-item name="结束值">
-        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.to"></n-color-picker>
-      </setting-item>
-      <setting-item name="偏移角度">
-        <n-input-number v-model:value="optionData.gradient.deg" size="small" placeholder="颜色旋转"></n-input-number>
-      </setting-item>
-    </setting-item-box>
-
-  </collapse-item>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { option } from './config'
-import {
-  CollapseItem,
-  SettingItemBox,
-  SettingItem
-} from '@/components/Pages/ChartItemSetting'
-
-const props = defineProps({
-  optionData: {
-    type: Object as PropType<typeof option>,
-    required: true
-  }
-})
-</script>
+<template>
+  <collapse-item name="信息" :expanded="true">
+    <setting-item-box name="文字" :alone="true">
+      <setting-item>
+        <n-input v-model:value="optionData.dataset" type="textarea" size="small"></n-input>
+      </setting-item>
+    </setting-item-box>
+  </collapse-item>
+  <collapse-item name="样式" :expanded="true">
+    <setting-item-box name="文字">
+      <setting-item name="字体大小">
+        <n-input-number v-model:value="optionData.size" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box name="渐变色参数">
+      <setting-item name="起始值">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.from"></n-color-picker>
+      </setting-item>
+      <setting-item name="结束值">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.gradient.to"></n-color-picker>
+      </setting-item>
+      <setting-item name="偏移角度">
+        <n-input-number v-model:value="optionData.gradient.deg" size="small" placeholder="颜色旋转"></n-input-number>
+      </setting-item>
+    </setting-item-box>
+
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { option } from './config'
+import {
+  CollapseItem,
+  SettingItemBox,
+  SettingItem
+} from '@/components/Pages/ChartItemSetting'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+</script>

From 1401a091ebc54dffbb0ca60c36d364f3aeca5ba1 Mon Sep 17 00:00:00 2001
From: QuietlyChan <1013893148@qq.com>
Date: Fri, 28 Jul 2023 10:11:34 +0800
Subject: [PATCH 07/25] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/chart/decorates/fullScreen.png     | Bin 0 -> 6161 bytes
 .../Decorates/Mores/FullScreen/config.ts      |  17 +++
 .../Decorates/Mores/FullScreen/config.vue     |  28 +++++
 .../Decorates/Mores/FullScreen/index.ts       |  14 +++
 .../Decorates/Mores/FullScreen/index.vue      | 111 ++++++++++++++++++
 .../components/Decorates/Mores/index.ts       |  12 +-
 6 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/images/chart/decorates/fullScreen.png
 create mode 100644 src/packages/components/Decorates/Mores/FullScreen/config.ts
 create mode 100644 src/packages/components/Decorates/Mores/FullScreen/config.vue
 create mode 100644 src/packages/components/Decorates/Mores/FullScreen/index.ts
 create mode 100644 src/packages/components/Decorates/Mores/FullScreen/index.vue

diff --git a/src/assets/images/chart/decorates/fullScreen.png b/src/assets/images/chart/decorates/fullScreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..04167ed69e0f1fdb4bcaa774cf4af1f2c9a9a2a7
GIT binary patch
literal 6161
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
P(!9E|j#8C^P1yefNS3H7

literal 0
HcmV?d00001

diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.ts b/src/packages/components/Decorates/Mores/FullScreen/config.ts
new file mode 100644
index 00000000..f6a1a938
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/FullScreen/config.ts
@@ -0,0 +1,17 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { FullScreenConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+
+export const option = {
+  border: 6,
+  bgColor: '#84a5e9',
+  borderColor: '#84a5e9'
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key = FullScreenConfig.key
+  public attr = { w: 150, h: 150 }
+  public chartConfig = cloneDeep(FullScreenConfig)
+  public option = cloneDeep(option)
+}
diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.vue b/src/packages/components/Decorates/Mores/FullScreen/config.vue
new file mode 100644
index 00000000..450752d7
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/FullScreen/config.vue
@@ -0,0 +1,28 @@
+<template>
+  <CollapseItem name="全屏按钮" expanded>
+    <SettingItemBox name="按钮">
+      <SettingItem name="背景色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.bgColor"></n-color-picker>
+      </SettingItem>
+      <SettingItem name="边框色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.borderColor"></n-color-picker>
+      </SettingItem>
+      <SettingItem name="边框大小">
+        <n-input-number v-model:value="optionData.border" size="small" :step="0.5" :min="0"></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+  </CollapseItem>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { option } from './config'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+</script>
diff --git a/src/packages/components/Decorates/Mores/FullScreen/index.ts b/src/packages/components/Decorates/Mores/FullScreen/index.ts
new file mode 100644
index 00000000..19e37683
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/FullScreen/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const FullScreenConfig: ConfigType = {
+  key: 'FullScreen',
+  chartKey: 'VFullScreen',
+  conKey: 'VCFullScreen',
+  title: '全屏按钮',
+  category: ChatCategoryEnum.MORE,
+  categoryName: ChatCategoryEnumName.MORE,
+  package: PackagesCategoryEnum.DECORATES,
+  chartFrame: ChartFrameEnum.STATIC,
+  image: 'fullScreen.png'
+}
diff --git a/src/packages/components/Decorates/Mores/FullScreen/index.vue b/src/packages/components/Decorates/Mores/FullScreen/index.vue
new file mode 100644
index 00000000..805c8294
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/FullScreen/index.vue
@@ -0,0 +1,111 @@
+<template>
+  <svg @click="toggleFullscreen" v-if="!isFullscreen" viewBox="0 0 1024 1024">
+    <path
+      d="M665.6 1017.6c-19.2 0-38.4-19.2-38.4-38.4s19.2-38.4 38.4-38.4h268.8l6.4-268.8c0-19.2 19.2-38.4 38.4-38.4s38.4 19.2 38.4 38.4v294.4c0 32-25.6 51.2-51.2 51.2h-300.8zM51.2 396.8c-19.2 0-38.4-19.2-38.4-38.4V64C12.8 32 38.4 12.8 64 12.8h294.4c19.2 0 38.4 19.2 38.4 38.4s-19.2 38.4-38.4 38.4H89.6v268.8c0 19.2-19.2 38.4-38.4 38.4zM64 1017.6c-32 0-51.2-25.6-51.2-51.2v-294.4c0-19.2 19.2-38.4 38.4-38.4s38.4 19.2 38.4 38.4v217.6l198.4-198.4c6.4-6.4 19.2-12.8 25.6-12.8s19.2 6.4 25.6 12.8c6.4 6.4 12.8 19.2 12.8 25.6 0 12.8-6.4 19.2-12.8 25.6l-198.4 198.4h217.6c19.2 0 38.4 19.2 38.4 38.4s-19.2 38.4-38.4 38.4H64z m915.2-620.8c-19.2 0-38.4-19.2-38.4-38.4V140.8l-198.4 198.4c-6.4 6.4-19.2 12.8-25.6 12.8-12.8 0-19.2-6.4-25.6-12.8-12.8-12.8-12.8-38.4 0-51.2l198.4-198.4h-217.6c-19.2 0-38.4-19.2-38.4-38.4s19.2-38.4 38.4-38.4h294.4c32 0 51.2 25.6 51.2 51.2v294.4c0 19.2-19.2 38.4-38.4 38.4z"
+      class="fullScreen-border"
+    ></path>
+  </svg>
+  <svg @click="toggleFullscreen" v-else viewBox="0 0 1024 1024">
+    <path
+      d="M379.336 697.237L153.362 921.55c-14.11 14.007-36.905 13.922-50.912-0.188-14.007-14.11-13.922-36.905 0.188-50.912l227.6-225.927H138.645c-18.99 0-34.385-15.446-34.385-34.5 0-19.053 15.395-34.5 34.385-34.5H413.72c18.99 0 34.384 15.447 34.384 34.5v276c0 9.15-3.622 17.926-10.07 24.396a34.326 34.326 0 0 1-24.314 10.104 34.326 34.326 0 0 1-24.314-10.104 34.559 34.559 0 0 1-10.071-24.396V697.237z m263.395-366.88l227.813-227.813c14.059-14.059 36.853-14.059 50.912 0 14.059 14.059 14.059 36.853 0 50.912l-225.18 225.18h187.147c18.99 0 34.385 15.445 34.385 34.5 0 19.053-15.395 34.5-34.385 34.5H608.346c-18.99 0-34.384-15.447-34.384-34.5v-276c0-9.15 3.622-17.926 10.07-24.396a34.326 34.326 0 0 1 24.314-10.105c9.12 0 17.865 3.635 24.314 10.105a34.559 34.559 0 0 1 10.07 24.395v193.223zM99.385 410a34.326 34.326 0 0 1-24.314-10.105A34.559 34.559 0 0 1 65 375.5v-276C65 80.446 80.395 65 99.385 65h275.077c18.99 0 34.384 15.446 34.384 34.5 0 19.054-15.394 34.5-34.384 34.5H133.769v241.5c0 9.15-3.622 17.925-10.07 24.395A34.326 34.326 0 0 1 99.384 410z m825.23 552H649.538c-18.99 0-34.384-15.446-34.384-34.5 0-19.054 15.394-34.5 34.384-34.5h240.693V651.5c0-19.054 15.394-34.5 34.384-34.5 18.99 0 34.385 15.446 34.385 34.5v276c0 19.054-15.395 34.5-34.385 34.5z"
+      class="fullScreen-border"
+    ></path>
+  </svg>
+</template>
+
+<script setup lang="ts">
+import { PropType, toRefs, ref, onMounted, onUnmounted } from 'vue'
+import { CreateComponentType } from '@/packages/index.d'
+import { option } from './config'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<CreateComponentType & typeof option>,
+    required: true
+  }
+})
+
+let { border, bgColor, borderColor } = toRefs(props.chartConfig.option)
+const isFullscreen = ref(false)
+const checkFullscreen = () => {
+  isFullscreen.value = !!(
+    document.fullscreenElement ||
+    document.webkitFullscreenElement ||
+    document.mozFullScreenElement ||
+    document.msFullscreenElement
+  )
+}
+checkFullscreen()
+
+const requestFullscreen = element => {
+  if (element.requestFullscreen) {
+    element.requestFullscreen()
+  } else if (element.mozRequestFullScreen) {
+    /* Firefox */
+    element.mozRequestFullScreen()
+  } else if (element.webkitRequestFullscreen) {
+    /* Chrome, Safari and Opera */
+    element.webkitRequestFullscreen()
+  } else if (element.msRequestFullscreen) {
+    /* IE/Edge */
+    element.msRequestFullscreen()
+  }
+}
+
+const exitFullscreen = () => {
+  if (document.fullscreenElement && document.exitFullscreen) {
+    document.exitFullscreen()
+  } else if (document.mozFullScreenElement && document.mozCancelFullScreen) {
+    /* Firefox */
+    document.mozCancelFullScreen()
+  } else if (document.webkitFullscreenElement && document.webkitExitFullscreen) {
+    /* Chrome, Safari and Opera */
+    document.webkitExitFullscreen()
+  } else if (document.msFullscreenElement && document.msExitFullscreen) {
+    /* IE/Edge */
+    document.msExitFullscreen()
+  }
+}
+
+const toggleFullscreen = () => {
+  if (!isFullscreen.value) {
+    requestFullscreen(document.documentElement)
+  } else {
+    exitFullscreen()
+  }
+  isFullscreen.value = !isFullscreen.value
+  // 由于全屏状态的改变不会立即生效，所以需要延迟一段时间再去获取全屏状态
+  setTimeout(() => {
+    checkFullscreen()
+  }, 1000)
+}
+
+// 监听全屏状态的改变，保证多个全屏组件的状态一致
+onMounted(() => {
+  document.addEventListener('fullscreenchange', checkFullscreen)
+  document.addEventListener('webkitfullscreenchange', checkFullscreen)
+  document.addEventListener('mozfullscreenchange', checkFullscreen)
+  document.addEventListener('MSFullscreenChange', checkFullscreen)
+})
+
+onUnmounted(() => {
+  document.removeEventListener('fullscreenchange', checkFullscreen)
+  document.removeEventListener('webkitfullscreenchange', checkFullscreen)
+  document.removeEventListener('mozfullscreenchange', checkFullscreen)
+  document.removeEventListener('MSFullscreenChange', checkFullscreen)
+})
+</script>
+
+<style lang="scss" scoped>
+svg {
+  display: block;
+  width: 100%;
+  height: 100%;
+  cursor: pointer;
+}
+.fullScreen-border {
+  stroke: v-bind('borderColor');
+  stroke-width: v-bind('border+"px"');
+  fill: v-bind('bgColor');
+}
+</style>
diff --git a/src/packages/components/Decorates/Mores/index.ts b/src/packages/components/Decorates/Mores/index.ts
index 7223832b..489b9c5c 100644
--- a/src/packages/components/Decorates/Mores/index.ts
+++ b/src/packages/components/Decorates/Mores/index.ts
@@ -1,9 +1,19 @@
 import { NumberConfig } from './Number/index'
 import { TimeCommonConfig } from './TimeCommon/index'
 import { ClockConfig } from './Clock/index'
+import { FullScreenConfig } from './FullScreen/index'
 import { CountDownConfig } from './CountDown/index'
 import { FlipperNumberConfig } from './FlipperNumber'
 import { PipelineHConfig } from './PipelineH/index'
 import { PipelineVConfig } from './PipelineV/index'
 
-export default [NumberConfig, FlipperNumberConfig, TimeCommonConfig, CountDownConfig, ClockConfig, PipelineHConfig, PipelineVConfig]
+export default [
+  NumberConfig,
+  FlipperNumberConfig,
+  TimeCommonConfig,
+  CountDownConfig,
+  ClockConfig,
+  FullScreenConfig,
+  PipelineHConfig,
+  PipelineVConfig
+]

From dbc44bf4199806eaf26ef9a30bc0049f8d8f2c65 Mon Sep 17 00:00:00 2001
From: QuietlyChan <1013893148@qq.com>
Date: Fri, 28 Jul 2023 14:34:40 +0800
Subject: [PATCH 08/25] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E4=B8=8D=E8=83=BD=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Decorates/Mores/FullScreen/config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.ts b/src/packages/components/Decorates/Mores/FullScreen/config.ts
index f6a1a938..bed59c06 100644
--- a/src/packages/components/Decorates/Mores/FullScreen/config.ts
+++ b/src/packages/components/Decorates/Mores/FullScreen/config.ts
@@ -1,5 +1,6 @@
 import { PublicConfigClass } from '@/packages/public'
 import { CreateComponentType } from '@/packages/index.d'
+import { chartInitConfig } from '@/settings/designSetting'
 import { FullScreenConfig } from './index'
 import cloneDeep from 'lodash/cloneDeep'
 
@@ -11,7 +12,7 @@ export const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = FullScreenConfig.key
-  public attr = { w: 150, h: 150 }
+  public attr = { ...chartInitConfig, w: 150, h: 150 }
   public chartConfig = cloneDeep(FullScreenConfig)
   public option = cloneDeep(option)
 }

From ac2fd676887c004d3dcfebf0b70f2c52e1fc7b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Mon, 31 Jul 2023 15:45:43 +0800
Subject: [PATCH 09/25] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E4=BC=9A=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/chartEditStore/chartEditStore.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/chartEditStore/chartEditStore.ts b/src/store/modules/chartEditStore/chartEditStore.ts
index 88179263..91156ac3 100644
--- a/src/store/modules/chartEditStore/chartEditStore.ts
+++ b/src/store/modules/chartEditStore/chartEditStore.ts
@@ -614,7 +614,7 @@ export const useChartEditStore = defineStore({
           } else {
             const group = historyData[0] as CreateComponentGroupType
             group.groupList.forEach(item => {
-              ids.push(item.id)
+              ids.unshift(item.id)
             })
           }
           this.setGroup(ids, false)
@@ -763,7 +763,7 @@ export const useChartEditStore = defineStore({
           // 高
           groupAttr.b = b < y + h ? y + h : b
 
-          targetList.push(item)
+          targetList.unshift(item)
           historyList.push(toRaw(item))
         })
 
@@ -809,7 +809,7 @@ export const useChartEditStore = defineStore({
           if (isHistory) chartHistoryStore.createUnGroupHistory(cloneDeep([targetGroup]))
 
           // 分离组件并还原位置属性
-          targetGroup.groupList.forEach(item => {
+          targetGroup.groupList.reverse().forEach(item => {
             item.attr.x = item.attr.x + targetGroup.attr.x
             item.attr.y = item.attr.y + targetGroup.attr.y
             if (!callBack) {

From 1250829da6a306e8ed1abb3abf7c9ab988b9f300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Mon, 31 Jul 2023 17:09:20 +0800
Subject: [PATCH 10/25] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E4=B8=80?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E4=B8=8D=E4=BC=9A=E8=AF=B7=E6=B1=82=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useChartDataFetch.hook.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts
index 91271e8d..5fc84554 100644
--- a/src/hooks/useChartDataFetch.hook.ts
+++ b/src/hooks/useChartDataFetch.hook.ts
@@ -95,7 +95,7 @@ export const useChartDataFetch = (
             fetchFn()
           },
           {
-            immediate: false,
+            immediate: true,
             deep: true
           }
         )

From 5479a26832066ee27aa76f6198bae9838cfc2f29 Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Tue, 1 Aug 2023 08:44:27 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8A=98?=
 =?UTF-8?q?=E7=BA=BF=E6=B8=90=E5=8F=98=E5=9B=BE=E9=BC=A0=E6=A0=87=E7=A7=BB?=
 =?UTF-8?q?=E5=85=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Charts/Lines/LineLinearSingle/config.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts
index abcb2a31..12b54782 100644
--- a/src/packages/components/Charts/Lines/LineLinearSingle/config.ts
+++ b/src/packages/components/Charts/Lines/LineLinearSingle/config.ts
@@ -33,6 +33,10 @@ export const option = {
         width: 3,
         color: {
           type: 'linear',
+          x: 0,
+          y: 0,
+          x2: 0,
+          y2: 1,
           colorStops: [
             {
               offset: 0,

From d91c86f01c22ea28afee8a079348b4e919f88822 Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Tue, 1 Aug 2023 08:48:59 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tables/Tables/TablesBasic/config.ts       |  35 ++++
 .../Tables/Tables/TablesBasic/config.vue      | 156 ++++++++++++++++++
 .../Tables/Tables/TablesBasic/data.json       |  60 +++++++
 .../Tables/Tables/TablesBasic/index.ts        |  14 ++
 .../Tables/Tables/TablesBasic/index.vue       |  91 ++++++++++
 .../components/Tables/Tables/index.ts         |   3 +-
 6 files changed, 358 insertions(+), 1 deletion(-)
 create mode 100644 src/packages/components/Tables/Tables/TablesBasic/config.ts
 create mode 100644 src/packages/components/Tables/Tables/TablesBasic/config.vue
 create mode 100644 src/packages/components/Tables/Tables/TablesBasic/data.json
 create mode 100644 src/packages/components/Tables/Tables/TablesBasic/index.ts
 create mode 100644 src/packages/components/Tables/Tables/TablesBasic/index.vue

diff --git a/src/packages/components/Tables/Tables/TablesBasic/config.ts b/src/packages/components/Tables/Tables/TablesBasic/config.ts
new file mode 100644
index 00000000..eeca61bd
--- /dev/null
+++ b/src/packages/components/Tables/Tables/TablesBasic/config.ts
@@ -0,0 +1,35 @@
+import cloneDeep from 'lodash/cloneDeep'
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { chartInitConfig } from '@/settings/designSetting'
+import { TablesBasicConfig } from './index'
+import dataJson from './data.json'
+
+const {dimensions,source} = dataJson
+export const option = {
+  dataset:{dimensions,source},
+  pagination:{
+    page: 1,
+    pageSize:5
+  },
+  align:'center',
+  style:{
+    border:'on',
+    singleColumn:'off',
+    singleLine:'off',
+    bottomBordered:'on',
+    striped:'on',
+    fontSize:16,
+    borderWidth:0,
+    borderColor:'black',
+    borderStyle:'solid'
+  },
+  inputShow:"none"
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key = TablesBasicConfig.key
+  public attr = { ...chartInitConfig, w: 600, h: 300, zIndex: -1 }
+  public chartConfig = cloneDeep(TablesBasicConfig)
+  public option = cloneDeep(option)
+}
diff --git a/src/packages/components/Tables/Tables/TablesBasic/config.vue b/src/packages/components/Tables/Tables/TablesBasic/config.vue
new file mode 100644
index 00000000..10b06699
--- /dev/null
+++ b/src/packages/components/Tables/Tables/TablesBasic/config.vue
@@ -0,0 +1,156 @@
+<template>
+  <collapse-item name="表格设置" :expanded="true">
+    <setting-item-box :alone="true" name="对齐方式">
+      <setting-item  :alone="true">
+        <n-select v-model:value="optionData.align" size="small" 
+        :options="[
+          {label:'靠左',value:'left'},{label:'居中',value:'center'},{label:'靠右',value:'right'}
+        ]" />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box :alone="false" name="分页设置">
+      <setting-item  name="默认页码" :alone="true">
+        <n-input-number v-model:value="optionData.pagination.page" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+      <setting-item  name="分页" :alone="true">
+        <n-select v-model:value="optionData.pagination.pageSize" size="small" 
+        :options="page" />
+      </setting-item>
+    </setting-item-box>
+    <setting-item-box :alone="false" name="表格数据">
+      <SettingItem name="表头名称" class="form_name">
+        <div style="width: 260px">
+          <n-input v-model:value="header"  size="small" placeholder="表头数据(英文','分割)"></n-input>
+        </div>
+      </SettingItem>
+    </setting-item-box>
+    <setting-item-box :alone="false" name="表格样式">
+      <SettingItem name="显示边框" :alone="true">
+        <n-select v-model:value="(optionData as any).style.border" size="small"
+                  :options="borderFlag" />
+      </SettingItem>
+      <SettingItem name="底部边框" :alone="true">
+        <n-select v-model:value="(optionData as any).style.bottomBordered" size="small"
+                  :options="bottom_borderedFlag" />
+      </SettingItem>
+      <SettingItem name="列分割线" :alone="true">
+        <n-select v-model:value="(optionData as any).style.singleLine" size="small"
+                  :options="columnFlag" />
+      </SettingItem>
+      <SettingItem name="行分割线" :alone="true">
+        <n-select v-model:value="(optionData as any).style.singleColumn" size="small"
+                  :options="lineFlag" />
+      </SettingItem>
+      <SettingItem name="斑马条纹" :alone="true">
+        <n-select v-model:value="(optionData as any).style.striped" size="small"
+                  :options="stripedFlag" />
+      </SettingItem>
+      <setting-item  name="字体大小" :alone="true">
+        <n-input-number v-model:value="optionData.style.fontSize" :min="12" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+      <setting-item  name="边框宽度" :alone="true">
+        <n-input-number v-model:value="optionData.style.borderWidth" :min="0" size="small" placeholder="字体大小"></n-input-number>
+      </setting-item>
+      <setting-item  name="边框颜色" :alone="true">
+        <n-color-picker
+            size="small"
+            :modes="['rgb']"
+            v-model:value="optionData.style.borderColor"
+        ></n-color-picker>
+      </setting-item>
+      <setting-item  name="边框样式" :alone="true">
+        <n-select v-model:value="optionData.style.borderStyle" size="small"
+                  :options="borderStyleFlag" />
+      </setting-item>
+      <SettingItem name="表格搜索" :alone="true">
+        <n-select v-model:value="optionData.inputShow" size="small"
+                  :options="inputSelect" />
+      </SettingItem>
+    </setting-item-box>
+  </collapse-item>
+</template>
+
+<script setup lang="ts">
+import { PropType,watch,ref } from 'vue';
+import { option } from './config';
+
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting';
+
+const page = [
+  {label:'2',value:2},
+  {label:'5',value:5},
+  {label:'10',value:10},
+  {label:'15',value:15},
+  {label:'30',value:30}
+]
+const borderFlag = [
+  {label:'显示',value:'on'},
+  {label:'不显示',value:'off'}
+]
+const columnFlag = [
+  {label:'显示',value:'off'},
+  {label:'不显示',value:'on'}
+]
+const lineFlag = [
+  {label:'显示',value:'off'},
+  {label:'不显示',value:'on'}
+]
+const bottom_borderedFlag = [
+  {label:'显示',value:'on'},
+  {label:'不显示',value:'off'}
+]
+const stripedFlag = [
+  {label:'显示',value:'on'},
+  {label:'不显示',value:'off'}
+]
+const borderStyleFlag = [
+  {label:'实线边框',value:'solid'},
+  {label:'虚线边框',value:'dashed'},
+  {label:'点状边框',value:'dotted'},
+  {label:'双线边框',value:'double'}
+]
+const inputSelect = [
+  {label:'停用',value:'none'},
+  {label:'启用',value:'flex'}
+]
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+
+const header = ref();
+const median = ref<string[]>([])
+props.optionData.dataset.dimensions.forEach(item=>{
+  median.value.push(item.title);
+})
+
+//转string
+watch(
+    () => props.optionData,
+    () => {
+      median.value = [];
+      props.optionData.dataset.dimensions.forEach(item=>{
+        median.value.push(item.title);
+      })
+      header.value = median.value.toString()
+    },
+    {
+      deep: false,
+      immediate: true
+    }
+)
+
+//更新columns
+watch([header], ([headerNew], [headerOld]) => {
+  if (headerNew !== headerOld) {
+    headerNew.split(',').forEach((item:string,index:number)=>{
+      if(index+1 <= props.optionData.dataset.dimensions.length){
+        props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index]
+      }
+    })
+  }
+})
+
+</script>
diff --git a/src/packages/components/Tables/Tables/TablesBasic/data.json b/src/packages/components/Tables/Tables/TablesBasic/data.json
new file mode 100644
index 00000000..6d671fb6
--- /dev/null
+++ b/src/packages/components/Tables/Tables/TablesBasic/data.json
@@ -0,0 +1,60 @@
+{
+    "dimensions":[
+        {
+            "title": "产品名称",
+            "key": "productName"
+          },
+          {
+            "title": "产品销量（万）",
+            "key": "totalSum"
+          },
+          {
+            "title": "销售额（万）",
+            "key": "totalAmount"
+          }
+    ],
+    "source":[
+        {
+            "key": 0,
+            "productName": "产品A1",
+            "totalSum": 10,
+            "totalAmount": 10
+        },
+        {
+            "key": 1,
+            "productName": "产品B1",
+            "totalSum": 10,
+            "totalAmount": 10
+        },
+        {
+            "key": 2,
+            "productName": "产品C1",
+            "totalSum": 10,
+            "totalAmount": 10
+        },
+        {
+            "key": 3,
+            "productName": "产品D1",
+            "totalSum": 10,
+            "totalAmount": 10
+        },
+        {
+            "key": 4,
+            "productName": "产品A2",
+            "totalSum": 10,
+            "totalAmount": 10
+        },
+        {
+            "key": 5,
+            "productName": "产品D2",
+            "totalSum": 10,
+            "totalAmount": 10
+        },
+        {
+            "key": 6,
+            "productName": "产品A3",
+            "totalSum": 10,
+            "totalAmount": 10
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.ts b/src/packages/components/Tables/Tables/TablesBasic/index.ts
new file mode 100644
index 00000000..5abe033a
--- /dev/null
+++ b/src/packages/components/Tables/Tables/TablesBasic/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const TablesBasicConfig: ConfigType = {
+  key: 'TablesBasic',
+  chartKey: 'VTablesBasic',
+  conKey: 'VCTablesBasic',
+  title: '基础表格',
+  category: ChatCategoryEnum.TABLE,
+  categoryName: ChatCategoryEnumName.TABLE,
+  package: PackagesCategoryEnum.TABLES,
+  chartFrame: ChartFrameEnum.COMMON,
+  image: 'tables_list.png'
+}
diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.vue b/src/packages/components/Tables/Tables/TablesBasic/index.vue
new file mode 100644
index 00000000..5dcd2901
--- /dev/null
+++ b/src/packages/components/Tables/Tables/TablesBasic/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="go-tables-basic">
+    <n-input v-model:value="inputData"
+             placeholder="请输入信息"
+             :style="`display:${option.inputShow}`"
+             style="margin-bottom: 5px;float:right;width: 240px" />
+    <n-data-table :style="`
+      width:${w}px;
+      height:${h}px;
+      font-size:${option.style.fontSize}px;
+      border-width:${option.style.border === 'on'?option.style.borderWidth:0}px;
+      border-color:${option.style.borderColor};
+      border-style:${option.style.borderStyle}`"
+                  :bordered="option.style.border === 'on'"
+                  :single-column="option.style.singleColumn === 'on'"
+                  :single-line="option.style.singleLine === 'on'"
+                  :bottom-bordered="option.style.bottomBordered === 'on'"
+                  :striped="option.style.striped === 'on'"
+                  :max-height="h"
+                  size="small"
+                  :columns="option.dataset.dimensions"
+                  :data="filterData"
+                  :pagination="pagination"
+                  />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed,PropType, toRefs, watch, reactive,ref } from 'vue';
+import { CreateComponentType } from '@/packages/index.d'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+//查询字段
+const inputData = ref('');
+//前台过滤
+const filterData = computed(()=>{
+    return option?.dataset?.source?.filter((item:any)=>{
+      return Object.values(item).some(val=>{
+        return String(val).toLowerCase().includes(inputData.value.toLowerCase())
+      })
+    })
+})
+
+const {
+  align,
+  pagination
+} = toRefs(
+  props.chartConfig.option
+) 
+pagination.value.onChange = (page: number) => {
+  pagination.value.page = page
+}
+
+const { w, h } = toRefs(props.chartConfig.attr)
+
+const option = reactive({
+  dataset : props.chartConfig.option.dataset,
+  style : props.chartConfig.option.style,
+  inputShow : props.chartConfig.option.inputShow
+})
+
+watch(
+    () => props.chartConfig.option.dataset,
+    (newData:any)=>{
+      option.dataset = newData;
+      option?.dataset?.dimensions?.forEach((header: any) => {
+            //对齐方式更新
+            header.align = align.value;
+      });
+    },
+    {
+      immediate:true,
+      deep:true
+    }
+)
+
+</script>
+
+<style lang="scss" scoped>
+@include go('tables-basic') {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+</style>
diff --git a/src/packages/components/Tables/Tables/index.ts b/src/packages/components/Tables/Tables/index.ts
index dbad93ec..45ca3a63 100644
--- a/src/packages/components/Tables/Tables/index.ts
+++ b/src/packages/components/Tables/Tables/index.ts
@@ -1,4 +1,5 @@
 import { TableListConfig } from './TableList'
 import { TableScrollBoardConfig } from './TableScrollBoard'
+import { TablesBasicConfig } from "./TablesBasic/index";
 
-export default [TableListConfig, TableScrollBoardConfig]
+export default [TableListConfig, TableScrollBoardConfig,TablesBasicConfig]

From 4c13dc3184b5a053201b1de5231940781f608072 Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Tue, 1 Aug 2023 09:16:54 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Charts/COMBINATIONS/BarLine/config.ts     | 76 ++++++++++++++++
 .../Charts/COMBINATIONS/BarLine/config.vue    | 89 +++++++++++++++++++
 .../Charts/COMBINATIONS/BarLine/data.json     | 40 +++++++++
 .../Charts/COMBINATIONS/BarLine/index.ts      | 16 ++++
 .../Charts/COMBINATIONS/BarLine/index.vue     | 68 ++++++++++++++
 .../components/Charts/COMBINATIONS/index.ts   |  3 +
 src/packages/components/Charts/index.d.ts     |  2 +
 src/packages/components/Charts/index.ts       |  3 +-
 8 files changed, 296 insertions(+), 1 deletion(-)
 create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/config.ts
 create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/config.vue
 create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/data.json
 create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
 create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/index.vue
 create mode 100644 src/packages/components/Charts/COMBINATIONS/index.ts

diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts
new file mode 100644
index 00000000..b62c4bab
--- /dev/null
+++ b/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts
@@ -0,0 +1,76 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { BarLineConfig } from './index'
+import { CreateComponentType } from '@/packages/index.d'
+import cloneDeep from 'lodash/cloneDeep'
+import dataJson from './data.json'
+
+
+export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+// 柱状折线组合图 分别定义series
+// 写死name可以定义legend显示的名称
+export const barSeriesItem = {
+    type: 'bar',
+    barWidth: 15,
+    label: {
+        show: true,
+        position: 'top',
+        color: '#fff',
+        fontSize: 12
+    },
+    itemStyle: {
+        color: null,
+        borderRadius: 2
+    }
+}
+
+export const lineSeriesItem = {
+    type: 'line',
+    symbol: "circle",
+    label: {
+        show: true,
+        position: 'top',
+        color: '#fff',
+        fontSize: 12
+    },
+    symbolSize: 5, //设定实心点的大小
+    itemStyle: {
+        color: '#FFE47A',
+        borderWidth: 1
+    },
+    lineStyle: {
+        type: 'solid',
+        width: 3,
+        color: null
+    }
+}
+
+export const option = {
+    tooltip: {
+        show: true,
+        trigger: 'axis',
+        axisPointer: {
+            show: true,
+            type: 'shadow'
+        }
+    },
+    legend: {
+        data:null
+    },
+    xAxis: {
+        show: true,
+        type: 'category'
+    },
+    yAxis: {
+        show: true,
+        type: 'value'
+    },
+    dataset: { ...dataJson },
+    series: [barSeriesItem, lineSeriesItem]
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+    public key = BarLineConfig.key
+    public chartConfig = cloneDeep(BarLineConfig)
+    // 图表配置项
+    public option = echartOptionProfixHandle(option, includes)
+}
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue b/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue
new file mode 100644
index 00000000..b2f7c476
--- /dev/null
+++ b/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue
@@ -0,0 +1,89 @@
+<template>
+  <!-- Echarts 全局设置 -->
+  <global-setting :optionData="optionData"></global-setting>
+  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`${item.type=='bar' ? '柱状图' : '折线图'}`" :expanded="true">
+    <SettingItemBox name="图形" v-if="item.type=='bar'">
+      <SettingItem name="宽度">
+        <n-input-number
+            v-model:value="item.barWidth"
+            :min="1"
+            :max="100"
+            size="small"
+            placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="圆角">
+        <n-input-number v-model:value="item.itemStyle.borderRadius" :min="0" size="small"></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="线条" v-if="item.type=='line'">
+      <SettingItem name="宽度">
+        <n-input-number
+            v-model:value="item.lineStyle.width"
+            :min="1"
+            :max="100"
+            size="small"
+            placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+      <SettingItem name="类型">
+        <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
+      </SettingItem>
+    </SettingItemBox>
+    <SettingItemBox name="实心点" v-if="item.type=='line'">
+      <SettingItem name="大小">
+        <n-input-number
+            v-model:value="item.symbolSize"
+            :min="1"
+            :max="100"
+            size="small"
+            placeholder="自动计算"
+        ></n-input-number>
+      </SettingItem>
+    </SettingItemBox>
+    <setting-item-box name="标签">
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.label.show" size="small" />
+          <n-text>展示标签</n-text>
+        </n-space>
+      </setting-item>
+      <setting-item name="大小">
+        <n-input-number v-model:value="item.label.fontSize" size="small" :min="1"></n-input-number>
+      </setting-item>
+      <setting-item name="tip颜色">
+        <n-color-picker size="small" :modes="['hex']" v-model:value="item.label.color"></n-color-picker>
+      </setting-item>
+      <setting-item name="位置">
+        <n-select
+            v-model:value="item.label.position"
+            :options="[
+            { label: 'top', value: 'top' },
+            { label: 'left', value: 'left' },
+            { label: 'right', value: 'right' },
+            { label: 'bottom', value: 'bottom' }
+          ]"
+        />
+      </setting-item>
+    </setting-item-box>
+  </CollapseItem>
+</template>
+
+<script setup lang="ts">
+import { PropType, computed } from 'vue'
+import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { lineConf } from '@/packages/chartConfiguration/echarts'
+import { GlobalThemeJsonType } from '@/settings/chartThemes'
+
+const props = defineProps({
+  optionData: {
+    type: Object as PropType<GlobalThemeJsonType>,
+    required: true
+  }
+})
+
+const seriesList = computed(() => {
+  console.log(props.optionData);
+  return props.optionData.series
+})
+</script>
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/data.json b/src/packages/components/Charts/COMBINATIONS/BarLine/data.json
new file mode 100644
index 00000000..0bd2f36e
--- /dev/null
+++ b/src/packages/components/Charts/COMBINATIONS/BarLine/data.json
@@ -0,0 +1,40 @@
+{
+  "dimensions": ["product", "data1", "data2"],
+  "source": [
+    {
+      "product": "1月",
+      "data1": 104,
+      "data2": 30
+    },
+    {
+      "product": "2月",
+      "data1": 56,
+      "data2": 56
+    },
+    {
+      "product": "3月",
+      "data1": 136,
+      "data2": 36
+    },
+    {
+      "product": "4月",
+      "data1": 86,
+      "data2": 6
+    },
+    {
+      "product": "5月",
+      "data1": 98,
+      "data2": 10
+    },
+    {
+      "product": "6月",
+      "data1": 86,
+      "data2": 70
+    },
+    {
+      "product": "7月",
+      "data1": 77,
+      "data2": 57
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
new file mode 100644
index 00000000..73e37e66
--- /dev/null
+++ b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
@@ -0,0 +1,16 @@
+// 公共类型声明
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+// 当前[信息模块]分类声明
+import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
+
+export const BarLineConfig: ConfigType = {
+    key: 'BarLine',
+    chartKey: 'VBarLine',
+    conKey: 'VCBarLine',
+    title: '柱状加折线图',
+    category: ChatCategoryEnum.COMBINATION,
+    categoryName: ChatCategoryEnumName.COMBINATION,
+    package: PackagesCategoryEnum.CHARTS,
+    chartFrame: ChartFrameEnum.ECHARTS,
+    image: 'bar_x.png'
+}
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue b/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue
new file mode 100644
index 00000000..fb239a97
--- /dev/null
+++ b/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()"
+           autoresize></v-chart>
+</template>
+
+<script setup lang="ts">
+import {ref, computed, watch, PropType, nextTick} from 'vue'
+import VChart from 'vue-echarts'
+import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+//引入柱状图 折线图
+import { BarChart, LineChart } from 'echarts/charts'
+import config, { includes, barSeriesItem, lineSeriesItem } from './config'
+import { mergeTheme } from '@/packages/public/chart'
+import { useChartDataFetch } from '@/hooks'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { isPreview } from '@/utils'
+import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
+
+const props = defineProps({
+  themeSetting: {
+    type: Object,
+    required: true
+  },
+  themeColor: {
+    type: Object,
+    required: true
+  },
+  chartConfig: {
+    type: Object as PropType<config>,
+    required: true
+  }
+})
+
+const initOptions = useCanvasInitOptions(props.chartConfig.option, props.themeSetting)
+
+use([DatasetComponent, CanvasRenderer, BarChart, LineChart, GridComponent, TooltipComponent, LegendComponent])
+
+const replaceMergeArr = ref<string[]>()
+
+const option = computed(() => {
+  return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
+})
+
+watch(
+    () => props.chartConfig.option.dataset,
+    (newData, oldData) => {
+      if (newData.dimensions.length !== oldData.dimensions.length) {
+        const seriesArr = []
+        for (let i = 0; i < newData.dimensions.length - 1; i++) {
+          seriesArr.push(barSeriesItem, lineSeriesItem)
+        }
+        replaceMergeArr.value = ['series']
+        props.chartConfig.option.series = seriesArr
+        nextTick(() => {
+          replaceMergeArr.value = []
+        })
+      }
+    },
+    {
+      deep: false
+    }
+)
+
+
+const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
+</script>
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/index.ts b/src/packages/components/Charts/COMBINATIONS/index.ts
new file mode 100644
index 00000000..3a131a97
--- /dev/null
+++ b/src/packages/components/Charts/COMBINATIONS/index.ts
@@ -0,0 +1,3 @@
+import { BarLineConfig } from './BarLine/index'
+
+export default [BarLineConfig]
\ No newline at end of file
diff --git a/src/packages/components/Charts/index.d.ts b/src/packages/components/Charts/index.d.ts
index c033c296..0865fd4b 100644
--- a/src/packages/components/Charts/index.d.ts
+++ b/src/packages/components/Charts/index.d.ts
@@ -5,6 +5,7 @@ export enum ChatCategoryEnum {
   LINE = 'Lines',
   SCATTER = 'Scatters',
   MAP = 'Maps',
+  COMBINATION = 'COMBINATION',
   MORE = 'Mores'
 }
 
@@ -14,5 +15,6 @@ export enum ChatCategoryEnumName {
   LINE = '折线图',
   SCATTER = '散点图',
   MAP = '地图',
+  COMBINATION = '组合图',
   MORE = '更多'
 }
diff --git a/src/packages/components/Charts/index.ts b/src/packages/components/Charts/index.ts
index 20ffcc66..63e5d657 100644
--- a/src/packages/components/Charts/index.ts
+++ b/src/packages/components/Charts/index.ts
@@ -3,6 +3,7 @@ import Pies from './Pies'
 import Lines from './Lines'
 import Scatters from './Scatters'
 import Mores from './Mores'
+import COMBINATIONS from "./COMBINATIONS";
 import Maps from './Maps'
 
-export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps, ...Mores]
+export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps,...COMBINATIONS, ...Mores]

From a08e27da2d27c8b479e8749080fdd6f0c2b2e5c3 Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Tue, 1 Aug 2023 09:32:55 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Inputs/InputsPagination/config.ts         | 26 ++++++++
 .../Inputs/InputsPagination/config.vue        | 35 ++++++++++
 .../Inputs/InputsPagination/index.ts          | 14 ++++
 .../Inputs/InputsPagination/index.vue         | 66 +++++++++++++++++++
 .../Inputs/InputsPagination/interact.ts       | 32 +++++++++
 .../components/Informations/Inputs/index.ts   |  3 +-
 6 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/config.ts
 create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/config.vue
 create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/index.ts
 create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/index.vue
 create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/interact.ts

diff --git a/src/packages/components/Informations/Inputs/InputsPagination/config.ts b/src/packages/components/Informations/Inputs/InputsPagination/config.ts
new file mode 100644
index 00000000..7d73e5a1
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsPagination/config.ts
@@ -0,0 +1,26 @@
+import cloneDeep from 'lodash/cloneDeep'
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { chartInitConfig } from '@/settings/designSetting'
+import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
+import { interactActions, ComponentInteractEventEnum } from './interact'
+import {InputsPaginationConfig} from "./index";
+
+export const option = {
+    // 时间组件展示类型，必须和 interactActions 中定义的数据一致
+    [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATA,
+    // 默认值
+    pageValue:1,
+    sizeValue:[2,4,8,10,20],
+    pageSize:4,
+    // 暴露配置内容给用户
+    dataset: 10
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+    public key = InputsPaginationConfig.key
+    public attr = { ...chartInitConfig, w: 395, h: 32, zIndex: -1 }
+    public chartConfig = cloneDeep(InputsPaginationConfig)
+    public interactActions = interactActions
+    public option = cloneDeep(option)
+}
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsPagination/config.vue b/src/packages/components/Informations/Inputs/InputsPagination/config.vue
new file mode 100644
index 00000000..3599781d
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsPagination/config.vue
@@ -0,0 +1,35 @@
+<template>
+    <collapse-item name="分页配置" :expanded="true">
+      <setting-item-box :alone="false" name="分页设置">
+        <setting-item  name="默认页码" :alone="true">
+          <n-input-number v-model:value="optionData.pageValue" size="small" placeholder="字体大小"></n-input-number>
+        </setting-item>
+        <setting-item  name="分页" :alone="true">
+          <n-select v-model:value="optionData.pageSize" size="small"
+                    :options="page" />
+        </setting-item>
+        <setting-item  name="页数" :alone="true">
+          <n-input-number v-model:value="optionData.dataset" size="small" placeholder="字体大小"></n-input-number>
+        </setting-item>
+      </setting-item-box>
+    </collapse-item>
+</template>
+<script setup lang="ts">
+import { PropType } from 'vue'
+import {CollapseItem, SettingItem, SettingItemBox} from '@/components/Pages/ChartItemSetting'
+import { option } from './config'
+
+const page = [
+  {label:'2',value:2},
+  {label:'4',value:4},
+  {label:'8',value:8},
+  {label:'10',value:10},
+  {label:'20',value:20}
+]
+defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+</script>
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsPagination/index.ts b/src/packages/components/Informations/Inputs/InputsPagination/index.ts
new file mode 100644
index 00000000..cfc3b912
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsPagination/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const InputsPaginationConfig: ConfigType = {
+    key: 'InputsPagination',
+    chartKey: 'VInputsPagination',
+    conKey: 'VCInputsPagination',
+    title: '分页',
+    category: ChatCategoryEnum.INPUTS,
+    categoryName: ChatCategoryEnumName.INPUTS,
+    package: PackagesCategoryEnum.INFORMATIONS,
+    chartFrame: ChartFrameEnum.STATIC,
+    image: 'inputs_select.png'
+}
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsPagination/index.vue b/src/packages/components/Informations/Inputs/InputsPagination/index.vue
new file mode 100644
index 00000000..2dc81c75
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsPagination/index.vue
@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <n-pagination
+        @on-update:page="onChange" :style="`width:${w}px;`"
+        v-model:page="option.value.pageValue"
+        :page-count="option.value.dataset"
+        :page-slot="7"
+        show-size-picker
+        :page-sizes="option.value.sizeValue"
+        v-model:page-size="option.value.pageSize"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { PropType, toRefs, shallowReactive, watch } from 'vue'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartInteract } from '@/hooks'
+import { InteractEventOn } from '@/enums/eventEnum'
+import { ComponentInteractParamsEnum } from './interact'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+const { w, h } = toRefs(props.chartConfig.attr)
+const option = shallowReactive({
+  value: {
+    pageValue: props.chartConfig.option.pageValue,
+    dataset:props.chartConfig.option.dataset,
+    sizeValue:props.chartConfig.option.sizeValue,
+    pageSize:props.chartConfig.option.pageSize
+  }
+})
+
+const onChange = (v: number,v2:number) => {
+  if(v == undefined) return;
+  // 存储到联动数据
+  useChartInteract(
+      props.chartConfig,
+      useChartEditStore,
+      {
+        [ComponentInteractParamsEnum.DATA]: v ,
+        [ComponentInteractParamsEnum.DATA2]:v2
+      },
+      InteractEventOn.CHANGE
+  )
+}
+
+// 手动更新
+watch(
+    () => props.chartConfig.option,
+    (newData: any) => {
+      option.value = newData
+      onChange(newData.pageValue,newData.pageSize)
+    },
+    {
+      immediate: true,
+      deep: true
+    }
+)
+</script>
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsPagination/interact.ts b/src/packages/components/Informations/Inputs/InputsPagination/interact.ts
new file mode 100644
index 00000000..acc1453f
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsPagination/interact.ts
@@ -0,0 +1,32 @@
+import { InteractEventOn, InteractActionsType } from '@/enums/eventEnum'
+
+// 时间组件类型
+export enum ComponentInteractEventEnum {
+    DATA = 'data'
+}
+
+// 联动参数
+export enum ComponentInteractParamsEnum {
+    DATA = 'data',
+    DATA2 = 'data2'
+}
+
+// 定义组件触发回调事件
+export const interactActions: InteractActionsType[] = [
+    {
+        interactType: InteractEventOn.CHANGE,
+        interactName: '选择完成',
+        componentEmitEvents: {
+            [ComponentInteractEventEnum.DATA]: [
+                {
+                    value: ComponentInteractParamsEnum.DATA,
+                    label: '页数'
+                },
+                {
+                    value: ComponentInteractParamsEnum.DATA2,
+                    label: '每页条数'
+                }
+            ]
+        }
+    }
+]
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/index.ts b/src/packages/components/Informations/Inputs/index.ts
index 1f4f22a7..bea83789 100644
--- a/src/packages/components/Informations/Inputs/index.ts
+++ b/src/packages/components/Informations/Inputs/index.ts
@@ -1,5 +1,6 @@
 import { InputsDateConfig } from './InputsDate/index'
 import { InputsSelectConfig } from './InputsSelect/index'
 import { InputsTabConfig } from './InputsTab/index'
+import { InputsPaginationConfig } from "./InputsPagination/index";
 
-export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig]
+export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsPaginationConfig]

From 32c5b216f26b0264c6572887351fc6338578a575 Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Tue, 1 Aug 2023 16:44:30 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/COMBINATIONS/BarLine/index.ts | 2 +-
 src/packages/components/Charts/index.d.ts                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
index 73e37e66..1c236ed2 100644
--- a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
+++ b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
@@ -8,7 +8,7 @@ export const BarLineConfig: ConfigType = {
     chartKey: 'VBarLine',
     conKey: 'VCBarLine',
     title: '柱状加折线图',
-    category: ChatCategoryEnum.COMBINATION,
+    category: ChatCategoryEnum.COMBINATIONS,
     categoryName: ChatCategoryEnumName.COMBINATION,
     package: PackagesCategoryEnum.CHARTS,
     chartFrame: ChartFrameEnum.ECHARTS,
diff --git a/src/packages/components/Charts/index.d.ts b/src/packages/components/Charts/index.d.ts
index 0865fd4b..2f88e1df 100644
--- a/src/packages/components/Charts/index.d.ts
+++ b/src/packages/components/Charts/index.d.ts
@@ -5,7 +5,7 @@ export enum ChatCategoryEnum {
   LINE = 'Lines',
   SCATTER = 'Scatters',
   MAP = 'Maps',
-  COMBINATION = 'COMBINATION',
+  COMBINATIONS = 'COMBINATIONS',
   MORE = 'Mores'
 }
 

From 3c1ea60f21c247e52f57c290220aa9aba00cfafc Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Thu, 3 Aug 2023 15:38:47 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8DNaive-UI=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E5=9B=BE=E9=A2=84=E8=A7=88=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/Mores/Process/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/components/Charts/Mores/Process/index.vue b/src/packages/components/Charts/Mores/Process/index.vue
index 5faf79bf..f4ce6212 100644
--- a/src/packages/components/Charts/Mores/Process/index.vue
+++ b/src/packages/components/Charts/Mores/Process/index.vue
@@ -3,7 +3,7 @@
     :type="type"
     :height="h"
     :processing="processing"
-    :percentage="option.dataset"
+    :percentage="dataset"
     :indicator-placement="indicatorPlacement"
     :color="color"
     :rail-color="railColor"
@@ -15,7 +15,7 @@
         fontSize: `${indicatorTextSize}px`
       }"
     >
-      {{ option.dataset }} {{ unit }}
+      {{ dataset }} {{ unit }}
     </n-text>
   </n-progress>
 </template>

From b75cbea6cc522e96c143abb1efd99b5cbd92c648 Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Thu, 13 Jul 2023 11:23:51 +0800
Subject: [PATCH 17/25] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0components=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useLifeHandler.hook.ts                              | 4 ++--
 .../ChartEvent/components/ChartEventBaseHandle/index.vue      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hooks/useLifeHandler.hook.ts b/src/hooks/useLifeHandler.hook.ts
index 2412a79a..d17184d0 100644
--- a/src/hooks/useLifeHandler.hook.ts
+++ b/src/hooks/useLifeHandler.hook.ts
@@ -48,10 +48,10 @@ export const useLifeHandler = (chartConfig: CreateComponentType | CreateComponen
   try {
     return new Function(`
       return (
-        async function(mouseEvent){
+        async function(components,mouseEvent){
           ${fnStr}
         }
-      )`)()
+      )`)().bind(undefined,components)
   } catch (error) {
     console.error(error)
   }
diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventBaseHandle/index.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventBaseHandle/index.vue
index cc2a7525..81ac710f 100644
--- a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventBaseHandle/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventBaseHandle/index.vue
@@ -16,7 +16,7 @@
         <p>
           <span class="func-annotate">// {{ EventTypeName[eventName] }}</span>
           <br />
-          <span class="func-keyword">async {{ eventName }}</span> (mouseEvent) {
+          <span class="func-keyword">async {{ eventName }}</span> (mouseEvent,components) {
         </p>
         <p class="go-ml-4">
           <n-code :code="(targetData.events.baseEvent || {})[eventName] || ''" language="typescript"></n-code>
@@ -52,7 +52,7 @@
               <!-- 函数名称 -->
               <p class="go-pl-3">
                 <span class="func-keyword">async function &nbsp;&nbsp;</span>
-                <span class="func-keyNameWord">{{ eventName }}(mouseEvent)&nbsp;&nbsp;{</span>
+                <span class="func-keyNameWord">{{ eventName }}(mouseEvent,components)&nbsp;&nbsp;{</span>
               </p>
               <!-- 编辑主体 -->
               <monaco-editor v-model:modelValue="baseEvent[eventName]" height="480px" language="javascript" />

From d2ad32e08ecbd96075b6bdcb0cb5a7f0a3650197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Wed, 9 Aug 2023 09:28:48 +0800
Subject: [PATCH 18/25] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BEpoint=E7=9A=84=E5=80=BC=E5=B1=95=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/Maps/MapBase/config.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/packages/components/Charts/Maps/MapBase/config.ts b/src/packages/components/Charts/Maps/MapBase/config.ts
index 888fe6b7..dd020e50 100644
--- a/src/packages/components/Charts/Maps/MapBase/config.ts
+++ b/src/packages/components/Charts/Maps/MapBase/config.ts
@@ -84,7 +84,10 @@ export const option = {
         shadowColor: '#E1FFFF',
         shadowBlur: 10
       },
-      data: []
+      data: [],
+      encode: {
+        value: 2
+      }
     },
     {
       name: '区域',

From 39e735b29cc5ae8374db6ec3524d3a0366e33d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Fri, 11 Aug 2023 21:43:43 +0800
Subject: [PATCH 19/25] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BA=86?=
 =?UTF-8?q?=E4=B8=89=E7=BB=B4=E5=9C=B0=E7=90=83=E4=B8=8D=E8=83=BD=E8=A2=AB?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Three/ThreeEarth01/code/world/Basic.ts    | 125 +++++++++---------
 1 file changed, 63 insertions(+), 62 deletions(-)

diff --git a/src/packages/components/Decorates/Three/ThreeEarth01/code/world/Basic.ts b/src/packages/components/Decorates/Three/ThreeEarth01/code/world/Basic.ts
index bfe9d760..72284935 100644
--- a/src/packages/components/Decorates/Three/ThreeEarth01/code/world/Basic.ts
+++ b/src/packages/components/Decorates/Three/ThreeEarth01/code/world/Basic.ts
@@ -1,62 +1,63 @@
-/**
- * 创建 threejs 四大天王
- * 场景、相机、渲染器、控制器
- */
-
-import * as THREE from 'three'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
-
-export class Basic {
-  public scene!: THREE.Scene
-  public camera!: THREE.PerspectiveCamera
-  public renderer!: THREE.WebGLRenderer
-  public controls!: OrbitControls
-  public dom: HTMLElement
-
-  constructor(dom: HTMLElement) {
-    this.dom = dom
-    this.initScenes()
-    this.setControls()
-  }
-
-  /**
-   * 初始化场景
-   */
-  initScenes() {
-    this.scene = new THREE.Scene()
-
-    this.camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 100000)
-    this.camera.position.set(0, 30, -250)
-
-    this.renderer = new THREE.WebGLRenderer({
-      // canvas: this.dom,
-      alpha: true, // 透明
-      antialias: true // 抗锯齿
-    })
-    this.renderer.setPixelRatio(window.devicePixelRatio) // 设置屏幕像素比
-    this.renderer.setSize(window.innerWidth, window.innerHeight) // 设置渲染器宽高
-    this.dom.appendChild(this.renderer.domElement) // 添加到dom中
-  }
-
-  /**
-   * 设置控制器
-   */
-  setControls() {
-    // 鼠标控制      相机，渲染dom
-    this.controls = new OrbitControls(this.camera, this.renderer.domElement)
-
-    this.controls.autoRotateSpeed = 3
-    // 使动画循环使用时阻尼或自转 意思是否有惯性
-    this.controls.enableDamping = true
-    // 动态阻尼系数 就是鼠标拖拽旋转灵敏度
-    this.controls.dampingFactor = 0.05
-    // 是否可以缩放
-    this.controls.enableZoom = true
-    // 设置相机距离原点的最远距离
-    this.controls.minDistance = 100
-    // 设置相机距离原点的最远距离
-    this.controls.maxDistance = 300
-    // 是否开启右键拖拽
-    this.controls.enablePan = false
-  }
-}
+/**
+ * 创建 threejs 四大天王
+ * 场景、相机、渲染器、控制器
+ */
+
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+
+export class Basic {
+  public scene!: THREE.Scene
+  public camera!: THREE.PerspectiveCamera
+  public renderer!: THREE.WebGLRenderer
+  public controls!: OrbitControls
+  public dom: HTMLElement
+
+  constructor(dom: HTMLElement) {
+    this.dom = dom
+    this.initScenes()
+    this.setControls()
+  }
+
+  /**
+   * 初始化场景
+   */
+  initScenes() {
+    this.scene = new THREE.Scene()
+
+    this.camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 100000)
+    this.camera.position.set(0, 30, -250)
+
+    this.renderer = new THREE.WebGLRenderer({
+      // canvas: this.dom,
+      alpha: true, // 透明
+      antialias: true, // 抗锯齿
+      preserveDrawingBuffer: true
+    })
+    this.renderer.setPixelRatio(window.devicePixelRatio) // 设置屏幕像素比
+    this.renderer.setSize(window.innerWidth, window.innerHeight) // 设置渲染器宽高
+    this.dom.appendChild(this.renderer.domElement) // 添加到dom中
+  }
+
+  /**
+   * 设置控制器
+   */
+  setControls() {
+    // 鼠标控制      相机，渲染dom
+    this.controls = new OrbitControls(this.camera, this.renderer.domElement)
+
+    this.controls.autoRotateSpeed = 3
+    // 使动画循环使用时阻尼或自转 意思是否有惯性
+    this.controls.enableDamping = true
+    // 动态阻尼系数 就是鼠标拖拽旋转灵敏度
+    this.controls.dampingFactor = 0.05
+    // 是否可以缩放
+    this.controls.enableZoom = true
+    // 设置相机距离原点的最远距离
+    this.controls.minDistance = 100
+    // 设置相机距离原点的最远距离
+    this.controls.maxDistance = 300
+    // 是否开启右键拖拽
+    this.controls.enablePan = false
+  }
+}

From 541ce8a0835365e1a429469259404743be2ed900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Fri, 11 Aug 2023 22:20:32 +0800
Subject: [PATCH 20/25] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=9F=B1?=
 =?UTF-8?q?=E7=8A=B6=E5=9B=BE=20&=20=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E5=92=8C=E5=90=8D=E7=A7=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/chart/charts/bar_line.png   | Bin 0 -> 26552 bytes
 .../components/Charts/Bars/BarLine/config.ts  |  75 +++++++++++++++++
 .../{COMBINATIONS => Bars}/BarLine/config.vue |  50 ++++++------
 .../{COMBINATIONS => Bars}/BarLine/data.json  |   2 +-
 .../components/Charts/Bars/BarLine/index.ts   |  16 ++++
 .../{COMBINATIONS => Bars}/BarLine/index.vue  |  45 ++++++-----
 src/packages/components/Charts/Bars/index.ts  |  11 +--
 .../Charts/COMBINATIONS/BarLine/config.ts     |  76 ------------------
 .../Charts/COMBINATIONS/BarLine/index.ts      |  16 ----
 .../components/Charts/COMBINATIONS/index.ts   |   3 -
 src/packages/components/Charts/index.d.ts     |   1 -
 src/packages/components/Charts/index.ts       |   3 +-
 12 files changed, 151 insertions(+), 147 deletions(-)
 create mode 100644 src/assets/images/chart/charts/bar_line.png
 create mode 100644 src/packages/components/Charts/Bars/BarLine/config.ts
 rename src/packages/components/Charts/{COMBINATIONS => Bars}/BarLine/config.vue (71%)
 rename src/packages/components/Charts/{COMBINATIONS => Bars}/BarLine/data.json (99%)
 create mode 100644 src/packages/components/Charts/Bars/BarLine/index.ts
 rename src/packages/components/Charts/{COMBINATIONS => Bars}/BarLine/index.vue (65%)
 delete mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/config.ts
 delete mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
 delete mode 100644 src/packages/components/Charts/COMBINATIONS/index.ts

diff --git a/src/assets/images/chart/charts/bar_line.png b/src/assets/images/chart/charts/bar_line.png
new file mode 100644
index 0000000000000000000000000000000000000000..441fff93c36af67428469c6e2a90d5aab4ad6ec8
GIT binary patch
literal 26552
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

literal 0
HcmV?d00001

diff --git a/src/packages/components/Charts/Bars/BarLine/config.ts b/src/packages/components/Charts/Bars/BarLine/config.ts
new file mode 100644
index 00000000..4c6c1805
--- /dev/null
+++ b/src/packages/components/Charts/Bars/BarLine/config.ts
@@ -0,0 +1,75 @@
+import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
+import { BarLineConfig } from './index'
+import { CreateComponentType } from '@/packages/index.d'
+import cloneDeep from 'lodash/cloneDeep'
+import dataJson from './data.json'
+
+export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
+// 柱状折线组合图 分别定义series
+// 写死name可以定义legend显示的名称
+export const barSeriesItem = {
+  type: 'bar',
+  barWidth: 15,
+  label: {
+    show: true,
+    position: 'top',
+    color: '#fff',
+    fontSize: 12
+  },
+  itemStyle: {
+    color: null,
+    borderRadius: 2
+  }
+}
+
+export const lineSeriesItem = {
+  type: 'line',
+  symbol: 'circle',
+  label: {
+    show: true,
+    position: 'top',
+    color: '#fff',
+    fontSize: 12
+  },
+  symbolSize: 5, //设定实心点的大小
+  itemStyle: {
+    color: '#FFE47A',
+    borderWidth: 1
+  },
+  lineStyle: {
+    type: 'solid',
+    width: 3,
+    color: null
+  }
+}
+
+export const option = {
+  tooltip: {
+    show: true,
+    trigger: 'axis',
+    axisPointer: {
+      show: true,
+      type: 'shadow'
+    }
+  },
+  legend: {
+    data: null
+  },
+  xAxis: {
+    show: true,
+    type: 'category'
+  },
+  yAxis: {
+    show: true,
+    type: 'value'
+  },
+  dataset: { ...dataJson },
+  series: [barSeriesItem, lineSeriesItem]
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+  public key = BarLineConfig.key
+  public chartConfig = cloneDeep(BarLineConfig)
+  // 图表配置项
+  public option = echartOptionProfixHandle(option, includes)
+}
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue b/src/packages/components/Charts/Bars/BarLine/config.vue
similarity index 71%
rename from src/packages/components/Charts/COMBINATIONS/BarLine/config.vue
rename to src/packages/components/Charts/Bars/BarLine/config.vue
index b2f7c476..6a76ebdb 100644
--- a/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue
+++ b/src/packages/components/Charts/Bars/BarLine/config.vue
@@ -1,43 +1,48 @@
 <template>
   <!-- Echarts 全局设置 -->
   <global-setting :optionData="optionData"></global-setting>
-  <CollapseItem v-for="(item, index) in seriesList" :key="index" :name="`${item.type=='bar' ? '柱状图' : '折线图'}`" :expanded="true">
-    <SettingItemBox name="图形" v-if="item.type=='bar'">
+  <CollapseItem
+    v-for="(item, index) in seriesList"
+    :key="index"
+    :name="`${item.type == 'bar' ? '柱状图' : '折线图'}`"
+    :expanded="true"
+  >
+    <SettingItemBox name="图形" v-if="item.type == 'bar'">
       <SettingItem name="宽度">
         <n-input-number
-            v-model:value="item.barWidth"
-            :min="1"
-            :max="100"
-            size="small"
-            placeholder="自动计算"
+          v-model:value="item.barWidth"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
         ></n-input-number>
       </SettingItem>
       <SettingItem name="圆角">
         <n-input-number v-model:value="item.itemStyle.borderRadius" :min="0" size="small"></n-input-number>
       </SettingItem>
     </SettingItemBox>
-    <SettingItemBox name="线条" v-if="item.type=='line'">
+    <SettingItemBox name="线条" v-if="item.type == 'line'">
       <SettingItem name="宽度">
         <n-input-number
-            v-model:value="item.lineStyle.width"
-            :min="1"
-            :max="100"
-            size="small"
-            placeholder="自动计算"
+          v-model:value="item.lineStyle.width"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
         ></n-input-number>
       </SettingItem>
       <SettingItem name="类型">
         <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
       </SettingItem>
     </SettingItemBox>
-    <SettingItemBox name="实心点" v-if="item.type=='line'">
+    <SettingItemBox name="实心点" v-if="item.type == 'line'">
       <SettingItem name="大小">
         <n-input-number
-            v-model:value="item.symbolSize"
-            :min="1"
-            :max="100"
-            size="small"
-            placeholder="自动计算"
+          v-model:value="item.symbolSize"
+          :min="1"
+          :max="100"
+          size="small"
+          placeholder="自动计算"
         ></n-input-number>
       </SettingItem>
     </SettingItemBox>
@@ -56,8 +61,8 @@
       </setting-item>
       <setting-item name="位置">
         <n-select
-            v-model:value="item.label.position"
-            :options="[
+          v-model:value="item.label.position"
+          :options="[
             { label: 'top', value: 'top' },
             { label: 'left', value: 'left' },
             { label: 'right', value: 'right' },
@@ -83,7 +88,6 @@ const props = defineProps({
 })
 
 const seriesList = computed(() => {
-  console.log(props.optionData);
   return props.optionData.series
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/data.json b/src/packages/components/Charts/Bars/BarLine/data.json
similarity index 99%
rename from src/packages/components/Charts/COMBINATIONS/BarLine/data.json
rename to src/packages/components/Charts/Bars/BarLine/data.json
index 0bd2f36e..4b6ee3b4 100644
--- a/src/packages/components/Charts/COMBINATIONS/BarLine/data.json
+++ b/src/packages/components/Charts/Bars/BarLine/data.json
@@ -37,4 +37,4 @@
       "data2": 57
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/packages/components/Charts/Bars/BarLine/index.ts b/src/packages/components/Charts/Bars/BarLine/index.ts
new file mode 100644
index 00000000..03ff28ff
--- /dev/null
+++ b/src/packages/components/Charts/Bars/BarLine/index.ts
@@ -0,0 +1,16 @@
+// 公共类型声明
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+// 当前[信息模块]分类声明
+import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
+
+export const BarLineConfig: ConfigType = {
+  key: 'BarLine',
+  chartKey: 'VBarLine',
+  conKey: 'VCBarLine',
+  title: '柱状图 & 折线图',
+  category: ChatCategoryEnum.BAR,
+  categoryName: ChatCategoryEnumName.BAR,
+  package: PackagesCategoryEnum.CHARTS,
+  chartFrame: ChartFrameEnum.ECHARTS,
+  image: 'bar_line.png'
+}
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue b/src/packages/components/Charts/Bars/BarLine/index.vue
similarity index 65%
rename from src/packages/components/Charts/COMBINATIONS/BarLine/index.vue
rename to src/packages/components/Charts/Bars/BarLine/index.vue
index fb239a97..2f221a55 100644
--- a/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue
+++ b/src/packages/components/Charts/Bars/BarLine/index.vue
@@ -1,10 +1,16 @@
 <template>
-  <v-chart ref="vChartRef" :init-options="initOptions" :theme="themeColor" :option="option" :manual-update="isPreview()"
-           autoresize></v-chart>
+  <v-chart
+    ref="vChartRef"
+    :init-options="initOptions"
+    :theme="themeColor"
+    :option="option"
+    :manual-update="isPreview()"
+    autoresize
+  ></v-chart>
 </template>
 
 <script setup lang="ts">
-import {ref, computed, watch, PropType, nextTick} from 'vue'
+import { ref, computed, watch, PropType, nextTick } from 'vue'
 import VChart from 'vue-echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { use } from 'echarts/core'
@@ -44,25 +50,24 @@ const option = computed(() => {
 })
 
 watch(
-    () => props.chartConfig.option.dataset,
-    (newData, oldData) => {
-      if (newData.dimensions.length !== oldData.dimensions.length) {
-        const seriesArr = []
-        for (let i = 0; i < newData.dimensions.length - 1; i++) {
-          seriesArr.push(barSeriesItem, lineSeriesItem)
-        }
-        replaceMergeArr.value = ['series']
-        props.chartConfig.option.series = seriesArr
-        nextTick(() => {
-          replaceMergeArr.value = []
-        })
+  () => props.chartConfig.option.dataset,
+  (newData, oldData) => {
+    if (newData.dimensions.length !== oldData.dimensions.length) {
+      const seriesArr = []
+      for (let i = 0; i < newData.dimensions.length - 1; i++) {
+        seriesArr.push(barSeriesItem, lineSeriesItem)
       }
-    },
-    {
-      deep: false
+      replaceMergeArr.value = ['series']
+      props.chartConfig.option.series = seriesArr
+      nextTick(() => {
+        replaceMergeArr.value = []
+      })
     }
+  },
+  {
+    deep: false
+  }
 )
 
-
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore)
-</script>
\ No newline at end of file
+</script>
diff --git a/src/packages/components/Charts/Bars/index.ts b/src/packages/components/Charts/Bars/index.ts
index a101acbd..4ab9a776 100644
--- a/src/packages/components/Charts/Bars/index.ts
+++ b/src/packages/components/Charts/Bars/index.ts
@@ -1,5 +1,6 @@
-import { BarCommonConfig } from './BarCommon/index'
-import { BarCrossrangeConfig } from './BarCrossrange/index'
-import { CapsuleChartConfig } from './CapsuleChart/index'
-
-export default [BarCommonConfig, BarCrossrangeConfig, CapsuleChartConfig]
+import { BarCommonConfig } from './BarCommon/index'
+import { BarCrossrangeConfig } from './BarCrossrange/index'
+import { CapsuleChartConfig } from './CapsuleChart/index'
+import { BarLineConfig } from './BarLine/index'
+
+export default [BarCommonConfig, BarCrossrangeConfig, BarLineConfig, CapsuleChartConfig]
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts
deleted file mode 100644
index b62c4bab..00000000
--- a/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public'
-import { BarLineConfig } from './index'
-import { CreateComponentType } from '@/packages/index.d'
-import cloneDeep from 'lodash/cloneDeep'
-import dataJson from './data.json'
-
-
-export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
-// 柱状折线组合图 分别定义series
-// 写死name可以定义legend显示的名称
-export const barSeriesItem = {
-    type: 'bar',
-    barWidth: 15,
-    label: {
-        show: true,
-        position: 'top',
-        color: '#fff',
-        fontSize: 12
-    },
-    itemStyle: {
-        color: null,
-        borderRadius: 2
-    }
-}
-
-export const lineSeriesItem = {
-    type: 'line',
-    symbol: "circle",
-    label: {
-        show: true,
-        position: 'top',
-        color: '#fff',
-        fontSize: 12
-    },
-    symbolSize: 5, //设定实心点的大小
-    itemStyle: {
-        color: '#FFE47A',
-        borderWidth: 1
-    },
-    lineStyle: {
-        type: 'solid',
-        width: 3,
-        color: null
-    }
-}
-
-export const option = {
-    tooltip: {
-        show: true,
-        trigger: 'axis',
-        axisPointer: {
-            show: true,
-            type: 'shadow'
-        }
-    },
-    legend: {
-        data:null
-    },
-    xAxis: {
-        show: true,
-        type: 'category'
-    },
-    yAxis: {
-        show: true,
-        type: 'value'
-    },
-    dataset: { ...dataJson },
-    series: [barSeriesItem, lineSeriesItem]
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-    public key = BarLineConfig.key
-    public chartConfig = cloneDeep(BarLineConfig)
-    // 图表配置项
-    public option = echartOptionProfixHandle(option, includes)
-}
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
deleted file mode 100644
index 1c236ed2..00000000
--- a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// 公共类型声明
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-// 当前[信息模块]分类声明
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const BarLineConfig: ConfigType = {
-    key: 'BarLine',
-    chartKey: 'VBarLine',
-    conKey: 'VCBarLine',
-    title: '柱状加折线图',
-    category: ChatCategoryEnum.COMBINATIONS,
-    categoryName: ChatCategoryEnumName.COMBINATION,
-    package: PackagesCategoryEnum.CHARTS,
-    chartFrame: ChartFrameEnum.ECHARTS,
-    image: 'bar_x.png'
-}
\ No newline at end of file
diff --git a/src/packages/components/Charts/COMBINATIONS/index.ts b/src/packages/components/Charts/COMBINATIONS/index.ts
deleted file mode 100644
index 3a131a97..00000000
--- a/src/packages/components/Charts/COMBINATIONS/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { BarLineConfig } from './BarLine/index'
-
-export default [BarLineConfig]
\ No newline at end of file
diff --git a/src/packages/components/Charts/index.d.ts b/src/packages/components/Charts/index.d.ts
index 2f88e1df..d7cc2714 100644
--- a/src/packages/components/Charts/index.d.ts
+++ b/src/packages/components/Charts/index.d.ts
@@ -5,7 +5,6 @@ export enum ChatCategoryEnum {
   LINE = 'Lines',
   SCATTER = 'Scatters',
   MAP = 'Maps',
-  COMBINATIONS = 'COMBINATIONS',
   MORE = 'Mores'
 }
 
diff --git a/src/packages/components/Charts/index.ts b/src/packages/components/Charts/index.ts
index 63e5d657..20ffcc66 100644
--- a/src/packages/components/Charts/index.ts
+++ b/src/packages/components/Charts/index.ts
@@ -3,7 +3,6 @@ import Pies from './Pies'
 import Lines from './Lines'
 import Scatters from './Scatters'
 import Mores from './Mores'
-import COMBINATIONS from "./COMBINATIONS";
 import Maps from './Maps'
 
-export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps,...COMBINATIONS, ...Mores]
+export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps, ...Mores]

From ab5ade9be12201cb784877b5ae1f1ee0dd38077e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Fri, 11 Aug 2023 22:35:44 +0800
Subject: [PATCH 21/25] =?UTF-8?q?perf:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tables/Tables/TablesBasic/config.ts       |  32 ++--
 .../Tables/Tables/TablesBasic/config.vue      | 161 +++++++++---------
 .../Tables/Tables/TablesBasic/data.json       | 118 ++++++-------
 .../Tables/Tables/TablesBasic/index.vue       | 112 ++++++------
 4 files changed, 216 insertions(+), 207 deletions(-)

diff --git a/src/packages/components/Tables/Tables/TablesBasic/config.ts b/src/packages/components/Tables/Tables/TablesBasic/config.ts
index eeca61bd..f1151226 100644
--- a/src/packages/components/Tables/Tables/TablesBasic/config.ts
+++ b/src/packages/components/Tables/Tables/TablesBasic/config.ts
@@ -5,26 +5,26 @@ import { chartInitConfig } from '@/settings/designSetting'
 import { TablesBasicConfig } from './index'
 import dataJson from './data.json'
 
-const {dimensions,source} = dataJson
+const { dimensions, source } = dataJson
 export const option = {
-  dataset:{dimensions,source},
-  pagination:{
+  dataset: { dimensions, source },
+  pagination: {
     page: 1,
-    pageSize:5
+    pageSize: 5
   },
-  align:'center',
-  style:{
-    border:'on',
-    singleColumn:'off',
-    singleLine:'off',
-    bottomBordered:'on',
-    striped:'on',
-    fontSize:16,
-    borderWidth:0,
-    borderColor:'black',
-    borderStyle:'solid'
+  align: 'center',
+  style: {
+    border: 'on',
+    singleColumn: 'off',
+    singleLine: 'off',
+    bottomBordered: 'on',
+    striped: 'on',
+    fontSize: 16,
+    borderWidth: 0,
+    borderColor: 'black',
+    borderStyle: 'solid'
   },
-  inputShow:"none"
+  inputShow: 'none'
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
diff --git a/src/packages/components/Tables/Tables/TablesBasic/config.vue b/src/packages/components/Tables/Tables/TablesBasic/config.vue
index 10b06699..9701196c 100644
--- a/src/packages/components/Tables/Tables/TablesBasic/config.vue
+++ b/src/packages/components/Tables/Tables/TablesBasic/config.vue
@@ -1,117 +1,123 @@
 <template>
   <collapse-item name="表格设置" :expanded="true">
     <setting-item-box :alone="true" name="对齐方式">
-      <setting-item  :alone="true">
-        <n-select v-model:value="optionData.align" size="small" 
-        :options="[
-          {label:'靠左',value:'left'},{label:'居中',value:'center'},{label:'靠右',value:'right'}
-        ]" />
+      <setting-item :alone="true">
+        <n-select
+          v-model:value="optionData.align"
+          size="small"
+          :options="[
+            { label: '靠左', value: 'left' },
+            { label: '居中', value: 'center' },
+            { label: '靠右', value: 'right' }
+          ]"
+        />
       </setting-item>
     </setting-item-box>
     <setting-item-box :alone="false" name="分页设置">
-      <setting-item  name="默认页码" :alone="true">
+      <setting-item name="默认页码" :alone="true">
         <n-input-number v-model:value="optionData.pagination.page" size="small" placeholder="字体大小"></n-input-number>
       </setting-item>
-      <setting-item  name="分页" :alone="true">
-        <n-select v-model:value="optionData.pagination.pageSize" size="small" 
-        :options="page" />
+      <setting-item name="分页" :alone="true">
+        <n-select v-model:value="optionData.pagination.pageSize" size="small" :options="page" />
       </setting-item>
     </setting-item-box>
     <setting-item-box :alone="false" name="表格数据">
       <SettingItem name="表头名称" class="form_name">
         <div style="width: 260px">
-          <n-input v-model:value="header"  size="small" placeholder="表头数据(英文','分割)"></n-input>
+          <n-input v-model:value="header" size="small" placeholder="表头数据(英文','分割)"></n-input>
         </div>
       </SettingItem>
     </setting-item-box>
     <setting-item-box :alone="false" name="表格样式">
       <SettingItem name="显示边框" :alone="true">
-        <n-select v-model:value="(optionData as any).style.border" size="small"
-                  :options="borderFlag" />
+        <n-select v-model:value="(optionData as any).style.border" size="small" :options="borderFlag" />
       </SettingItem>
       <SettingItem name="底部边框" :alone="true">
-        <n-select v-model:value="(optionData as any).style.bottomBordered" size="small"
-                  :options="bottom_borderedFlag" />
+        <n-select
+          v-model:value="(optionData as any).style.bottomBordered"
+          size="small"
+          :options="bottom_borderedFlag"
+        />
       </SettingItem>
       <SettingItem name="列分割线" :alone="true">
-        <n-select v-model:value="(optionData as any).style.singleLine" size="small"
-                  :options="columnFlag" />
+        <n-select v-model:value="(optionData as any).style.singleLine" size="small" :options="columnFlag" />
       </SettingItem>
       <SettingItem name="行分割线" :alone="true">
-        <n-select v-model:value="(optionData as any).style.singleColumn" size="small"
-                  :options="lineFlag" />
+        <n-select v-model:value="(optionData as any).style.singleColumn" size="small" :options="lineFlag" />
       </SettingItem>
       <SettingItem name="斑马条纹" :alone="true">
-        <n-select v-model:value="(optionData as any).style.striped" size="small"
-                  :options="stripedFlag" />
+        <n-select v-model:value="(optionData as any).style.striped" size="small" :options="stripedFlag" />
       </SettingItem>
-      <setting-item  name="字体大小" :alone="true">
-        <n-input-number v-model:value="optionData.style.fontSize" :min="12" size="small" placeholder="字体大小"></n-input-number>
+      <setting-item name="字体大小" :alone="true">
+        <n-input-number
+          v-model:value="optionData.style.fontSize"
+          :min="12"
+          size="small"
+          placeholder="字体大小"
+        ></n-input-number>
       </setting-item>
-      <setting-item  name="边框宽度" :alone="true">
-        <n-input-number v-model:value="optionData.style.borderWidth" :min="0" size="small" placeholder="字体大小"></n-input-number>
+      <setting-item name="边框宽度" :alone="true">
+        <n-input-number
+          v-model:value="optionData.style.borderWidth"
+          :min="0"
+          size="small"
+          placeholder="字体大小"
+        ></n-input-number>
       </setting-item>
-      <setting-item  name="边框颜色" :alone="true">
-        <n-color-picker
-            size="small"
-            :modes="['rgb']"
-            v-model:value="optionData.style.borderColor"
-        ></n-color-picker>
+      <setting-item name="边框颜色" :alone="true">
+        <n-color-picker size="small" :modes="['rgb']" v-model:value="optionData.style.borderColor"></n-color-picker>
       </setting-item>
-      <setting-item  name="边框样式" :alone="true">
-        <n-select v-model:value="optionData.style.borderStyle" size="small"
-                  :options="borderStyleFlag" />
+      <setting-item name="边框样式" :alone="true">
+        <n-select v-model:value="optionData.style.borderStyle" size="small" :options="borderStyleFlag" />
       </setting-item>
       <SettingItem name="表格搜索" :alone="true">
-        <n-select v-model:value="optionData.inputShow" size="small"
-                  :options="inputSelect" />
+        <n-select v-model:value="optionData.inputShow" size="small" :options="inputSelect" />
       </SettingItem>
     </setting-item-box>
   </collapse-item>
 </template>
 
 <script setup lang="ts">
-import { PropType,watch,ref } from 'vue';
-import { option } from './config';
-
-import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting';
+import { PropType, watch, ref } from 'vue'
+import { option } from './config'
+import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 
 const page = [
-  {label:'2',value:2},
-  {label:'5',value:5},
-  {label:'10',value:10},
-  {label:'15',value:15},
-  {label:'30',value:30}
+  { label: '2', value: 2 },
+  { label: '5', value: 5 },
+  { label: '10', value: 10 },
+  { label: '15', value: 15 },
+  { label: '30', value: 30 }
 ]
 const borderFlag = [
-  {label:'显示',value:'on'},
-  {label:'不显示',value:'off'}
+  { label: '显示', value: 'on' },
+  { label: '不显示', value: 'off' }
 ]
 const columnFlag = [
-  {label:'显示',value:'off'},
-  {label:'不显示',value:'on'}
+  { label: '显示', value: 'off' },
+  { label: '不显示', value: 'on' }
 ]
 const lineFlag = [
-  {label:'显示',value:'off'},
-  {label:'不显示',value:'on'}
+  { label: '显示', value: 'off' },
+  { label: '不显示', value: 'on' }
 ]
 const bottom_borderedFlag = [
-  {label:'显示',value:'on'},
-  {label:'不显示',value:'off'}
+  { label: '显示', value: 'on' },
+  { label: '不显示', value: 'off' }
 ]
 const stripedFlag = [
-  {label:'显示',value:'on'},
-  {label:'不显示',value:'off'}
+  { label: '显示', value: 'on' },
+  { label: '不显示', value: 'off' }
 ]
 const borderStyleFlag = [
-  {label:'实线边框',value:'solid'},
-  {label:'虚线边框',value:'dashed'},
-  {label:'点状边框',value:'dotted'},
-  {label:'双线边框',value:'double'}
+  { label: '实线边框', value: 'solid' },
+  { label: '虚线边框', value: 'dashed' },
+  { label: '点状边框', value: 'dotted' },
+  { label: '双线边框', value: 'double' }
 ]
 const inputSelect = [
-  {label:'停用',value:'none'},
-  {label:'启用',value:'flex'}
+  { label: '停用', value: 'none' },
+  { label: '启用', value: 'flex' }
 ]
 const props = defineProps({
   optionData: {
@@ -120,37 +126,36 @@ const props = defineProps({
   }
 })
 
-const header = ref();
+const header = ref()
 const median = ref<string[]>([])
-props.optionData.dataset.dimensions.forEach(item=>{
-  median.value.push(item.title);
+props.optionData.dataset.dimensions.forEach(item => {
+  median.value.push(item.title)
 })
 
 //转string
 watch(
-    () => props.optionData,
-    () => {
-      median.value = [];
-      props.optionData.dataset.dimensions.forEach(item=>{
-        median.value.push(item.title);
-      })
-      header.value = median.value.toString()
-    },
-    {
-      deep: false,
-      immediate: true
-    }
+  () => props.optionData,
+  () => {
+    median.value = []
+    props.optionData.dataset.dimensions.forEach(item => {
+      median.value.push(item.title)
+    })
+    header.value = median.value.toString()
+  },
+  {
+    deep: false,
+    immediate: true
+  }
 )
 
 //更新columns
 watch([header], ([headerNew], [headerOld]) => {
   if (headerNew !== headerOld) {
-    headerNew.split(',').forEach((item:string,index:number)=>{
-      if(index+1 <= props.optionData.dataset.dimensions.length){
+    headerNew.split(',').forEach((item: string, index: number) => {
+      if (index + 1 <= props.optionData.dataset.dimensions.length) {
         props.optionData.dataset.dimensions[index].title = headerNew.split(',')[index]
       }
     })
   }
 })
-
 </script>
diff --git a/src/packages/components/Tables/Tables/TablesBasic/data.json b/src/packages/components/Tables/Tables/TablesBasic/data.json
index 6d671fb6..29ba4085 100644
--- a/src/packages/components/Tables/Tables/TablesBasic/data.json
+++ b/src/packages/components/Tables/Tables/TablesBasic/data.json
@@ -1,60 +1,60 @@
 {
-    "dimensions":[
-        {
-            "title": "产品名称",
-            "key": "productName"
-          },
-          {
-            "title": "产品销量（万）",
-            "key": "totalSum"
-          },
-          {
-            "title": "销售额（万）",
-            "key": "totalAmount"
-          }
-    ],
-    "source":[
-        {
-            "key": 0,
-            "productName": "产品A1",
-            "totalSum": 10,
-            "totalAmount": 10
-        },
-        {
-            "key": 1,
-            "productName": "产品B1",
-            "totalSum": 10,
-            "totalAmount": 10
-        },
-        {
-            "key": 2,
-            "productName": "产品C1",
-            "totalSum": 10,
-            "totalAmount": 10
-        },
-        {
-            "key": 3,
-            "productName": "产品D1",
-            "totalSum": 10,
-            "totalAmount": 10
-        },
-        {
-            "key": 4,
-            "productName": "产品A2",
-            "totalSum": 10,
-            "totalAmount": 10
-        },
-        {
-            "key": 5,
-            "productName": "产品D2",
-            "totalSum": 10,
-            "totalAmount": 10
-        },
-        {
-            "key": 6,
-            "productName": "产品A3",
-            "totalSum": 10,
-            "totalAmount": 10
-        }
-    ]
-}
\ No newline at end of file
+  "dimensions": [
+    {
+      "title": "产品名称",
+      "key": "productName"
+    },
+    {
+      "title": "产品销量（万）",
+      "key": "totalSum"
+    },
+    {
+      "title": "销售额（万）",
+      "key": "totalAmount"
+    }
+  ],
+  "source": [
+    {
+      "key": 0,
+      "productName": "产品A1",
+      "totalSum": 10,
+      "totalAmount": 10
+    },
+    {
+      "key": 1,
+      "productName": "产品B1",
+      "totalSum": 10,
+      "totalAmount": 10
+    },
+    {
+      "key": 2,
+      "productName": "产品C1",
+      "totalSum": 10,
+      "totalAmount": 10
+    },
+    {
+      "key": 3,
+      "productName": "产品D1",
+      "totalSum": 10,
+      "totalAmount": 10
+    },
+    {
+      "key": 4,
+      "productName": "产品A2",
+      "totalSum": 10,
+      "totalAmount": 10
+    },
+    {
+      "key": 5,
+      "productName": "产品D2",
+      "totalSum": 10,
+      "totalAmount": 10
+    },
+    {
+      "key": 6,
+      "productName": "产品A3",
+      "totalSum": 10,
+      "totalAmount": 10
+    }
+  ]
+}
diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.vue b/src/packages/components/Tables/Tables/TablesBasic/index.vue
index 5dcd2901..f3580744 100644
--- a/src/packages/components/Tables/Tables/TablesBasic/index.vue
+++ b/src/packages/components/Tables/Tables/TablesBasic/index.vue
@@ -1,33 +1,41 @@
 <template>
   <div class="go-tables-basic">
-    <n-input v-model:value="inputData"
-             placeholder="请输入信息"
-             :style="`display:${option.inputShow}`"
-             style="margin-bottom: 5px;float:right;width: 240px" />
-    <n-data-table :style="`
-      width:${w}px;
-      height:${h}px;
-      font-size:${option.style.fontSize}px;
-      border-width:${option.style.border === 'on'?option.style.borderWidth:0}px;
-      border-color:${option.style.borderColor};
-      border-style:${option.style.borderStyle}`"
-                  :bordered="option.style.border === 'on'"
-                  :single-column="option.style.singleColumn === 'on'"
-                  :single-line="option.style.singleLine === 'on'"
-                  :bottom-bordered="option.style.bottomBordered === 'on'"
-                  :striped="option.style.striped === 'on'"
-                  :max-height="h"
-                  size="small"
-                  :columns="option.dataset.dimensions"
-                  :data="filterData"
-                  :pagination="pagination"
-                  />
+    <n-input
+      v-model:value="inputData"
+      placeholder="请输入信息"
+      :style="`display: ${inputShow}`"
+      style="margin-bottom: 5px; float: right; width: 240px"
+    >
+      <template #prefix>
+        <n-icon :component="SearchIcon" />
+      </template>
+    </n-input>
+    <n-data-table
+      :style="`
+      width: ${w}px;
+      height: ${h}px;
+      font-size: ${option.style.fontSize}px;
+      border-width: ${option.style.border === 'on' ? option.style.borderWidth : 0}px;
+      border-color: ${option.style.borderColor};
+      border-style: ${option.style.borderStyle}`"
+      :bordered="option.style.border === 'on'"
+      :single-column="option.style.singleColumn === 'on'"
+      :single-line="option.style.singleLine === 'on'"
+      :bottom-bordered="option.style.bottomBordered === 'on'"
+      :striped="option.style.striped === 'on'"
+      :max-height="h"
+      size="small"
+      :columns="option.dataset.dimensions"
+      :data="filterData"
+      :pagination="pagination"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed,PropType, toRefs, watch, reactive,ref } from 'vue';
+import { computed, PropType, toRefs, watch, reactive, ref } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
+import { icon } from '@/plugins'
 
 const props = defineProps({
   chartConfig: {
@@ -36,23 +44,21 @@ const props = defineProps({
   }
 })
 
+const { SearchIcon } = icon.ionicons5
+
 //查询字段
-const inputData = ref('');
+const inputData = ref('')
 //前台过滤
-const filterData = computed(()=>{
-    return option?.dataset?.source?.filter((item:any)=>{
-      return Object.values(item).some(val=>{
-        return String(val).toLowerCase().includes(inputData.value.toLowerCase())
-      })
+const filterData = computed(() => {
+  return option?.dataset?.source?.filter((item: any) => {
+    return Object.values(item).some(val => {
+      return String(val).toLowerCase().includes(inputData.value.toLowerCase())
     })
+  })
 })
 
-const {
-  align,
-  pagination
-} = toRefs(
-  props.chartConfig.option
-) 
+const { align, pagination, inputShow } = toRefs(props.chartConfig.option)
+
 pagination.value.onChange = (page: number) => {
   pagination.value.page = page
 }
@@ -60,32 +66,30 @@ pagination.value.onChange = (page: number) => {
 const { w, h } = toRefs(props.chartConfig.attr)
 
 const option = reactive({
-  dataset : props.chartConfig.option.dataset,
-  style : props.chartConfig.option.style,
-  inputShow : props.chartConfig.option.inputShow
+  dataset: props.chartConfig.option.dataset,
+  style: props.chartConfig.option.style
 })
 
 watch(
-    () => props.chartConfig.option.dataset,
-    (newData:any)=>{
-      option.dataset = newData;
-      option?.dataset?.dimensions?.forEach((header: any) => {
-            //对齐方式更新
-            header.align = align.value;
-      });
-    },
-    {
-      immediate:true,
-      deep:true
-    }
+  () => props.chartConfig.option.dataset,
+  (newData: any) => {
+    option.dataset = newData
+    option?.dataset?.dimensions?.forEach((header: any) => {
+      header.align = align.value
+    })
+  },
+  {
+    immediate: true,
+    deep: true
+  }
 )
-
 </script>
 
 <style lang="scss" scoped>
 @include go('tables-basic') {
-  margin: 0 !important;
-  padding: 0 !important;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  align-items: flex-end;
 }
-
 </style>

From db73346c71989dcd2cb8d1ba1ed25b04a8a7d35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Fri, 11 Aug 2023 23:47:05 +0800
Subject: [PATCH 22/25] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E8=A1=A8=E6=A0=BC=E5=9B=BE=E7=89=87=E5=92=8C=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/chart/tables/tables_basic.png | Bin 0 -> 22748 bytes
 .../Tables/Tables/TablesBasic/config.vue        |   3 ++-
 .../Tables/Tables/TablesBasic/index.ts          |   4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/images/chart/tables/tables_basic.png

diff --git a/src/assets/images/chart/tables/tables_basic.png b/src/assets/images/chart/tables/tables_basic.png
new file mode 100644
index 0000000000000000000000000000000000000000..16525ca188f21709de6e58bb334eb2278b176350
GIT binary patch
literal 22748
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
XNxeK2zP3RlT+$ipfp2}#v5)>A9x_Bh

literal 0
HcmV?d00001

diff --git a/src/packages/components/Tables/Tables/TablesBasic/config.vue b/src/packages/components/Tables/Tables/TablesBasic/config.vue
index 9701196c..9e8369ae 100644
--- a/src/packages/components/Tables/Tables/TablesBasic/config.vue
+++ b/src/packages/components/Tables/Tables/TablesBasic/config.vue
@@ -1,5 +1,6 @@
 <template>
   <collapse-item name="表格设置" :expanded="true">
+    <n-tag type="primary">若配置无响应，请在预览页面查看效果</n-tag>
     <setting-item-box :alone="true" name="对齐方式">
       <setting-item :alone="true">
         <n-select
@@ -70,7 +71,7 @@
       <setting-item name="边框样式" :alone="true">
         <n-select v-model:value="optionData.style.borderStyle" size="small" :options="borderStyleFlag" />
       </setting-item>
-      <SettingItem name="表格搜索" :alone="true">
+      <SettingItem name="表格搜索（前端静态搜索）" :alone="true">
         <n-select v-model:value="optionData.inputShow" size="small" :options="inputSelect" />
       </SettingItem>
     </setting-item-box>
diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.ts b/src/packages/components/Tables/Tables/TablesBasic/index.ts
index 5abe033a..9cb1f51a 100644
--- a/src/packages/components/Tables/Tables/TablesBasic/index.ts
+++ b/src/packages/components/Tables/Tables/TablesBasic/index.ts
@@ -5,10 +5,10 @@ export const TablesBasicConfig: ConfigType = {
   key: 'TablesBasic',
   chartKey: 'VTablesBasic',
   conKey: 'VCTablesBasic',
-  title: '基础表格',
+  title: '基础分页表格',
   category: ChatCategoryEnum.TABLE,
   categoryName: ChatCategoryEnumName.TABLE,
   package: PackagesCategoryEnum.TABLES,
   chartFrame: ChartFrameEnum.COMMON,
-  image: 'tables_list.png'
+  image: 'tables_basic.png'
 }

From 704a7bd8f8db495eed3c161c38e854fbf131f3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Fri, 11 Aug 2023 23:56:30 +0800
Subject: [PATCH 23/25] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=88=86=E9=A1=B5=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/informations/inputs_pagination.png    | Bin 0 -> 13979 bytes
 .../Inputs/InputsPagination/index.ts            |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 src/assets/images/chart/informations/inputs_pagination.png

diff --git a/src/assets/images/chart/informations/inputs_pagination.png b/src/assets/images/chart/informations/inputs_pagination.png
new file mode 100644
index 0000000000000000000000000000000000000000..e326ef0051e54e8a6c948a873c4eb8d7183a676a
GIT binary patch
literal 13979
zcmcJ$1yq~gvM5eVODWnGm*DO$3GVLhlHe}Ep_Bqeic5=2@#0b-IK|xw5VQpf!3q>8
z_UO6i+~2wPz4Oj`@BjYaT9Y+<_UPWTC*R7RL}{qWV`GqFprD{&D=Nrnp`f5bQBWTH
zqoY1hwEL;t9tgDdItE?_swzNhS7#1Ou&Wh>!`Jy?;^7ey_jR+hc7%9QSwU>=T|{Y)
zV4XBn_Fz#OeSTFgRX1sfoxOs;2SnRnO~=~b(OMWxBQ8cI;tPCG;0*Dyr1Euka`6QE
ziqiZ|FYp2XL*}HR`WuUvqbQB!AA?i|sv1<%t{xC7ehvY4Yi>RvDnVfmZUH_nUI8{L
z9xiTSPA(x%ZeDgSZXlNckYAAM?+?v`H4m^2P)kPc@3tOBqBM41UT#26P9Gm14j*0)
zR}WiGZeigE9Xy;oJnRn~?4EuuUY5S>E}pdi&>#cxwDz!f^Rjn!q57lI(#qA_OO)op
z)Bgy;+3i2ox_JJ5nI0C5)7R3ClbeI<Pe}h@R8{@ovpPHfC%31U7UVB~|CfqAb^P2Q
zoLUf1S8oq%$OAj=A5(5XX%C2{m#c@4tE<yLR#C&w)yvh>&ee^I=fNc^CVhJsu&a+J
z^WOwiRe_2wo?ezN)(}M*QJM!89QO8Lpp+mlubixuFs~55EH}5TtgtkXl(ei6KNpXH
zl%%k*%s*shT&=yGAueA3kOluGEBP;F|Kx(R+k<5ph=)BC0+#b|b*B1T%s~5p?Tg^Q
z)c1E;@W1v&=wHfmJ~+eqXJ`Lur~g5ENS{CGf9CDO;6F1T;_{I09uIllafR0Ka3)B+
zWDUHuU2VL4EIlA7|B=3m&X%?hTVo0Kb030;Je(;M4HX?(A~Gs^R(?VNBdcXH5h;L(
zf{Bw~?BVkPCnTri5)db%U}RtuAf{v{qF^Q<XJF?Q0nl-9@QG3}a*@)oF>wk}&~dQy
ziM}AB!6T)oW#%QNW?^9ECju}MQ?d|}Gtjc|5|Gjn0+{ef>DYKc%$&kN2}KerW<G5Q
zF%=89swpiC9}N=^kB}rIy8tUUP)tUJfRu)ko|BnV=)nPU8a6>uIROzFVR3mb0Wo|s
zhL^;&QVJRr%>1tiDJA7K#AQ{<Y1!#m`FI2+xCJHfNoX0^1xRQ)r)FkZty0Jtc|@d?
z7}*6?w2h<{HHj#hDA|PZiK!?Uxajz$m_(E%ApV2^1~LY28D%XtX>A&A2^L8W6-^@n
zJv&YXBUi5g0E+-V8NH-!kf6T9+S*2GdG-7PoDV3?%nAHdQqI9I$}FKFsOR7T4Wwe^
z9vm87fG@$9R+d**RWuD`6t%4FTv@n;U%!nareamoF`k*7N35<@)ilVd=opxS8Gs75
zP99#q!J2wz>l>T)E?(FKl;xGRL7|Zna%#n8l^Cx8Ti?DD5L3u0YY&f(TiQ5}j!*go
zhE7h+ut7eKPfmaB8=Re6FtN1LF|<@t*Eh3vAf;wywN8(TPsSsn`k0;X=nBOrAl=#7
z&Hq$NK*8AF*`1b=195Qc?Cxc=&2sVdt8Z-H-2B!*I2;ibr)O*(mzY*l-{cn*_OSIm
zz5P)C*Jjx;$ND+jijmf~P6bt6B1%?S*T|-37%??_R&HTRdX|y7jkCM&n}}F0MWe)&
zk2(28%qB6~2Ic^MRju&c=GJy<Y3uLXJ5*vOJZk1l2I1^>xd9>JRGcD0hR#3}HxUc(
zsP{=Ev^>NBCJs4$N}wLCf+M3&@G~3|G8PeD4QqZKTY5oR7V`vhZUs7J4-y7`a&{>O
z4L=H2K~_o4{e7g8Zz3HFKf6N#vzVGyK{thvmR?*rn{hZTuY{n!y|}5Xv{xFqxZgOf
zUNta{ft63%G1Mh2;q>g>wQX&*>#h33fx+<7Qqw-YzrWwTzdt)W+tRvIMM0rLQIwI?
z@m)e9)E&vL09}>~QeH4AjL=DC;>@>F&+(&s8ZOY9Y&@PHT3Q4!oi%*P3EC(7uuLvW
zB+coMjb<7yfgWY@RY^|c79r|;0xHdR5;(DAaCe+LsLI{Bk>w^0`kA>lI=FhpW*?!u
z?!vcelY|VMKU3>6jUZwGfmYF)w+^Af8>X*e1V=Y3nJ7MOD?>QoXLYFm4Dd&FsQ(2*
zktp!LKmsa=Pr<;*$T(!_yER4kImm<0r32tRPfiF<pAoTFhi#oSgPiGdFC8T}6fdD(
z-U)P)TZM&+p2D5P@toU*bWvn+Sakv7lnf(x{#?p4PS7Ue_@qngLV2Q?ktsbRlF!#O
zpA0Fq+2KcO<3P;}xomIOIh8#e?7C|+(K7Qa>_~e;S<N(@LhmnUu3Gb%V~2*&I~P8{
zS%o5e1TC_n5839;pIKCCSt1B@w@X04_T-X36X>oE8P%`a8)zYd#epH>q>a;krJrDV
zZ~#_4r5tPJJe;MrR~qVC0WvVj;SOdRVL0enaE@qi@DB3wZE{M}S!lT{pQ@=>LLMa`
z<{<G1Mb-)vB1n5dT2FIs@zvBuYfv+ZHoKX(fLSB|hn&SVYM8_Mr`+x9W;U=uJSIot
zs9-s4uZr@>b)4hb)9NK7%5WUqI!BIYmBYn$HGUazC(dz9xq2t>X7^~rgA&=oAB!H5
z$a2PZK9=Dso;70C*2;pZVLw;S&WNXlY8$(5h?*7mqk7C`TiF;yk?b8CuSiA~k(y1m
zeK4cJ5uu*GBIxw%$wr5*kI>Pl@KBlT8$%mUAQMF;)=rCUr-OX*=8#gw&Nkpe4EBkV
zpjvs#DHS#ZZ7v7X!{3MPD_c)e$j}$Y*dS5dC+b<@OQw*8%I{yGJ4MO{pizh*>rhoA
z1^kZ#nGH<|h;LNs2uXXWtuoxQ5q9MuNa<qT2uc9_f))k9{KR0oI`dkcFLyY~uvj1g
zu%H0YVGtCdrsqNLnL@_indG-RhTyEu<`}N?q{oAYkJMd5_iw&D?Fo}Tu@lJLrqnLG
zV5Ki4I$VA*S3#e=S)yaJ^?s^1sYFMhs?@~gFs(j`m4yRL0~-MtZ`}UuvE_-;?`O(z
z4K&T4|A610b<PeQtRf}<Rad&6IO^Ul_#y-GW@^|?>$vfag)ox|5+~zfCn_Qiyt}{n
zVRY`09ukP8!hxBD*@9vKTUm851rRt`^?Mrwa<{^56uY^J$+dse4)dyUK$FevhjOl&
z0%1(#;n(S=>{&UcAivn*au_+_dsUZ7rFUQbiRArn(bI+*Y*Tef=-N^58>s6qX<tn~
zV#*Z6bX8voQTD|KBz1^~&A97L;ng!?+bJtjn06d;HCJR_zrA~ob0ekz`MGoDT7lvk
zHgdN<22O!8%*bg3FA>kmA<mHp72|}b?Oh}cb=SwSTtYyD_W|v}K0si!c!vCoqs9`V
zTeEwsMyF?#rkxJ%h3&{+0qrM&vsFfW2?#mW?$xO&P1<+jEeubuC2u{vI4{o>t=Z$q
z^b6;17pn(lptA3uNLE6(rYx=t-R}P?691(*{3#ZH6^B2CLIV2wzX26U0{RyuWIs&*
zHT;7o0RB4+;v@k60`RlJhcflg@Rv7#O4t8akN*EQzxw2#qxpmXw`h|8XVQPE$$tfT
zuLxa5ZFc-WU-kdjF{awB<b;jJ3&0SSzQ0{>?9_d>ZV%r10CqQNf3N>qC12P>1jpXx
z-Y(Y1^d1i-Z&wDL^d&QHR2~0xz@@nH264<JBSM&A_ucn>jr!*^?ZzO{%Fgn>>(-I>
z_C~pOv-|UdIrH{b|HdWNd&F;bLuVLV6eJehfE`aM4uhLHhIGycUybdHyY}w8no$hk
zKCTQp{t;4heR<^?{A<A3_vA}te1+gm^8o;Gf4HH(Sh%(Id%mth-2d|CDz|B4gOieC
zLHsuCspK*8`+jH0_4kF4miFq-o5S2{+`AJcCrYq>(AlPbZpity^X1;@T8Hl)l3_XW
z_X*`)-zuV?FLB2mMV-;!JOxKvDW6B{nh#&u7?T}$TF<YBK*~@8-y~4T^~q8=8<h^G
zPCo1K3`qjLsh$0-s!(Dcm7^DAsFfuvB8yYuTQ_-imk;sS$FU5g*<l}c&VH1O^2GS8
z#Lo2_A_z~2)XvP>y?yaj-I+pvgesjmVTMK|E=XfjOK;f1AX?hO&`!vBQ?}B22Tn+s
zj<c0iR5>FXP`}tBN%!STdwQU95;ebU=B8)EQi_1|D{Z|U*>-Ez4TL7TC+fhfCe`AU
z^=`FI49#H+=I~ch(o8=B4TG1ALWo{Wh-owkfnW_nfUSUHqV(u=t6yVaH$Sla={Y!h
zvTuQ;VX4U=Y;lJetCo4d6U(CvTzSQlVEWNnQi$(28cs}DDUI~Pp<UI(>xFeu+#72%
z1^xcV6r7lOE;jkThq|MZ%QNjAJ7otJDkm#iQ={r_zSAqipZn9ilAEX@u&ly&KZOaO
z%5%&^?Nono<V|krD4{!TObP@Ws1RhK{qD!fYyDZIh0&2XEYga}^2C<VW`{8MwyurV
zvGZtX*eJO5*rBSKiBn;MmS_TV%3?8PCcyzC?6lYYgDm<)WT8qKwh>;|z9sde7j;)G
z4A~SYhjuEdY>&=XcFZc4EORxnFjf_-Rg#;pMNlv>=|Rz4-q&fSIwlD>s4r~DnT#^-
zf976qJ(+#&6InprN^Wah7mK~=4z%RrU!X7Si`&_i3U}you8qOboqYTl@V?5rjHNKh
zl8DW6g!r;PMy2|z7|u$YBopVzFNfd?_81~Y32O3RrC$plcW<|a)t?$)Y$qX09VVx@
zM-_3NQQ`M6mKqWFIPrd=cEb0VVUp3cnehtki5nlqDf!)lvv2jPn?tMIYeY>V`(sWn
zBAxnO%z*83mw8LuWpmzl+tX7_5Q<rsx-AAPUN*pkp5=|()e%~y6L-uzg~hpb{NB<*
z0Bj7OFq?u3ne>D23G}&m4&Vbr;d(WW^+19%v^S2?VtIS}K81*AptsSMe#kh>+}|j2
z-*Ca2il~4;=IXTq``3rJi~`?|#jG$CQlH9*ipNh7nSQA?#}<@}%$AR%0fcB->rL@3
zg{2nrY5DO3o=xWHC`q=Sp0bPf-LLhYy^~Ve!XDzlUmNpyu~*<7I|8Q>EWyUneL@Hd
zcfveQM51)*Dn`-CWE(?8Lcd9<bZ=r2$GaMC_M<j!UVZo+V`otx#+Qm_8%;0t*c>Wh
z=>m@S450sJ<HnfC;~n}nuHULg)cM85VBByOUFjnC3cGXO@7x>?id*9}l$|2ySj6c3
zn?3;1Q{%^3fE617WO0G7D|S3O_Xlks)LqJp3=@1ciQ2-Mx*&^m2_4GhZrrH5UV*2-
zv6eRqF*!t6t!tz<etLCpv}He<i1TO*28pBlKr?_R)XphfJ!3qxE@~3qJU?1%&ih@=
zPo@fXMSWeFHZbnVwT~ebh6hZ5b48vN_#@JxU(!pQE47$w{a9>Jn9hD;_FE<>XiCC1
z{qD+^81#+`N|S^*LeA2Gk^n<-VEH;)cp_2(`frD(UG=BGPZ;T7@s?kHYG{bpp-K)Z
z6%<O|JC~t#?=HMolHgjbMtX?zgE&nCeTierjs?&iQEQC-SaQYT?tV;rbCngBHK-c+
z@4IMT$u_qqlU_UykCv%6mX+=Jaurg8R~6XVT>{o0m#N`e0C!sjyDjdgw_!f0NbWKC
zbZ1TUb-CViCr2uzHjHm9<Vtjm^u8IDZ*1(Sf%%LKr10sbq-1U!ARA&SqeW~v+K405
zL!2^*yw|PtAXKKP7(3xu($V(20@^ZuKb@Jm)j#lccR%R?LQT2S_n$#cbn2f!HGNKP
zZ}7^5>aA(&*9vJ_jRsbBYHD_Nx={A+r88%|`U|ATBNVN|RYH*)xaE0tqcTT&wRi6e
zOiP9teZYVgRm5t3H0_Zs`p7d*wX-4`jCp_C5*Bs2I%dvywv1n^Fxt%$YQNZZr}Y_M
z=eV!IEg_MP+(Mb;3jiGX<e9w1Hbv<hqKs0wLV1h*aA+e?H&-i%VY>9T8z;{tjk<wL
z;I01vxexTaLQ30)zpLvOwL8yd?Yv=9*8BE$)!J4;ge*|Gh?vsel{rZ8;NSoPfh<l;
zUugaMB*qqytq&tg`?>|N8pkZ7T+H_m3hWQHJ)Ov%xGPw=4g=(=w1rroxrqO|J6{WO
zE7bq2BmD#x_BM61WB%E_^XW$W5T3AQ_sayzMacxM72iH;b!pk$2!L|;524%j!=h&;
zW585-=)0?vc4gErqrkUU5rE$5Syw?L-ZjN9h}AjBmt`2Qe&5oJ;nHA2l`T|@Svt{R
zZNXMR(Xs&U{s@KOwV$k~_}$I^h4|7hBwY@G?m1a?vzKi%Y+%uv&j>_mT5dO3{AwR(
zvb0a0;%+j^ltQksb|AQ=^BkC6eu4^0%-Qgr7WX$#FV+jefU;q}y4HoeeF<{QQ%^s%
z2Zq<*E~kxGbz`2Z^ch1niD4A`EZzvwIeL12ImZhYU(x+s0GloyP(3Thjjo&L%|p71
zxP|06pR9%4J0pLM>|Aran!tH6)NkCmkL0$2>gswMI;v4rump+VJlncLslu(&D;4fJ
znKVOKACcb`v(&eKYCYYvD;!Rr%1%d0yqELt_<Z^kFEZ{x*Sqf{AiKqQK?rE#ahTPJ
z9OhW;ML)(gow1v1NnVSMtyry#@kb0f8O{xe@Y{)MTebT+cnj7S6(NUg%g<MaQhGFt
zPgbJ`@XkGY;LppdAj@9eox#CZ`v=PgjkGzYHAcO_<!S91{zV=xAW*{}Zf1(m^{3M;
zlY0)16o^qXscaJ83*qA7SqdrHH}JkF9Ljoewzb3CZu7<7_^9_V=g6T1KS5Bt$yXor
z*0R}q*vMmB#ReW_8hAk~A*-|brD)!>KkfNR(-&S^bjGG?D_w>Nhh^CKEY`&rHLS|J
zvB|5ZbCDvNaFU-7=Yh;TSA0D2l}HooH=A}zK>=vMC?~SCz@~T5ZOrXDJi3Efe(h_r
z_OE3AUepWw*JvnFV4se&$h)EX_ckS4!*ugDjg7ZT!sTe_HuAFk!x2N>dxzSMHf3_O
zXM!Lb{1I-hz`9T1@a(uF%O|BmV#2;ZjplaoP0yjv^RsM>+F$4KH=JX8nN@V~3PTiv
zT<xjnzFJi+J4BYv1g!>q+c!1`@Idg|UQ@+xEp2mqSzE8&|MEaKbuQX-VwrXLG?|&?
z0OSOPjjN5SNseZlz6(fyJ<yjF%vWt}+yN!w*RW*@tojcaXnT0lJ-zkaGn)Vx7z<q-
zAw<&r8XG0c3<Hdw+CuNCkM69dho@0qM`m{QR^t0R%Y&EM3BdD@zD^OAE;=L%(525I
z)T|g(>)&GcSV%p^XDWEx$@1#uyEjtg3eT->w8MA7eAIV8u(%yF6h~cDw!1IJym*rR
zGNF{eR>xbH%Zr@%+P!Vm3qsfF`;Skr$A#B?I0~547b;?#Hm7i`YTuGMT7IDxr!BYE
zG&fq~I~}7ZM+*xjbaUf$Gu5{2{QRP5l?j4eb4u(^)ThuadYr#CHyP6r%?rXQd4i0~
z-}@{j46ueeFK`B4pT%%?-kg*$st5PSm<nU#sEV328!4eN;q$Nu`?xC>WpEmV2!8z<
z2hhMlZzbIyZz`DMUahYxdu_?lwyibIWh?)L$=%*7NRfSH8_n_KFs5%^SSeemG#MZ1
ztbk85Iw*mj@tl3f`B1`gg)PKSb~~#@OD*r7N64g@ZhL0JTg)jhq^sx%m!t5T3F0pH
zcwtD5!#Rq@qcv7pW2`R+QC6K3e6ls6es?mq7Sa=ADw_N)+FO^Wov${@utQKLV~A9@
z&@dn{-Y}d5WF`AF-7Q=WkCz$6(^bJjaUbzA*Hp34Vmwa4GO4Kc{D*>ibybvdFrw<p
zy)Nw1W_5nEO%i}kdfQi!oiec@TLQf8Z!0o3^IN~o=doAyF<;~2`P~|hm)0;Q@M||-
zmA&^K5X8<E?=RH-q)4`DH>Ts=pCvU~vdDcd%*(Mjx^87kjuyE3yVpEd>}o+Ucjani
z?bzxW6N#4DkUaxlrOxL(zwfmvM)V`DSqMDqL7c0vG~MTZmFQgGz6&RQWu5Mj><$C?
zceT2KgN($>Rp;Hzb`FW*rr~>+*yEp<UM!mN;M>}!)eso+Cy8XpY=;Hxv2`#Jk`fay
zN_Kh?I(OM1RlcQ7l}rqbzm~O)EPKWora&sdwizlP!H1477IGp}v*kt)2*Vs&sq59%
zX2`cTCx=E|4#|gH?na9DRR_h8fi}y058lsQN4{t6dlevgAh*~T`Qbwy>I*8nbXfxU
zez-urzfb&p94@Fp>*~=mH-CJf5x~tp=wxd-KGF19r&@g?Ix%>;!?`!i3fa}#+7W5Z
za<O=5dOYa>{$44md;|>!iDs*n=og1I4Fp?LwI|(87!2*`H;m+F?3;D$Q^=(D;LYnc
zldyo0IHu)>2Yc41W|=lt6KXyAyauY6LmGoyZxrcWy^a=qz|US(BU(-;t_8(ABFr14
zj}BDe=FN<})yf6T?Vwn?kHqz~k5SxSw#Sesft9lTdROdvjMN=_AHE+ycaDvJeu`!N
z95)b6(Mvtq-QroDOXBDFX_i|hONS;VP=a}76ah_ekY0C{HNZEZCSyvJ-jnRiE?biB
zP2m3X__&Awnog`nBiF3VwS&zO+#2hX)`Ma@q7@ZUa7AI5zV-Y5elk7?<7+^AceUi4
zu!)o2^PPalk0P~p%j>_5gmm1UG*-KTBTJX>rD+l)zyIKGMeSf8h399Z4CeV=xKweB
zFK?%@@t<#M`_@P=XSvv^gy#jbH4cff+HCg3dF`9{ROufanM@pvlg89-DTp<GE=|a7
zNd5+iT%3X}#IBK`Uftc9fzKSZ9UYn1P6yg=Z{c3Php_d6b987gci-r{#^S54j>of-
zn{&-7yhC;uiWUQwH5M{}B+F<P;WNQy7hhXw*LUS~PDEQQC+uF;^)>a$dT)bqV}sbq
zhQ?LoVjXRc7((gp_O{$8(M8WS=9AUV-oAR{W)F@=bX1#4J}*!1622+({DDs(a`Z{)
z0OKjy5@0K>t(*xKux-a8Vw*X~e>^rR3H9*zk-E2-{el-GOdhAgkgT(tg`tiXWW_V4
zvW*=NVvK(WwMY)~G_>@XI|iD4)r}b4cQ7Hzp5a}cy}5%={b2JIA@QK89lv3ygbsW?
z-0Z`2PUqMhKJ2@cuArET8~<VJ$zQqZuW~&aIzK(}i8M!Uwz+5q4XfMfooa9-4BY-b
z9|xcQJ<}O}zdukLN3u=fw70f43>|{GpY2)xL%uf*#9BTeyQnE#@SPwNlx1MIP3fQ|
z0aq=f^a*Z<2w?J)GNW@kMM%+N)8)vOQYWG%8`0&dK|kWw6(&8Ys8ub&aWDDdOFhAc
z`V^ZZdHmzbE}lvF>U9#vMO)Y2(037Iu9)twbB$-~LA9tU&Sz1GhHij@Ot%15h0Y{3
zgO8W2ycKQEq}8>S#gc8yNKv~qW{+`hQO~D7OIa2R86M%5i@BJlf&Mra*U|6Thf`82
z7(}+uK3@3{g?UEUD{r+-<muOBt^wlohn~~hR@tc}GasnUq#DI#X&5bwBt?_=#XXVK
zg6gyV(4q1x-rkGZGis8<f7hzpboK<foH|TqrKZdzpzwW?{vH=OC?R@cxTdC896h?d
zc)>J`!8WJsd-R2^x|;q~8Pba@!CZd@^2iEB9*UxE(h5v~E;sqSHRIeyQk8e5B(>1i
zQ(x*O7ZHOJeyi;63SP<wQDBFv`xC(Wssf61#A1wrc7{>Aja5bwEwSbvW(iXiV>nj?
z85>o0(@~>GX#CgL=ny*9-e!Bb$ge<wBRc#@L|V0t2Vse+&e-=C!Pm&a!OoBZKbi%K
z29k6_(^zd{pA}tX-$D3zjzx{UE1%ad@g<A3;;Cb>eDUPFf{$&>;+>cQkz6*<Boo{$
zJrp4->MkE!u&XT@e+2U#Ksi-g6+HGT;D)X*GbDfbsjYo$yO%tAY^t^y8YqSo0uBXs
zcn*Xy7AOK*tLi#+QBD&4vL9=HVM)q)moXYJr_exV5XUd|3b-RU@o*~aE7#{GLS7&O
z-~Sx?KnZ?Zqx^KXPP1W)qd6NL&ad0xk1}A#NI1jDHsfL~_Ng1VB*~W6<uFtTzkatX
z(hkYZej)-KGEsPY8-c`9`JNnIlT4K!_NxE5*FLj6D9adIQPIZpC3LVcBglsfx1gZU
zVytHF(+qtf9?c8jOJwsJCX6TF#G|bYsk*=&(vD<FS!fqrAKi2^fRG#WdN=4=Ak5Ux
z`ma5rdW;IzN8*RT*6rq*Z%=%LdcRk~qwH--(}E;>r#A^7?Y96@t82Fd>jp#*S{Y7x
z6}QAdz#qqVd@@g;4t*Y`REX7%cUTcl%Dx_3q&{54n^FbvbcRW?q%L)bRnh`WY^~q0
zhpVB1fbCk}JlHq``Yj0~yRTI1AMW|g*__=8@5T`DzE8Eq?ji|;eX|_zJTPXHA(%z(
zx3A|+yLcH`iXy-U8KOf1h)+?<Qu!HqSbN08)Oqi;v^pNYBSlTrjSVzFKa{JNo0{a~
zUiIBF<^1I`<Lu#4^=l6~UMkvHtmg#Mj#sy8J9`}5aeon%vvY4AZTBA2So-%fq%naE
zk#EUDt5!p$iZG)UOwz#c9X5Y(MSjv-fGO&@6q=75iCLEBY|xVn&ewo03H+G~Q4;p7
z;p&Rt8JYRd$zflyct)huj-GRo6!ibdJ{D<h;x&kx9PX)l9oI748#iCx)#B-OO(BUP
zS55J|u$rvUrQKvt;m2~+Th8o9S)iB2yh9(fu9OxvC4&hpa)?hdH6VL=z89p%(n8*g
zkzC6wlau<UYfA#DW8o^r$MYB$3tn0^Fu9#$Tly0U*H1McQ&wjuqny%F`93KV9}Rt&
zJU(SQz%FY2%?>RfmHE0WS}Fgs-Bnwd@<-H&gY1q~NrIq-56Bt5IQ2ou=S2FD^xTT~
zF2cSZL!3|e_Pki<h2?Au>ATLi#3?_Gd^#17rQ|h6S!|Ug1M6<;7Djy}JNgM4I(Lbx
z4EJga>w5}d6<7`D{%l}*bNdS@u26<6cswVs_C>w&zC`fT+C@#@d94>}@^U|I?6j~Y
zr^24%<7FYjcp42n90W*UXliOsc>y0$>mR?&iU(Bt`?G$MrA&VhKuxG5!o5a!IA>Br
zL>pmnalV9la9lh;o9>849DU_e>P_v7!wsG}-2EXxrLpJt%E2byQ-K>?;&8mdC6Fn4
zr^EXZyO#puq@!D$yRc&^KR0>(^+X1p!wFl_Ve!LPIzo`yY3Y6=;W-RP4?FZ$cR)=Y
zO;sNH<!7Ak_3N{!^&n4`A4;S9lAa?xQ_sTJn32tM+eE-hZth|2)JVXpV2E7|Sz4r1
zQ$8eYX1@3clHz<PF^u;3iy4X~kas;6%JsdiA{ubrG5PueyNB~JCz<1-ld7rdQ)X}c
z*BX)`zstKnY887Qf-BJI9)ZN#^R2JLiIN+|><J=0_qQJ3)Yqamk4?SL)eve(8UC)d
zI3Y)EC*^(XST;MTr&a1;FM4u0EmaTn=oh^&P(8CmEl6Huw&Qcro^qZ>v$pY5He9p}
zc{9aA(jbf-ap3Fo1tCysYu442{V52hWFwECI}$7PnBv00N`5CM@VWSB<7haevCDKP
zOwR1rAa~Gu1-xK6SD>}&+)LnOaf)BJ=h9|z7eStMb{l;h1hYo2zx$c}5%NTUgk7nq
z@5tlbceeF!MlA&fMx@Hssv_XVl+bL6s`!$IrO~X^3Kl$2pqZ={I}jU3-e=k-b&_M#
zQ)V9O=j;e`zINkDmc4{t>36I3-rc?II59CeQv`JeNpOMy>%8;~fP3<|4%m9deiKCq
zDTN^eDhOC2mk~?gMSUTlV=8$A6-HU7nc2E{xY4@Xs<T*pTD$gf0FC=Q9khT0-Zawr
z?BbG6{fVt*i5cJc1*O%1PHhf0(e!RlO>>K0US4BL7@%X0#W>f4w5Hz06pf368j4R5
zJ|6)h7M7>~{F^lj!1NrMQR6s{wY91(VD4#hX8c6^S)JtAM$Y~@#;*#NT-IG~u_jhN
z8Eg5XX~(k;gGFL5;XIbH7CbleO&9$U<J@JTIu-FVHJ<~2OJ}+)&kH)7Kq<n<S$x%`
zH_h`XD7fo?dI3x)BD@3cQ1=Zb4I|0Wix*a>si8r!n>LfyMk5&nD&GVu%AQ8U8mhx4
zCc5Jup_e#IcQD;W47J5B&UrFd?v;I)K)K*bGM7z+xBR5pd`=%Ycsb*qa7qZmu08nK
zS`IhPvhMG8*T^-W^h>E_iaBN^V6oNX#vAF%PYg6B7^LnN#>%5+w=%c5a#m0f$ysB|
zvsZSgT5dsR&c~>+)kPb;GVgg)KsNH;guzV!$`uEY#d-HTuZtr?jyLL-q+TU&&mjqp
zIBvTzK|aCQ=nV}O`1r<8xVCUsP~&x^_VU%uBvrD0$XrdK7U)s$;iADtUVGeKWXDm(
znjT}~1dA7o{?a4v3Zbn_>Fvukl(pi8PwYsEv0P+|VTU@yf(Vg7xXJZCwgt)iBu?(4
z9t*zcxdT_sS8+Bc9oYdbs?#`%>R6CRD!S?3zGHlZ(UmJ=WFVzwlf}ABfW{CBTV6AX
zQXzwB2#Wxc?1kW}OM~bdQ}a)~x92aBT!$Yp%2bM<*^S2ZttakajBS;ZR%%DwLSC8V
z5B0|>m3Tg@-{33ODkg($`aJysb9p65*}uI~Bdk~Q7JFge=4b|V&TFg;oZVE?TkVus
z-(s}%$;K5^Y-K0Z56(+M6{C6vyO^PJ+-Jm%?0wa-YSSM;#QIuNQcpmd!OPhy!F$`@
zJM$@t0HUbbXzr`d2cLP3%D!qoIk)4iLa87A9wD}k=uru$FCW_xLEkg*qJ~B)ECfYd
zmfm5f(;@Ga2%)5^-|fmmMw?&o(rqn^FL<n=@rRMVS>-F+%JbsiVCkdu_G<8!*dLlE
zW%!&{H*x6pjsgdUQz!c?XSBcON)8Z3g09ldjMSKTR#W)g;Qe^k&?iq^MZ-7srzdn%
z&XI`E=`nA&+eVTEI9lW}2n`lGYlV@#;*O4#Ix*)vczwtsQwJoIhcFG`14|Vv)3<k{
zYqxi6owp~H_tzV_Z{_1PuE;|<^E1_1F<WQ_;|hmca)=DKoO)`kG3zmb)fFj-p+jT}
zMWm&U{-TlnrsunHiPH73R93iwfKtUq!pF<rKz){Ipz((gY;m>6*hkDFD%KdEK_s}b
zh-I$#zVk2VmMRid)ujBlP0vSbmOBOY4EThUgsWeM-wOHaiQ-uz2+xA0KK-U2`I0<h
z{OQ0U>fNXGQETL#a^NN|!MDjQ4&T+Vj9A8zPb1#EIdOQA*<h=MZ`{AHdpA`2t7kIW
zT7=1dl8K$fh@Ty0K&C#1&XZ#A?0;LHGGgI26u(a%f{3SH7QSdtw7N&VU@Ozz1@j&S
z`IBIUqHE5r&f^m56ZwSYh`O@D#SBL|<G``jc5duxxqfsq-&h`PrRSQOO=xp}P@wn2
ze%pDob0mIqxf6o8#+xe1mgCZ1!X`??SiBIw@jQ>jgT8bx0g$zAuom%9$KXU*n$o2x
zvIEgF4ioFQjTS~<4Y^K_WZm8TT%=Y_exx5_XX&`7(~<o~_v*!(>sU&(534L?zuN24
z45KF!g-;?mzVrJv+;YP%?~w>&6>Y!A11CQemsBynXRYp{7#j`ezr)9!)*5!sS53sO
zL}k{1dU;jG%nY){8hvJ>!f8dtLyb)~#3z%-o8kr*s0Ajz$H8%6ILVJPVdzah7H|^i
z5OTe)VNWLJOd*_L<~TSyEnT!)cAdCixeICOD7_BeAFJBG?sUBSeX{DQkDK`<HplE9
zUQ}FMK6h_eh}2Q@yuCTRA3yx;3Hc;12qG%uAOkk?r5>~XR`V+9plp<Vp{3;2R2Y(-
z)x79^F}_vRo<2~uS|hxAkC%B(q34;ZWTP|;GJ$1Ts$8gN!-V}TWiFSznV{XblyO;D
zSbQwIpTEajV}wgZ<&}0`Ambw$T(A#a4{t7qzjg;MRbBAR-;q_~!o;v|;Kv7|){Hog
zPp1}FDxIOqh@z^gA0F6}U_oc&-LmQmXoUED|F0)+T$OW%Y-T$8Q_`7e3!z~xa>>Qk
z(Zl|cM%N6ujllth2xr0cyRf;JS#w~0qYRRhMxhm3dBvYU<^2P`G?6`>tuW>(zOQ%8
z9;nV0Pu|gGGtXY0KlmZ)|Jijj2DT8H8IQYm*eVRRCXRXy2bZisF4R>`$W|!H9mM=S
zpew4H`=YSMHkb%gw{D|w*bV)gTyQ|EiK0!KjSa^b{&ijXu352EN{Wq*@#iM@3EvK5
z4$K=2dZe2E=RKUax>-f*VlWH8RkkBC{d|RQJ!H7mxgu^pb(!;=Uuu&z9?xvxsrOTe
zwR&GqT!V12Lj3oCCSNaoW>Y*qVv1Vbrx0Jh*d0&5&cF?XdmkFm*T<!&1`5K3dCSYo
zd#WDy$wIpgb<#9R5hFV9ERb(G4V@L)nZA{zq*ZyHVlTie5A*OY;7@-|ehanSa8%V0
z*_x{gx~J&yWy`fmySGjGb=GUFUlnrezH@?VZu$clvb!$NFbr!@#UsSDi{KD=pG6Gw
z{W0jn7{8K1ZoUx1)R~M-tI|{1td@j!iqB<UY7+XQy+N-E&7*nam{1eceE!gMBeq0#
zAG@jh3jtpX3>dXG2_~6e-}5aAA$Ag5Z8;iTFX9|;#5w=<%oUR}_#`jXy}WUAG~6>6
z7mDK}`kX`j4N@=N^jnw=j%~P^qcY-U*4w&{I%5HrfWC_W4pFg?QG5q0yr<6Ru?P~e
zpA(J&obinm?5rNf=Iu?&1$lP)u%EjZ@f7CQSEY%?iGVt5SSG<1T#<OWTUuQGPN)F=
ziWV#N{-Af_Lgg%52m!Lt+HH5`SX9!)f}ELr5a9#I^yjO9iSXd=HV9kB7Y+FDb6ZYk
zniCB-G8}v^CT%Ob?K#5gQT)?kf(laHp@}v}>Jaw*`!+zGG*oj!&CVN!@RO3=?Y(19
zN)vH544=>Fs~?m`)Y2yUo;S>~gA@KRZir8_d+DV;+{lQbm#6Qy`$t%o62zyV_2*(d
zf0!QRxM4~zcwDQ{qr%0$Fq1OrKv3mt%TAEW%JUFWOgoZB%gJ<k=YbIi-v02@C!87t
zjzq5dK_efgrJ;^lrU7SlBT~?PLD(8JWbtJ<GWcBZu=JV%6&?iES&*X!RhFn!D@sC<
z^~pa9QccVKt}6UZb?b7j5T0|H!W~iU-NL~02KV0TK{eCuDWgl1H6clGMq^HJKq>O8
zNH~90UHu-WA|d>wAPw<z!cc2Y^WN*C-$Pf%=kzlT2=ywkW6GT32>!BYFHrqELooAz
zx#L^qjLx|<<5!!OL4+(-b$I9p9bd-d5*kkm>RK?t`ox>Uys!44hj-VfXDkFI2x08<
zh>!4=Vppt!%W;nSu5ToHGDRG56?l-wfY_(`+aRTBO+7~uh`iyniEFm0S{+ac{$pB7
zq-=Qd%nACd_h&g4PQCUkwBY1U_tpV@+1Y*{C^JuYmtG+)eeyRxo4T=G5~66SF-ldT
z55B`{Ovg%&YXY#Y^b~c{R85-#SyG2rp1S>=P0n^V#_^*NH;=~BxakCLqZ!_r=Gr)_
z=fQ!t^7BSck>Yva4ShVrF^WQE29o1%uGG>H`3yXQzLS*fzEPhJZ|Kbu*qiUyfrt0@
zSwb&C@Kyas`1|EUVQe)Q0bixmP&=dJ2{pkL&ptozZfcc$x4^Fq>RWELG;faK&N+`N
z76}}7_wXBs=-stVYhT;%YgC<SVkTz~E~Jr#BfW;;)N4|y+5!X$V3%PwrB^4ZNctxN
z8LH>FHZ~M0Pk)hbJ@oT@?3%&BBK8AhEE&CN@1k|^_!=dPpfxgUjllvGXT)V9>98i+
zerCR400p<UjP>|=mpv8E|6)D-WU4(JyM6|=KLY72#X<_p)|q0GmDt{3&V6Dztia?j
z`?}bFZ>54yWW%XC-Sdk2r(%2mVWLvMN(4m@UgMB)sjqOF;^|jmWZl-zyX9FzGpkL?
zmc$Q(_1}Qt8-iy6!x<6Syfb$P=icA>k*VtJY+~6tzb<BDlS(;!%@kDNt>RqI+X?M?
z0<<ubZOMoy(uHJLJIXo)K=jOaL3#zmgp1XfIz)$Vev8P*2!dUYmXWxUd4j>78@=JB
zpJ?}IqpoBR9V?>OZ!7zR@8f=4WsAZbvPor#R#xbRiJc7tI-8i(4Mx-Ws|WSCC##B<
zdIGy+z*;%_Q?It>2);0VIG&SDFkL@?rR-hSqKqe2pPE^o96i&cRx8NDV*VkZ)jAlJ
zaeHUyb~$(9n+%taSC-cR(MZhC>+5S))>C*nmWWDtB@?T#JpLV~i2nFw3Jp|~@1U_F
zxtEilR1%uul{;aw?uPHywW06}BJTkWXz(w$JPgf^*~|G&$;L6O%gFq4C8n3<EnEtw
z+B7WT`xzeV=T#+qGi&pNn&(TIAJh+P8LX*{DXa7*26<Uvq!~BCxb=F12#!^uCaoy1
zZ5q_e7!$K>XcRbq8mP~o+clMvj^P$p9OLb;^kE=FS7F(E+bJoQ3Z$wPr*1;^-ty^Y
zk5fldGSUo7K={SU+jylgYH9E4;w)5H1`sP#u%f0mzz<(N;Zt!h($4x;(vvRJ^OA+&
z<&aA~!|`EE-Hes~uW3e+H|j=T;qJWREHAG_D&De&c>#rm>SctmNldc+;)_Ofm6Q~u
zdhh1w(~CdHT^{TV{QRh0#M5&y9B{vOkIhj|tFeM%{w6DnD^k}Vm-7)y9jXKr<uwu|
z0f0gULIFQR8N@+>KYBnP$PefPxeoP#{J`-a<bQDdv*3T__$R^t3)NJ5b=Rn7sIMDS
z-~P?1|CMg|zjga=!3>avg5D>AKPqY22MuN~W075!<rq(?IX3uvujjw*@%(??ZTNrK
zV*2mQGd{GO{?%UkKR0ClY0&&PEvDV#bpf#`u-0MpngD2t$0$nX-1+RNUnslJ#B3^l
d4a3kg4os@7=cf(MfBsXZD61w@C1vsEe*oNHENuV)

literal 0
HcmV?d00001

diff --git a/src/packages/components/Informations/Inputs/InputsPagination/index.ts b/src/packages/components/Informations/Inputs/InputsPagination/index.ts
index cfc3b912..c1a69252 100644
--- a/src/packages/components/Informations/Inputs/InputsPagination/index.ts
+++ b/src/packages/components/Informations/Inputs/InputsPagination/index.ts
@@ -10,5 +10,5 @@ export const InputsPaginationConfig: ConfigType = {
     categoryName: ChatCategoryEnumName.INPUTS,
     package: PackagesCategoryEnum.INFORMATIONS,
     chartFrame: ChartFrameEnum.STATIC,
-    image: 'inputs_select.png'
+    image: 'inputs_pagination.png'
 }
\ No newline at end of file

From c5788f79b3a90d51278f124d5b1f28bd4544dba3 Mon Sep 17 00:00:00 2001
From: luoyp <2456821174@qq.com>
Date: Mon, 14 Aug 2023 11:01:04 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Informations/Inputs/InputsInput/config.ts | 24 +++++++
 .../Inputs/InputsInput/config.vue             | 18 ++++++
 .../Informations/Inputs/InputsInput/index.ts  | 14 ++++
 .../Informations/Inputs/InputsInput/index.vue | 64 +++++++++++++++++++
 .../Inputs/InputsInput/interact.ts            | 27 ++++++++
 .../components/Informations/Inputs/index.ts   |  3 +-
 6 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 src/packages/components/Informations/Inputs/InputsInput/config.ts
 create mode 100644 src/packages/components/Informations/Inputs/InputsInput/config.vue
 create mode 100644 src/packages/components/Informations/Inputs/InputsInput/index.ts
 create mode 100644 src/packages/components/Informations/Inputs/InputsInput/index.vue
 create mode 100644 src/packages/components/Informations/Inputs/InputsInput/interact.ts

diff --git a/src/packages/components/Informations/Inputs/InputsInput/config.ts b/src/packages/components/Informations/Inputs/InputsInput/config.ts
new file mode 100644
index 00000000..f99c35d7
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsInput/config.ts
@@ -0,0 +1,24 @@
+import cloneDeep from 'lodash/cloneDeep'
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { chartInitConfig } from '@/settings/designSetting'
+import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
+import { interactActions, ComponentInteractEventEnum } from './interact'
+import {InputsInputConfig} from "./index";
+
+export const option = {
+    // 时间组件展示类型，必须和 interactActions 中定义的数据一致
+    [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATA,
+    // 默认值
+    inputValue: "0",
+    // 暴露配置内容给用户
+    dataset: ""
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+    public key = InputsInputConfig.key
+    public attr = { ...chartInitConfig, w: 260, h: 32, zIndex: -1 }
+    public chartConfig = cloneDeep(InputsInputConfig)
+    public interactActions = interactActions
+    public option = cloneDeep(option)
+}
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsInput/config.vue b/src/packages/components/Informations/Inputs/InputsInput/config.vue
new file mode 100644
index 00000000..1c7900ee
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsInput/config.vue
@@ -0,0 +1,18 @@
+<template>
+  <collapse-item name="输入框配置" :expanded="true">
+    <setting-item-box name="默认值" :alone="true">
+      <n-input  v-model:value="optionData.dataset"  placeholder="若未输入，则默认值为0"/>
+    </setting-item-box>
+  </collapse-item>
+</template>
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { CollapseItem, SettingItemBox } from '@/components/Pages/ChartItemSetting'
+import { option } from './config'
+defineProps({
+  optionData: {
+    type: Object as PropType<typeof option>,
+    required: true
+  }
+})
+</script>
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsInput/index.ts b/src/packages/components/Informations/Inputs/InputsInput/index.ts
new file mode 100644
index 00000000..0828ea35
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsInput/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const InputsInputConfig: ConfigType = {
+    key: 'InputsInput',
+    chartKey: 'VInputsInput',
+    conKey: 'VCInputsInput',
+    title: '输入框',
+    category: ChatCategoryEnum.INPUTS,
+    categoryName: ChatCategoryEnumName.INPUTS,
+    package: PackagesCategoryEnum.INFORMATIONS,
+    chartFrame: ChartFrameEnum.STATIC,
+    image: 'inputs_select.png'
+}
\ No newline at end of file
diff --git a/src/packages/components/Informations/Inputs/InputsInput/index.vue b/src/packages/components/Informations/Inputs/InputsInput/index.vue
new file mode 100644
index 00000000..e01e75f3
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsInput/index.vue
@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <n-input :style="`width:${w}px;`" type="text"
+             v-model:value="option.value.dataset"
+             placeholder="请输入"
+             @change="onChange">
+
+    </n-input>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { PropType, toRefs, shallowReactive, watch } from 'vue'
+import { CreateComponentType } from '@/packages/index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { useChartInteract } from '@/hooks'
+import { InteractEventOn } from '@/enums/eventEnum'
+import { ComponentInteractParamsEnum } from './interact'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<CreateComponentType>,
+    required: true
+  }
+})
+
+const { w, h } = toRefs(props.chartConfig.attr)
+const option = shallowReactive({
+  value: {
+    inputValue: props.chartConfig.option.inputValue,
+    dataset: props.chartConfig.option.dataset
+  }
+})
+
+const onChange = (v: string) => {
+  if(v == undefined) return;
+  // 存储到联动数据
+  useChartInteract(
+      props.chartConfig,
+      useChartEditStore,
+      { [ComponentInteractParamsEnum.DATA]: v },
+      InteractEventOn.CHANGE
+  )
+}
+
+// 手动更新
+watch(
+    () => props.chartConfig.option,
+    (newData: any) => {
+      option.value = newData
+      onChange(newData.inputValue)
+    },
+    {
+      immediate: true,
+      deep: true
+    }
+)
+
+</script>
+
+
+
+
+
diff --git a/src/packages/components/Informations/Inputs/InputsInput/interact.ts b/src/packages/components/Informations/Inputs/InputsInput/interact.ts
new file mode 100644
index 00000000..d6c070f4
--- /dev/null
+++ b/src/packages/components/Informations/Inputs/InputsInput/interact.ts
@@ -0,0 +1,27 @@
+import { InteractEventOn, InteractActionsType } from '@/enums/eventEnum'
+
+// 时间组件类型
+export enum ComponentInteractEventEnum {
+    DATA = 'data'
+}
+
+// 联动参数
+export enum ComponentInteractParamsEnum {
+    DATA = 'data'
+}
+
+// 定义组件触发回调事件
+export const interactActions: InteractActionsType[] = [
+    {
+        interactType: InteractEventOn.CHANGE,
+        interactName: '选择完成',
+        componentEmitEvents: {
+            [ComponentInteractEventEnum.DATA]: [
+                {
+                    value: ComponentInteractParamsEnum.DATA,
+                    label: '选择项'
+                }
+            ]
+        }
+    }
+]
diff --git a/src/packages/components/Informations/Inputs/index.ts b/src/packages/components/Informations/Inputs/index.ts
index bea83789..215dd78a 100644
--- a/src/packages/components/Informations/Inputs/index.ts
+++ b/src/packages/components/Informations/Inputs/index.ts
@@ -2,5 +2,6 @@ import { InputsDateConfig } from './InputsDate/index'
 import { InputsSelectConfig } from './InputsSelect/index'
 import { InputsTabConfig } from './InputsTab/index'
 import { InputsPaginationConfig } from "./InputsPagination/index";
+import { InputsInputConfig} from "./InputsInput/index";
 
-export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsPaginationConfig]
+export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsPaginationConfig,InputsInputConfig]

From 95b50c7d76aaa08e143edd26a7d18e682815a3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Tue, 15 Aug 2023 09:29:06 +0800
Subject: [PATCH 25/25] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3TS=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Decorates/Mores/FullScreen/config.ts      |  2 +-
 .../Decorates/Mores/FullScreen/index.vue      | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/packages/components/Decorates/Mores/FullScreen/config.ts b/src/packages/components/Decorates/Mores/FullScreen/config.ts
index bed59c06..b21d443d 100644
--- a/src/packages/components/Decorates/Mores/FullScreen/config.ts
+++ b/src/packages/components/Decorates/Mores/FullScreen/config.ts
@@ -12,7 +12,7 @@ export const option = {
 
 export default class Config extends PublicConfigClass implements CreateComponentType {
   public key = FullScreenConfig.key
-  public attr = { ...chartInitConfig, w: 150, h: 150 }
+  public attr = { ...chartInitConfig, w: 150, h: 150, zIndex: -1 }
   public chartConfig = cloneDeep(FullScreenConfig)
   public option = cloneDeep(option)
 }
diff --git a/src/packages/components/Decorates/Mores/FullScreen/index.vue b/src/packages/components/Decorates/Mores/FullScreen/index.vue
index 805c8294..89590bb0 100644
--- a/src/packages/components/Decorates/Mores/FullScreen/index.vue
+++ b/src/packages/components/Decorates/Mores/FullScreen/index.vue
@@ -30,40 +30,40 @@ const isFullscreen = ref(false)
 const checkFullscreen = () => {
   isFullscreen.value = !!(
     document.fullscreenElement ||
-    document.webkitFullscreenElement ||
-    document.mozFullScreenElement ||
-    document.msFullscreenElement
+    (document as any).webkitFullscreenElement ||
+    (document as any).mozFullScreenElement ||
+    (document as any).msFullscreenElement
   )
 }
 checkFullscreen()
 
-const requestFullscreen = element => {
+const requestFullscreen = (element: Element) => {
   if (element.requestFullscreen) {
     element.requestFullscreen()
-  } else if (element.mozRequestFullScreen) {
+  } else if ((document as any).mozRequestFullScreen) {
     /* Firefox */
-    element.mozRequestFullScreen()
-  } else if (element.webkitRequestFullscreen) {
+    (document as any).mozRequestFullScreen()
+  } else if ((document as any).webkitRequestFullscreen) {
     /* Chrome, Safari and Opera */
-    element.webkitRequestFullscreen()
-  } else if (element.msRequestFullscreen) {
+    (document as any).webkitRequestFullscreen()
+  } else if ((document as any).msRequestFullscreen) {
     /* IE/Edge */
-    element.msRequestFullscreen()
+    (document as any).msRequestFullscreen()
   }
 }
 
 const exitFullscreen = () => {
   if (document.fullscreenElement && document.exitFullscreen) {
     document.exitFullscreen()
-  } else if (document.mozFullScreenElement && document.mozCancelFullScreen) {
+  } else if ((document as any).mozFullScreenElement && (document as any).mozCancelFullScreen) {
     /* Firefox */
-    document.mozCancelFullScreen()
-  } else if (document.webkitFullscreenElement && document.webkitExitFullscreen) {
+    (document as any).mozCancelFullScreen()
+  } else if ((document as any).webkitFullscreenElement && (document as any).webkitExitFullscreen) {
     /* Chrome, Safari and Opera */
-    document.webkitExitFullscreen()
-  } else if (document.msFullscreenElement && document.msExitFullscreen) {
+    (document as any).webkitExitFullscreen()
+  } else if ((document as any).msFullscreenElement && (document as any).msExitFullscreen) {
     /* IE/Edge */
-    document.msExitFullscreen()
+    (document as any).msExitFullscreen()
   }
 }