Browse Source

样式 formConfig 修改提交

wangqin
Joe 1 year ago
parent
commit
b144bd2ba4
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
  2. 9
      ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
  3. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue

2
ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ElForm :style="getStyle()" :label-width="labelWidth" class="FormConfig" size="mini"> <ElForm :style="getStyle()" :label-width="labelWidth" class="FormConfig" size="mini">
<template v-for="(item, index) in formList"> <template v-for="(item, index) in formList">
<ElFormItem class="formItem" :rules="getRules(item)" v-if="formItemVisible(item)" :key="item.key" <ElFormItem class="formItem" :rules="getRules(item)" v-if="formItemVisible(item)" :key="`${item.key}|${index}`"
:label="item.label" :style="gridStyle(item, index)"> :label="item.label" :style="gridStyle(item, index)">
<slot :name="item.key" :data="item" :formData="modelFormData"> <slot :name="item.key" :data="item" :formData="modelFormData">
<ProxyCom :value="getValue(item)" :item="item" @update:value="data => updateValue(item, data)" /> <ProxyCom :value="getValue(item)" :item="item" @update:value="data => updateValue(item, data)" />

9
ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js

@ -30,11 +30,14 @@ export function getDefaultValue(item, data) {
return typeof getValue === "function" ? getValue(item) : null; return typeof getValue === "function" ? getValue(item) : null;
} }
export function reduceDefaultValue(formList, data) { export function reduceDefaultValue(formList, data, total = {}) {
if (!Array.isArray(formList)) return null; if (!Array.isArray(formList)) return null;
return formList.reduce((prev, cur) => { return formList.reduce((prev, cur) => {
if (cur?.key) if (cur?.type === "MultipleLabelItem")
Array.isArray(cur.options?.options) &&
reduceDefaultValue(cur.options.options, data, prev);
else if (cur?.key)
pathSet( pathSet(
prev, prev,
cur.key, cur.key,
@ -43,5 +46,5 @@ export function reduceDefaultValue(formList, data) {
// prev[cur.key] = getDefaultValue(cur, pathGet(data || {}, cur.key)); // prev[cur.key] = getDefaultValue(cur, pathGet(data || {}, cur.key));
return prev; return prev;
}, {}); }, total);
} }

6
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalPlan/index.vue

@ -26,12 +26,12 @@ function getDefaultBlockOption() {
function getDefaultLegendOption() { function getDefaultLegendOption() {
return { return {
width: 9, width: 11,
height: 9, height: 11,
y: 0, y: 0,
text: { text: {
font: "PingFang SC", font: "PingFang SC",
fontSize: 9, fontSize: 11,
align: 'left', align: 'left',
color: "#FFFFFF" color: "#FFFFFF"
}, },

Loading…
Cancel
Save