diff --git a/src/components/ty-crud.vue b/src/components/ty-crud.vue index e6aacf5..fd5c324 100644 --- a/src/components/ty-crud.vue +++ b/src/components/ty-crud.vue @@ -20,9 +20,28 @@ :actions-width="actionsWidth" > @@ -41,9 +60,9 @@ diff --git a/src/components/ty-form.vue b/src/components/ty-form.vue index aa637d2..915af87 100644 --- a/src/components/ty-form.vue +++ b/src/components/ty-form.vue @@ -12,7 +12,7 @@ :placeholder="prop.placeholder ?? '请选择'" :clearable="!isRequired(key)" :disabled="isReadonly(key, prop)" - style="width: 100%" + :style="widgetStyle(prop)" > @@ -127,6 +131,10 @@ function isReadonly(key: string, prop: { readOnly?: boolean }): boolean { return prop.readOnly === true || props.readonlyKeys.includes(key) } +function widgetStyle(prop: JsonSchemaProperty): Record { + return { width: prop.width ?? (props.inline ? '200px' : '100%') } +} + defineExpose({ validate: () => formRef.value?.validate(), resetFields: () => formRef.value?.resetFields(), diff --git a/src/pages/system/user/index.vue b/src/pages/system/user/index.vue index acfd335..218a4e1 100644 --- a/src/pages/system/user/index.vue +++ b/src/pages/system/user/index.vue @@ -8,14 +8,11 @@ :create="create" :update="update" :remove="remove" + :actions="actions" id-key="id" name-key="username" :edit-readonly-keys="['username']" - > - - + /> @@ -34,7 +31,7 @@