@ithinkdt/page 4.1.0 → 4.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/page",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT Page",
@@ -40,8 +40,8 @@
   "sideEffects": false,
   "dependencies": {
     "@vueuse/core": "^14.3.0",
-    "nanoid": "^5.1.11",
-    "@ithinkdt/common": "^4.1.0"
+    "nanoid": "^5.1.15",
+    "@ithinkdt/common": "^4.1.1"
   },
   "peerDependencies": {
     "vue": ">=3.5",

package/src/crud.js

@@ -70,10 +70,7 @@ function _useSimpleCrudModal(crudType, getItems, request, options) {
     const setModalType = (crudType) => {
         let type = options.modalType
         if (typeof type === 'function') {
-            type = type({
-                model: model.value,
-                type: crudType,
-            })
+            type = type(crudType)
         } else if (isRef(type)) {
             type = type.value
         }
@@ -123,6 +120,7 @@ function _useSimpleCrudModal(crudType, getItems, request, options) {
                 initial
                     .then((res) => {
                         model.value = res
+                        modal.reset(res)
                     }).finally(() => {
                         loading.value = false
                     })

package/src/description.js

@@ -56,10 +56,10 @@ export function useDescriptionsHelper(
 
                 const bindings = { }
                 for (const k of Object.keys(options ?? {})) {
-                    if (k.length > render.length && k.startsWith(render)) {
-                        bindings[uncapitalize(k.slice(render.length))] = options[k]
-                        delete options[k]
-                    }
+                    if (!(k.length > render.length && k.startsWith(render))) continue
+
+                    bindings[uncapitalize(k.slice(render.length))] = options[k]
+                    delete options[k]
                 }
                 const bindings0 = computed(() => {
                     return Object.fromEntries(Object.entries(bindings)

package/src/form.d.ts

@@ -255,6 +255,7 @@ export type FormModalOptions<Model extends {}> = FormModalOptionsBase & FormHelp
 export interface FormModal<Model extends {}> extends Omit<ModalReturns, 'open'> {
     open(this: void, model: MaybePromise<Model>, title?: VNodeChild | (() => VNodeChild)): PromiseLike<Model>
     reinit(this: void): void
+    reset(this: void, initial?: Partial<Model>, overwrite?: boolean, reinit?: boolean): Partial<Model>
 }
 export declare function useFormModal<Model extends {}>(options: FormModalOptions<Model>):
     FormModal<Model>

package/src/form.js

@@ -61,10 +61,10 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
                 }
                 const bindings = {}
                 for (const k of Object.keys(options)) {
-                    if (k.length > render.length && k.startsWith(render)) {
-                        bindings[uncapitalize(k.slice(render.length))] = options[k]
-                        delete options[k]
-                    }
+                    if (!(k.length > render.length && k.startsWith(render))) continue
+
+                    bindings[uncapitalize(k.slice(render.length))] = options[k]
+                    delete options[k]
                 }
                 const bindings0 = computed(() => {
                     return Object.fromEntries(Object.entries(bindings)
@@ -439,9 +439,7 @@ export function useFilterHelper(items, { customizable = false, cached, cacheVers
             const raw = StorageSerializers.object.write([sort, hidden])
             return storage.setItem(key, raw)
         }
-    }
-
-    if (!customizable) {
+    } else {
         reinit()
     }
 
@@ -598,6 +596,7 @@ export function useFormModal({ initial, items, rules, onSubmit, submitText, canc
         ...modal,
         open,
         reinit: form.reinit,
+        reset: form.reset,
     })
     return returns
 }

package/src/table.js

@@ -54,10 +54,10 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
                 }
                 const bindings = {}
                 for (const k of Object.keys(options)) {
-                    if (k.length > render.length && k.startsWith(render)) {
-                        bindings[uncapitalize(k.slice(render.length))] = options[k]
-                        delete options[k]
-                    }
+                    if (!(k.length > render.length && k.startsWith(render))) continue
+
+                    bindings[uncapitalize(k.slice(render.length))] = options[k]
+                    delete options[k]
                 }
                 const bindings0 = computed(() => {
                     return Object.fromEntries(Object.entries(bindings)
@@ -360,9 +360,7 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
             const raw = StorageSerializers.object.write([sort, hidden, fixed, width])
             return storage.setItem(key, raw)
         }
-    }
-
-    if (!customizable) {
+    } else {
         reinit()
     }