Merge pull request #9 from cloudhao1999/master

合并源代码
cloudhao1999 · Aug 18, 2022 · 512a3db · 512a3db
2 parents f6f2df8 + 6b2ec2d
commit 512a3db
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
@@ -44,7 +44,7 @@ watchEffect(() => {
       :filter-columns="filterColumns"
       :move-column="moveColumn"
     >
-      <span class="mr-4">
+      <span class="mr-4 float-right">
         <slot name="options" />
       </span>
     </table-head>

diff --git a/src/components/Table/src/components/TableHead.vue b/src/components/Table/src/components/TableHead.vue
@@ -5,8 +5,8 @@ import TableOption from "./TableOption.vue";
 <template>
   <div class="h-[40px] w-full border-b border-base border-solid">
     <slot name="title" />
-    <slot />
     <table-option v-bind="$attrs" />
+    <slot />
   </div>
 </template>
 

diff --git a/src/hooks/useWaterMark.ts b/src/hooks/useWaterMark.ts
@@ -23,8 +23,9 @@ export function useWatermark(
   const watermarkEl = shallowRef<HTMLElement>();
 
   onMounted(() => {
-    if (!isNull(document.getElementById(id))) {
-      watermarkEl.value = document.getElementById(id)!;
+    const watermarkMask = document.getElementById(id);
+    if (!isNull(watermarkMask)) {
+      watermarkEl.value = watermarkMask!;
     }
   });
 
@@ -47,7 +48,7 @@ export function useWatermark(
     if (cans) {
       cans.rotate((-20 * Math.PI) / 120);
       cans.font = "15px Vedana";
-      cans.fillStyle = "rgba(0, 0, 0, 0.15)";
+      cans.fillStyle = "rgba(209, 213, 219, 0.5)";
       cans.textAlign = "left";
       cans.textBaseline = "middle";
       cans.fillText(str, width / 20, height);

diff --git a/src/views/dashboard/ActivityCard.vue b/src/views/dashboard/ActivityCard.vue
@@ -15,7 +15,6 @@ const { activityColumns, activityTableData } = setupDashobardAttributes();
         <c-table
           :table-data="activityTableData"
           :columns="activityColumns"
-          align="right"
           header-align="right"
           stripe
           style="width: 100%"

diff --git a/src/views/design/ArticlePage.vue b/src/views/design/ArticlePage.vue
@@ -59,7 +59,6 @@ const {
         :table-data="dataSource"
         :show-header="true"
         :columns="articleColumns"
-        align="right"
         header-align="right"
         stripe
         style="width: 100%"