@ithinkdt/page 4.2.0-0 → 4.2.1

package/README.md

@@ -506,6 +506,7 @@ const rules = {
 | 属性/方法 | 说明 |
 |-----------|------|
 | `inModal` | 是否在模态框上下文内 |
+| `modalType` | 模态框类型, `dialog` \| `drawer` |
 | `visible` | 模态框可见状态 |
 | `close()` | 关闭模态框 |
 | `setTitle(title)` | 设置模态框标题 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/page",
-  "version": "4.2.0-0",
+  "version": "4.2.1",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT Page",
@@ -40,8 +40,8 @@
   "sideEffects": false,
   "dependencies": {
     "@vueuse/core": "^14.3.0",
-    "nanoid": "^5.1.16",
-    "@ithinkdt/common": "~4.2.0-0"
+    "nanoid": "^6.0.0",
+    "@ithinkdt/common": "~4.2.1"
   },
   "peerDependencies": {
     "vue": ">=3.5",
@@ -49,9 +49,9 @@
   },
   "devDependencies": {
     "typescript": "~6.0.3",
-    "vite": "^8.1.4",
-    "vue": "^3.5.39",
-    "vue-router": "^5.1.0"
+    "vite": "^8.1.5",
+    "vue": "^3.5.40",
+    "vue-router": "^5.2.0"
   },
   "scripts": {
     "release": "pnpm publish --no-git-checks"

package/src/description.js

@@ -78,7 +78,7 @@ export function useDescriptionsHelper(
 
         ignoreDefaultEmptyRender_ ??= options?.ignoreDefaultEmptyRender
         const render0 = (model) => {
-            if (!unref(ignoreDefaultEmptyRender_) && renderEmptyValue && prop[0] !== '$' && isNone(model[prop])) {
+            if (renderEmptyValue && !unref(ignoreDefaultEmptyRender_) && prop[0] !== '$' && isNone(model[prop])) {
                 return renderEmptyValue(type_, 'description')
             }
             return render_(model)

package/src/form.d.ts

@@ -218,6 +218,7 @@ export interface FormRenderExtraOptions {
 
 export interface FormRenderParam extends FormRenderExtraOptions, Omit<FormHelper<Record<string, unknown>>, 'invalid'> {
     inModal: boolean
+    modalType: 'dialog' | 'drawer'
     readonly: boolean
     invalid: boolean
     handleSubmit(this: void, model: Record<string, unknown>): Promise<boolean | void>

package/src/form.js

@@ -84,7 +84,7 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
 
         ignoreDefaultEmptyRender_ ??= options?.ignoreDefaultEmptyRender
         const render0 = (params, model) => {
-            if (!unref(ignoreDefaultEmptyRender_) && renderEmptyValue && name[0] !== '$' && params?.readonly && isNone(model[name])) {
+            if (renderEmptyValue && !unref(ignoreDefaultEmptyRender_) && name[0] !== '$' && params?.readonly && isNone(model[name])) {
                 return renderEmptyValue(type_, 'form')
             }
             return render_(params, model)
@@ -125,7 +125,7 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
                 ),
             )
             let result2
-            if (!invalid.value && !prop0) {
+            if (!prop0 && !invalid.value) {
                 const ret = await beforeSubmit(prop)
                 result2 = ret[1]
             }
@@ -542,6 +542,7 @@ export function useFormModal({ initial, items, rules, onSubmit, submitText, canc
                 ...options,
                 readonly,
                 inModal: true,
+                modalType: unref(options.type) ?? 'dialog',
                 validation: validation.value,
                 restoreValidation: (props) => {
                     form.restoreValidation(props)

package/src/modal.d.ts

@@ -77,8 +77,14 @@ export declare function useModal(options: ModalDrawerOptions | ModalDialogOption
     ModalReturns
     & [open: ModalReturns['open'], close: ModalReturns['close'], visible: ComputedRef<boolean>]
 
-export declare function useModalRef():
-    { inModal: boolean, visible: ComputedRef<boolean>, close: ModalReturns['close'], setTitle: (title: ModalOptionsBase['title']) => void }
-    & [inModal: boolean, visible: ComputedRef<boolean>, close: ModalReturns['close'], setTitle: (title: ModalOptionsBase['title']) => void]
+export declare function useModalRef(): {
+    inModal: true
+    modalType: ComputedRef<'dialog' | 'drawer'>
+    visible: ComputedRef<boolean>
+    close: ModalReturns['close']
+    setTitle: (title: ModalOptionsBase['title']) => void
+} | {
+    inModal: false
+}
 
 export declare const ModalProvider: DefineComponent<{}>

package/src/modal.js

@@ -100,6 +100,7 @@ export function useModal({ content, confirmText, confirmLoading, cancelText, can
         props: {},
         setup() {
             provide(ModalInjectionKey, {
+                modalType: computed(() => unref(renderParam.type) ?? 'dialog'),
                 visible,
                 close,
                 title2,
@@ -130,10 +131,9 @@ export function useModal({ content, confirmText, confirmLoading, cancelText, can
 
 export function useModalRef() {
     const modal = inject(ModalInjectionKey, null)
-    const returns = [!!modal, modal?.visible, modal?.close, title2 => modal && (modal.title2.value = title2)]
-    returns.inModal = returns[0]
-    returns.visible = returns[1]
-    returns.close = returns[2]
-    returns.setTitle = returns[3]
-    return returns
+    return {
+        ...modal,
+        inModal: !!modal,
+        setTitle: (title2) => { modal && (modal.title2.value = title2) },
+    }
 }

package/src/rules.js

@@ -70,7 +70,7 @@ export function required(message, { required = true, trigger = ['input', 'blur',
         [requiredRuleSymbol]: true,
         trigger,
         validator: (value) => {
-            if (!unref(required) || typeof value === 'number' || typeof value === 'bigint' || typeof value === 'boolean') return
+            if (typeof value === 'number' || typeof value === 'bigint' || typeof value === 'boolean' || !unref(required)) return
             if (value === undefined || value === null) {
                 return message(value, { required: true })
             }

package/src/table.js

@@ -76,7 +76,7 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
 
         ignoreDefaultEmptyRender_ ??= options?.ignoreDefaultEmptyRender
         const render0 = (record, i) => {
-            if (!unref(ignoreDefaultEmptyRender_) && renderEmptyValue && prop[0] !== '$' && isNone(record[prop])) {
+            if (renderEmptyValue && !unref(ignoreDefaultEmptyRender_) && prop[0] !== '$' && isNone(record[prop])) {
                 return renderEmptyValue(type_, 'description')
             }
             return render_(record, i)
@@ -281,6 +281,9 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
                         prop: '$expand',
                         type: 'expand',
                         expandable: typeof expandable === 'function' ? expandable : undefined,
+                        width: 40,
+                        maxWidth: 40,
+                        resizable: false,
                         renderExpand,
                         hidden: computed(() => unref(expandable) === false),
                         fixed: 'left',
@@ -302,6 +305,7 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
                         width: 50,
                         maxWidth: 50,
                         visible: false,
+                        resizable: false,
                     },
                 )
             }