cloud-web-corejs 1.0.54-dev.392 → 1.0.54-dev.393

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/xform/utils/formula-util.js +4 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.392",
4
+ "version": "1.0.54-dev.393",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
package/src/components/xform/utils/formula-util.js CHANGED
@@ -198,7 +198,10 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
198
198
  let fieldRef = VFR.getWidgetRef(fieldSchema.options.name)
199
199
  if (!!fieldRef) {
200
200
  //是否要考虑字符串值的替换？？
201
- resultFormula = resultFormula.replace(mi, fieldRef.getValue())
201
+ // resultFormula = resultFormula.replace(mi, fieldRef.getValue())
202
+ let fieldKeyName = getFieldKeyName(fieldSchema)
203
+ let value = fieldRef.formModel[fieldKeyName];
204
+ resultFormula = resultFormula.replace(mi, value)
202
205
  } else { //getWidgetRef找不到，则可能是子表单字段
203
206
  const subFormNameOfField = VFR.getSubFormNameOfWidget(fieldSchema.options.name)
204
207
  if (!!formulaFieldRef.subFormItemFlag || formulaFieldRef.tableParam || row) {