|
@@ -356,7 +356,7 @@ const CollapseChange = async (name) => {
|
|
|
}
|
|
|
//渲染表单
|
|
|
await getExcelHtml(item, index)
|
|
|
- await getChartConfig()
|
|
|
+ await getChartConfig({}, index)
|
|
|
} else {
|
|
|
// await getExcelHtml(item,index)
|
|
|
getOffsetTop()
|
|
@@ -391,7 +391,7 @@ const getExcelHtml = async (item, index) => {
|
|
|
onBlur: (event, key, reg, val, msg, type, c, d) => {
|
|
|
setTableFormBlurReg(pkeyIds, event, key, reg, val, msg, item, index)
|
|
|
if (type === 'chart') {
|
|
|
- getChartConfig(formData.value[index])
|
|
|
+ getChartConfig(formData.value[index], index)
|
|
|
}
|
|
|
}
|
|
|
})
|
|
@@ -411,11 +411,11 @@ const getExcelHtml = async (item, index) => {
|
|
|
|
|
|
//图表信息
|
|
|
const chartKey = ref('key_41__27_0')
|
|
|
-const getChartConfig = async (formData = {}) => {
|
|
|
- let {formChartKey} = formData, {id} = baseData.value, formKeys = {}
|
|
|
+const getChartConfig = async (form = {}, index) => {
|
|
|
+ let {formChartKey} = form, {id} = baseData.value, formKeys = {}
|
|
|
const chartKeys = formChartKey ? formChartKey.split(',') : []
|
|
|
chartKeys.forEach((item) => {
|
|
|
- formKeys[item] = formData[item] ?? ''
|
|
|
+ formKeys[item] = form[item] ?? ''
|
|
|
})
|
|
|
console.log('formKeys', formKeys)
|
|
|
const {data} = await dataApi.getChartInit({
|
|
@@ -424,7 +424,14 @@ const getChartConfig = async (formData = {}) => {
|
|
|
data: formKeys
|
|
|
})
|
|
|
//更新图表配置
|
|
|
- formData[chartKey.value] = getObjValue(data)
|
|
|
+ const chart_key = chartKey.value
|
|
|
+ if (!getObjVal(form)) {
|
|
|
+ formData.value[index][chart_key] = getObjValue(data)
|
|
|
+ } else {
|
|
|
+ form[chart_key] = getObjValue(data)
|
|
|
+ }
|
|
|
+ console.log(formData.value[index])
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//正则效验
|