fix: 修复naive 时间示例无法修改的bug

fast-crud · Sep 16, 2023 · 6ab9218 · 6ab9218
1 parent efaed4f
commit 6ab9218
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 14 deletions.
diff --git a/packages/fast-admin/fs-admin-antdv b/packages/fast-admin/fs-admin-antdv
diff --git a/packages/fast-admin/fs-admin-antdv4 b/packages/fast-admin/fs-admin-antdv4
diff --git a/packages/fast-admin/fs-admin-element b/packages/fast-admin/fs-admin-element
diff --git a/packages/fast-admin/fs-admin-naive-ui b/packages/fast-admin/fs-admin-naive-ui
diff --git a/packages/fast-crud/src/d/crud.ts b/packages/fast-crud/src/d/crud.ts
@@ -455,6 +455,11 @@ export type FormWrapperProps = {
    * 对话框使用什么组件，[el-dialog,a-modal,n-modal,el-drawer,a-drawer,n-drawer]
    */
   is?: string;
+
+  /**
+   * 是否支持拖拽
+   */
+  draggable?: boolean;
   /**
    * 对话框打开前事件处理
    * @param opts

diff --git a/packages/fast-crud/src/types/functions.ts b/packages/fast-crud/src/types/functions.ts
@@ -1,6 +1,9 @@
 import StringUtils from "../utils/util.string";
 import dayjs from "dayjs";
 import { useI18n } from "../locale";
+import advancedFormat from "dayjs/plugin/advancedFormat";
+dayjs.extend(advancedFormat);
+
 function doFormat(date: any, format: string) {
   if (StringUtils.isEmpty(date)) {
     return undefined;

diff --git a/packages/fast-crud/src/types/list/date.ts b/packages/fast-crud/src/types/list/date.ts
@@ -22,7 +22,11 @@ export default function () {
       },
       valueBuilder({ row, key, value }) {
         if (value != null) {
-          row[key] = dayjs(value);
+          if (ui.type === "naive") {
+            row[key] = dayjs(value).valueOf();
+          } else {
+            row[key] = dayjs(value);
+          }
         }
       }
     },
@@ -41,7 +45,11 @@ export default function () {
       },
       valueBuilder({ row, key, value }) {
         if (value != null) {
-          row[key] = dayjs(value);
+          if (ui.type === "naive") {
+            row[key] = dayjs(value).valueOf();
+          } else {
+            row[key] = dayjs(value);
+          }
         }
       }
     },
@@ -56,7 +64,13 @@ export default function () {
       column: { width: 210, formatter: daterangeFormatter },
       valueBuilder({ row, key, value }) {
         if (value != null && Array.isArray(value) && value.length === 2) {
-          row[key] = [dayjs(value[0]), dayjs(value[1])];
+          if (value != null) {
+            if (ui.type === "naive") {
+              row[key] = [dayjs(value[0]).valueOf(), dayjs(value[1]).valueOf()];
+            } else {
+              row[key] = [dayjs(value[0]), dayjs(value[1])];
+            }
+          }
         }
       }
     },
@@ -73,7 +87,11 @@ export default function () {
       },
       valueBuilder({ row, key, value }) {
         if (value != null && Array.isArray(value) && value.length === 2) {
-          row[key] = [dayjs(value[0]), dayjs(value[1])];
+          if (ui.type === "naive") {
+            row[key] = [dayjs(value[0]).valueOf(), dayjs(value[1]).valueOf()];
+          } else {
+            row[key] = [dayjs(value[0]), dayjs(value[1])];
+          }
         }
       }
     },
@@ -91,7 +109,9 @@ export default function () {
         component: { name: "fs-date-format", format: "HH:mm:ss" }
       },
       valueBuilder({ row, key, value }) {
-        if (value != null) {
+        if (ui.type === "naive") {
+          row[key] = dayjs(value).valueOf();
+        } else {
           row[key] = dayjs(value);
         }
       }
@@ -110,7 +130,9 @@ export default function () {
         component: { name: "fs-date-format", format: "YYYY-MM" }
       },
       valueBuilder({ row, key, value }) {
-        if (value != null) {
+        if (ui.type === "naive") {
+          row[key] = dayjs(value).valueOf();
+        } else {
           row[key] = dayjs(value);
         }
       }
@@ -129,7 +151,9 @@ export default function () {
         component: { name: "fs-date-format", format: "YYYY-ww[周]" }
       },
       valueBuilder({ row, key, value }) {
-        if (value != null) {
+        if (ui.type === "naive") {
+          row[key] = dayjs(value).valueOf();
+        } else {
           row[key] = dayjs(value);
         }
       }
@@ -148,7 +172,9 @@ export default function () {
         component: { name: "fs-date-format", format: "YYYY-[Q]Q" }
       },
       valueBuilder({ row, key, value }) {
-        if (value != null) {
+        if (ui.type === "naive") {
+          row[key] = dayjs(value).valueOf();
+        } else {
           row[key] = dayjs(value);
         }
       }
@@ -158,7 +184,8 @@ export default function () {
         component: {
           //el-date-picker,a-date-picker
           ...ui.datePicker.buildDateType("year"),
-          vModel: ui.datePicker.modelValue
+          vModel: ui.datePicker.modelValue,
+          format: "yyyy"
         }
       },
       column: {
@@ -167,7 +194,9 @@ export default function () {
         component: { name: "fs-date-format", format: "YYYY" }
       },
       valueBuilder({ row, key, value }) {
-        if (value != null) {
+        if (ui.type === "naive") {
+          row[key] = dayjs(value).valueOf();
+        } else {
           row[key] = dayjs(value);
         }
       }