diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/MultipleLabelItem.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/MultipleLabelItem.vue index 71db061c..90055e2d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/MultipleLabelItem.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/MultipleLabelItem.vue @@ -3,8 +3,7 @@
{{ item.prefix.text }} - + @@ -51,6 +50,7 @@ export default { .item { display: flex; gap: 6px; + flex: 1; .suffix {} diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue index 32d89850..19a42716 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue @@ -64,6 +64,18 @@ export default { type: Object, default: () => { } }, + /** + * { + * label: String; + * key: String; + * type: 'input' | 'timePicker', + * gridArea?: "", + * gridColumn?: "", + * gridRow?: "", + * options?: {} + * }[] + */ + value: Object, formList: { type: Array, default: () => [] @@ -79,8 +91,7 @@ export default { column: { type: [String, Number], default: "3" - }, - value: Object + } }, model: { prop: 'value', @@ -97,13 +108,10 @@ export default { handler() { this.reset(true); } - }, + } }, created() { this.reset(true); - if (this.dFormData) { - this.modelFormData = this.dFormData; - } }, computed: { modelFormData: { @@ -143,7 +151,7 @@ export default { this.modelFormData = { ...pathSet(this.modelFormData, item.key, data) } }, reset(isFirst) { - return this.modelFormData = reduceDefaultValue(this.formList, isFirst ? this.value : {}); + return this.modelFormData = reduceDefaultValue(this.formList, isFirst ? this.value || this.dFormData : {}); }, getStyle() { return { @@ -206,7 +214,7 @@ export default { validator: (_, __, callback) => { const value = pathGet(this.modelFormData, item.key) - if (!value && typeof value === 'object' || typeof value === 'string' && !value.trim()) return callback(new Error(`${item.options?.placeholder || `${item.label}不能为空`}`)) + if (!value && typeof value != 'number' || typeof value === 'string' && !value.trim()) return callback(new Error(`${item.options?.placeholder || `${item.label}不能为空`}`)) const err = ruleMatch(value); @@ -283,6 +291,7 @@ export default { align-items: center; margin: 0; height: 100%; + width: 100%; &:first-child { .el-form-item__label-wrap { diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js index 2fa5a4c2..31b032ad 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js @@ -21,8 +21,6 @@ export const presetDefaultValue = { }; export function getDefaultValue(item, data) { - if (data && typeof data !== "object") return data; - if (item.hasOwnProperty("default")) return item.default; const getValue = presetDefaultValue[resolveName(item.type)]; @@ -41,7 +39,7 @@ export function reduceDefaultValue(formList, data, total = {}) { pathSet( prev, cur.key, - getDefaultValue(cur, pathGet(data || {}, cur.key)) + pathGet(data || {}, cur.key) ?? getDefaultValue(cur) ); // prev[cur.key] = getDefaultValue(cur, pathGet(data || {}, cur.key)); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue index e688ca9a..e24a7344 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue @@ -1,6 +1,6 @@ +
- +