@byteluck-fe/model-driven-engine 2.7.0-alpha.18 → 2.7.0-alpha.20
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.
- package/dist/esm/common/ActionManager.js +157 -40
- package/dist/esm/common/DataManager.js +129 -20
- package/dist/esm/common/Engine.js +338 -211
- package/dist/esm/common/OkWorker.js +27 -13
- package/dist/esm/common/Runtime.js +26 -11
- package/dist/esm/common/Store.js +51 -50
- package/dist/esm/common/checkerValue.js +39 -39
- package/dist/esm/common/index.js +2 -2
- package/dist/esm/common/proxyState.js +47 -47
- package/dist/esm/index.js +3 -3
- package/dist/esm/plugins/CalcPlugin.js +67 -59
- package/dist/esm/plugins/ControlsEventPlugin.js +191 -68
- package/dist/esm/plugins/ES6ModulePlugin.js +24 -8
- package/dist/esm/plugins/LifecycleEventPlugin.js +183 -64
- package/dist/esm/plugins/StylePlugin.js +22 -7
- package/dist/esm/plugins/index.js +5 -5
- package/dist/esm/utils/index.js +1 -1
- package/dist/esm/utils/runtimeUtils.js +5 -7
- package/dist/index.umd.js +8 -8
- package/dist/types/common/Engine.d.ts +6 -6
- package/dist/types/common/Runtime.d.ts +1 -1
- package/dist/types/common/Store.d.ts +5 -5
- package/dist/types/common/proxyState.d.ts +3 -3
- package/dist/types/plugins/ControlsEventPlugin.d.ts +1 -1
- package/dist/types/plugins/ES6ModulePlugin.d.ts +4 -4
- package/dist/types/plugins/LifecycleEventPlugin.d.ts +1 -1
- package/dist/types/plugins/StylePlugin.d.ts +1 -1
- package/package.json +3 -3
|
@@ -23,22 +23,22 @@ function _unsupportedIterableToArray(o, minLen) {
|
|
|
23
23
|
if (n === "Map" || n === "Set") return Array.from(n);
|
|
24
24
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
|
|
25
25
|
}
|
|
26
|
-
import { CONTROL_BASE_TYPE, error, logerror } from '@byteluck-fe/model-driven-shared';
|
|
27
26
|
var cc = console;
|
|
27
|
+
import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
|
|
28
28
|
var proxyArrayApi = [
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
"splice",
|
|
30
|
+
"push",
|
|
31
|
+
"shift",
|
|
32
|
+
"pop",
|
|
33
|
+
"unshift",
|
|
34
|
+
"reverse"
|
|
35
35
|
];
|
|
36
|
-
export var engineProxyFlag = Symbol(
|
|
37
|
-
export var engineTargetKey = Symbol(
|
|
38
|
-
export var engineArrayBeforeSetCallbackFlag = Symbol(
|
|
39
|
-
export var engineProxyThisKey = Symbol(
|
|
36
|
+
export var engineProxyFlag = Symbol("__engineProxy__");
|
|
37
|
+
export var engineTargetKey = Symbol("__engineTarget__");
|
|
38
|
+
export var engineArrayBeforeSetCallbackFlag = Symbol("__engineArrayBeforeSetCallbackFlag__");
|
|
39
|
+
export var engineProxyThisKey = Symbol("__engineProxyThisKey__");
|
|
40
40
|
var currentHandlerState = {
|
|
41
|
-
type:
|
|
41
|
+
type: "",
|
|
42
42
|
args: [],
|
|
43
43
|
callback: emptyFn
|
|
44
44
|
};
|
|
@@ -55,16 +55,16 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
55
55
|
// 操作下标
|
|
56
56
|
// Number(propertyKey) > target.length 说明当前操作的下标已经超过了安全范围(数组的运行长度,比如[1,2,3],它的长度为3,可操作的下标为0,1,2,3,如果操作4将会产生一个empty index)
|
|
57
57
|
if (index > target.length) {
|
|
58
|
-
error("Wrong array operations may cause unknown errors. It is recommended to use APIs such as ".concat(proxyArrayApi.join(
|
|
58
|
+
error("Wrong array operations may cause unknown errors. It is recommended to use APIs such as ".concat(proxyArrayApi.join(","), " for array operations"));
|
|
59
59
|
return;
|
|
60
60
|
}
|
|
61
61
|
// 不是操作下标,而是直接操作length或者自定义属性等
|
|
62
62
|
var isNotHandlerIndex = Number.isNaN(index);
|
|
63
|
-
if (isNotHandlerIndex && propertyKey !==
|
|
63
|
+
if (isNotHandlerIndex && propertyKey !== "length") {
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
66
|
// 直接操作length
|
|
67
|
-
if (propertyKey ===
|
|
67
|
+
if (propertyKey === "length") {
|
|
68
68
|
var newLength = value;
|
|
69
69
|
var oldLength = target.length;
|
|
70
70
|
if (newLength > target.length) {
|
|
@@ -76,9 +76,9 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
76
76
|
}
|
|
77
77
|
// 通过操作length删除旧的行
|
|
78
78
|
return function() {
|
|
79
|
-
return callback.call(null, target, thisKey,
|
|
79
|
+
return callback.call(null, target, thisKey, "splice", [
|
|
80
80
|
newLength,
|
|
81
|
-
oldLength - newLength
|
|
81
|
+
oldLength - newLength
|
|
82
82
|
]);
|
|
83
83
|
};
|
|
84
84
|
// 直接操作下标
|
|
@@ -86,13 +86,13 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
86
86
|
// 正常操作
|
|
87
87
|
if (index === target.length) {
|
|
88
88
|
return function() {
|
|
89
|
-
return callback.call(null, target, thisKey,
|
|
89
|
+
return callback.call(null, target, thisKey, "push", [
|
|
90
90
|
value
|
|
91
91
|
]);
|
|
92
92
|
};
|
|
93
93
|
} else {
|
|
94
94
|
return function() {
|
|
95
|
-
return callback.call(null, target, thisKey,
|
|
95
|
+
return callback.call(null, target, thisKey, "splice", [
|
|
96
96
|
index,
|
|
97
97
|
1,
|
|
98
98
|
value
|
|
@@ -124,9 +124,9 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
124
124
|
}
|
|
125
125
|
return Reflect.get(target, propertyKey, receiver);
|
|
126
126
|
},
|
|
127
|
-
set: function set(target, propertyKey,
|
|
127
|
+
set: function set(target, propertyKey, value, receiver) {
|
|
128
128
|
var reProxyState = function reProxyState(value) {
|
|
129
|
-
if (typeof value ===
|
|
129
|
+
if (typeof value === "object" && value !== null) {
|
|
130
130
|
// @ts-ignore
|
|
131
131
|
if (value[engineProxyFlag] !== true) {
|
|
132
132
|
return proxyState(value, callback, beforeSetCallback, concatKey);
|
|
@@ -137,19 +137,19 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
};
|
|
140
|
-
var newValue =
|
|
140
|
+
var newValue = value;
|
|
141
141
|
// @ts-ignore
|
|
142
142
|
var oldValue = target[propertyKey];
|
|
143
|
-
var concatKey = thisKey ===
|
|
144
|
-
var
|
|
145
|
-
newValue = (
|
|
143
|
+
var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
|
|
144
|
+
var _reProxyState;
|
|
145
|
+
newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
|
|
146
146
|
// 先设置值,然后再进行触发回调,确保回调内拿到的是最新的值
|
|
147
147
|
var setResult;
|
|
148
148
|
// TODO 数组拦截操作需要重构,优化现有逻辑
|
|
149
149
|
// TODO 直接操作下标改动明细表时,没有对行数据进行checker
|
|
150
150
|
if (Array.isArray(target)) {
|
|
151
151
|
// 操作数组的时候,不需要使用拼接的thisKey,先判断执行的是否是违规操作,违规操作的话会报错,不允许继续执行,正常操作的话,返回一个回调函数,用于在值修改完之后触发
|
|
152
|
-
var nextHandler = ArrayHandler(target, propertyKey,
|
|
152
|
+
var nextHandler = ArrayHandler(target, propertyKey, value, thisKey, callback);
|
|
153
153
|
setResult = Reflect.set(target, propertyKey, newValue, receiver);
|
|
154
154
|
if (nextHandler) {
|
|
155
155
|
nextHandler();
|
|
@@ -171,7 +171,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
171
171
|
return true;
|
|
172
172
|
}
|
|
173
173
|
setResult = Reflect.set(target, propertyKey, newValue, receiver);
|
|
174
|
-
callback.call(null, target, concatKey,
|
|
174
|
+
callback.call(null, target, concatKey, value, oldValue);
|
|
175
175
|
}
|
|
176
176
|
return setResult;
|
|
177
177
|
}
|
|
@@ -184,15 +184,15 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
|
|
|
184
184
|
* @param beforeSetCallback
|
|
185
185
|
* @param prevKey 递归对象的key
|
|
186
186
|
* */ export function proxyState(state, callback, beforeSetCallback) {
|
|
187
|
-
var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] :
|
|
187
|
+
var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "";
|
|
188
188
|
// 冻结的对象不需要再执行proxy,否则会报错
|
|
189
189
|
if (Object.isFrozen(state)) {
|
|
190
190
|
return state;
|
|
191
191
|
}
|
|
192
192
|
for(var key in state){
|
|
193
|
-
var concatKey = prevKey ===
|
|
193
|
+
var concatKey = prevKey === "" ? key : prevKey + "." + key;
|
|
194
194
|
var obj = state[key];
|
|
195
|
-
if (typeof obj ===
|
|
195
|
+
if (typeof obj === "object" && obj !== null) {
|
|
196
196
|
// @ts-ignore
|
|
197
197
|
state[key] = proxyState(obj, callback, beforeSetCallback, concatKey);
|
|
198
198
|
}
|
|
@@ -203,7 +203,7 @@ function flatInstanceForChildren(controls) {
|
|
|
203
203
|
var result = [];
|
|
204
204
|
controls.forEach(function(item) {
|
|
205
205
|
result.push(item);
|
|
206
|
-
if (item.controlType ===
|
|
206
|
+
if (item.controlType === "layout" || item.controlType === "wrap") {
|
|
207
207
|
var _result;
|
|
208
208
|
(_result = result).push.apply(_result, _toConsumableArray(flatInstanceForChildren(item.children)));
|
|
209
209
|
}
|
|
@@ -214,9 +214,9 @@ function flatInstanceForChildren(controls) {
|
|
|
214
214
|
* 在flatInstance中通过key查找出对应的instance
|
|
215
215
|
* @param flatInstance 拍平的instance数组
|
|
216
216
|
* @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
|
|
217
|
-
* */ export function findItem(flatInstance,
|
|
218
|
-
if (
|
|
219
|
-
var keys =
|
|
217
|
+
* */ export function findItem(flatInstance, key, instanceMap) {
|
|
218
|
+
if (key === "") return undefined;
|
|
219
|
+
var keys = key.split(".");
|
|
220
220
|
if (keys.length === 0) return undefined;
|
|
221
221
|
var oneKey = keys[0];
|
|
222
222
|
var otherKeys = keys.slice(1);
|
|
@@ -242,31 +242,31 @@ function flatInstanceForChildren(controls) {
|
|
|
242
242
|
// 最后一个key可能是值对象上边的key,比如金额的amount和currency,计算公式的result和unit,所以需要判断前一个控件是不是一个表单控件,是的话就返回最后一个表单控件
|
|
243
243
|
return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
|
|
244
244
|
} else {
|
|
245
|
-
var
|
|
246
|
-
var
|
|
245
|
+
var _prevItem_children;
|
|
246
|
+
var _prevItem_children_index;
|
|
247
247
|
// 如果有children,则取children中对应的下标,没有的话一直返回prevItem
|
|
248
|
-
return (
|
|
248
|
+
return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
|
|
249
249
|
}
|
|
250
250
|
}, initInstance);
|
|
251
251
|
}
|
|
252
252
|
function getArrayNewValue(type, args) {
|
|
253
253
|
if ([
|
|
254
|
-
|
|
255
|
-
|
|
254
|
+
"push",
|
|
255
|
+
"unshift"
|
|
256
256
|
].includes(type)) {
|
|
257
257
|
return args;
|
|
258
|
-
} else if (type ===
|
|
258
|
+
} else if (type === "splice") {
|
|
259
259
|
return args.slice(2);
|
|
260
260
|
}
|
|
261
261
|
return [];
|
|
262
262
|
}
|
|
263
263
|
function getArrayNewArgs(type, args, value) {
|
|
264
264
|
if ([
|
|
265
|
-
|
|
266
|
-
|
|
265
|
+
"push",
|
|
266
|
+
"unshift"
|
|
267
267
|
].includes(type)) {
|
|
268
268
|
return value;
|
|
269
|
-
} else if (type ===
|
|
269
|
+
} else if (type === "splice") {
|
|
270
270
|
return args.slice(0, 2).concat(value);
|
|
271
271
|
}
|
|
272
272
|
}
|
|
@@ -285,9 +285,9 @@ function getArrayNewArgs(type, args, value) {
|
|
|
285
285
|
var result;
|
|
286
286
|
var addValue = getArrayNewValue(key, args);
|
|
287
287
|
if (addValue.length) {
|
|
288
|
-
var
|
|
288
|
+
var _this, _this_engineArrayBeforeSetCallbackFlag;
|
|
289
289
|
// @ts-ignore
|
|
290
|
-
var newValue = (
|
|
290
|
+
var newValue = (_this_engineArrayBeforeSetCallbackFlag = (_this = this)[engineArrayBeforeSetCallbackFlag]) === null || _this_engineArrayBeforeSetCallbackFlag === void 0 ? void 0 : _this_engineArrayBeforeSetCallbackFlag.call(_this, // @ts-ignore
|
|
291
291
|
this[engineTargetKey], // @ts-ignore
|
|
292
292
|
this[engineProxyThisKey], addValue);
|
|
293
293
|
var newArgs = getArrayNewArgs(key, args, newValue);
|
|
@@ -301,8 +301,8 @@ function getArrayNewArgs(type, args, value) {
|
|
|
301
301
|
// @ts-ignore
|
|
302
302
|
result = oldApiHandler.apply(this, args);
|
|
303
303
|
}
|
|
304
|
-
typeof currentHandlerState.callback ===
|
|
305
|
-
currentHandlerState.type =
|
|
304
|
+
typeof currentHandlerState.callback === "function" && currentHandlerState.callback(key, args, result);
|
|
305
|
+
currentHandlerState.type = "";
|
|
306
306
|
currentHandlerState.args = [];
|
|
307
307
|
currentHandlerState.callback = emptyFn;
|
|
308
308
|
return result;
|
package/dist/esm/index.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
1
|
+
export * from "./common";
|
|
2
|
+
export * from "./plugins";
|
|
3
|
+
export * from "./utils";
|
|
@@ -25,6 +25,19 @@ function _createClass(Constructor, protoProps, staticProps) {
|
|
|
25
25
|
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
26
26
|
return Constructor;
|
|
27
27
|
}
|
|
28
|
+
function _defineProperty(obj, key, value) {
|
|
29
|
+
if (key in obj) {
|
|
30
|
+
Object.defineProperty(obj, key, {
|
|
31
|
+
value: value,
|
|
32
|
+
enumerable: true,
|
|
33
|
+
configurable: true,
|
|
34
|
+
writable: true
|
|
35
|
+
});
|
|
36
|
+
} else {
|
|
37
|
+
obj[key] = value;
|
|
38
|
+
}
|
|
39
|
+
return obj;
|
|
40
|
+
}
|
|
28
41
|
function _iterableToArray(iter) {
|
|
29
42
|
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
|
|
30
43
|
}
|
|
@@ -42,8 +55,8 @@ function _unsupportedIterableToArray(o, minLen) {
|
|
|
42
55
|
if (n === "Map" || n === "Set") return Array.from(n);
|
|
43
56
|
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
|
|
44
57
|
}
|
|
45
|
-
import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from
|
|
46
|
-
import { format } from
|
|
58
|
+
import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from "@byteluck-fe/model-driven-shared";
|
|
59
|
+
import { format } from "mathjs";
|
|
47
60
|
var DisplayType;
|
|
48
61
|
(function(DisplayType) {
|
|
49
62
|
DisplayType[/**
|
|
@@ -57,19 +70,21 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
57
70
|
"use strict";
|
|
58
71
|
function CalcPlugin(options) {
|
|
59
72
|
_classCallCheck(this, CalcPlugin);
|
|
73
|
+
_defineProperty(this, "engine", void 0);
|
|
74
|
+
_defineProperty(this, "options", void 0);
|
|
60
75
|
/**
|
|
61
76
|
* 所有的计算公式控件
|
|
62
77
|
* */ // @ts-ignore
|
|
63
|
-
this
|
|
78
|
+
_defineProperty(this, "calcControls", []);
|
|
64
79
|
/**
|
|
65
80
|
* key=控件id value=控件修改后需要触发重新计算的计算公式控件组成的数组
|
|
66
81
|
* 存储为一个Map,用于在控件change的时候,重新计算依赖的calc
|
|
67
|
-
* */ this
|
|
82
|
+
* */ _defineProperty(this, "dependenciesTriggerMap", new Map());
|
|
68
83
|
/**
|
|
69
84
|
* 隐藏以后需要被计算的控件
|
|
70
|
-
* */ this
|
|
71
|
-
this
|
|
72
|
-
this
|
|
85
|
+
* */ _defineProperty(this, "hideNotRememberControlIds", []);
|
|
86
|
+
_defineProperty(this, "dontHasPermissionControlIds", []);
|
|
87
|
+
_defineProperty(this, "cacheComputedResult", {});
|
|
73
88
|
this.options = options;
|
|
74
89
|
this.getDontHasPermissionControlIds();
|
|
75
90
|
this.getNeedHideRememberControlIds();
|
|
@@ -80,8 +95,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
80
95
|
value: /**
|
|
81
96
|
* @description 获取显隐控制的需要被记住值的控件id
|
|
82
97
|
* */ function getNeedHideRememberControlIds() {
|
|
83
|
-
var
|
|
84
|
-
if (!((
|
|
98
|
+
var _this_options;
|
|
99
|
+
if (!((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.displayBoList)) {
|
|
85
100
|
return;
|
|
86
101
|
}
|
|
87
102
|
this.hideNotRememberControlIds = this.options.displayBoList.reduce(function(result, current) {
|
|
@@ -98,8 +113,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
98
113
|
value: /**
|
|
99
114
|
* @description 获取权限控制的隐藏的字段,不需要参与计算
|
|
100
115
|
* */ function getDontHasPermissionControlIds() {
|
|
101
|
-
var
|
|
102
|
-
if (!((
|
|
116
|
+
var _this_options;
|
|
117
|
+
if (!((_this_options = this.options) === null || _this_options === void 0 ? void 0 : _this_options.behavior)) {
|
|
103
118
|
return;
|
|
104
119
|
}
|
|
105
120
|
this.dontHasPermissionControlIds = this.options.behavior.reduce(function(result, current) {
|
|
@@ -156,7 +171,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
156
171
|
this.watchControlChange();
|
|
157
172
|
this.watchSubtableChange();
|
|
158
173
|
this.watchSchemaHideChange();
|
|
159
|
-
this.engine.on(
|
|
174
|
+
this.engine.on("engine-mounted", function() {
|
|
160
175
|
_this.allCalcControlComputed();
|
|
161
176
|
});
|
|
162
177
|
}
|
|
@@ -201,16 +216,15 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
201
216
|
* */ function getCalcDependencies() {
|
|
202
217
|
var _this = this;
|
|
203
218
|
this.calcControls.forEach(function(item) {
|
|
204
|
-
var _this1 = _this;
|
|
205
219
|
var scriptEcho = item.props.scriptEcho;
|
|
206
220
|
scriptEcho.forEach(function(scriptItem) {
|
|
207
221
|
if (scriptItem.type === CALC_TOKEN_TYPE.VariableInMainTable || scriptItem.type === CALC_TOKEN_TYPE.VariableInCurrentSubTable || scriptItem.type === CALC_TOKEN_TYPE.VariableInOtherSubTable) {
|
|
208
222
|
// 当前是一个变量,存储依赖于当前变量的计算公式
|
|
209
|
-
|
|
223
|
+
_this.setDependenciesTriggerMapItem(scriptItem.id, item);
|
|
210
224
|
}
|
|
211
225
|
// 依赖明细子表的计算公式控件,不收集自己表内的,而是主表或者其他明细子表的控件
|
|
212
226
|
if (scriptItem.type === CALC_TOKEN_TYPE.VariableInOtherSubTable && scriptItem.subTableId) {
|
|
213
|
-
|
|
227
|
+
_this.setDependenciesTriggerMapItem(scriptItem.subTableId, item);
|
|
214
228
|
}
|
|
215
229
|
});
|
|
216
230
|
});
|
|
@@ -235,12 +249,11 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
235
249
|
subtableRows) {
|
|
236
250
|
var _this = this;
|
|
237
251
|
return subtableRows.reduce(function(result, current) {
|
|
238
|
-
var _this2 = _this;
|
|
239
252
|
// @ts-ignore
|
|
240
253
|
current.children.forEach(function(item) {
|
|
241
254
|
var control = item.children[0];
|
|
242
255
|
// @ts-ignore
|
|
243
|
-
if (control &&
|
|
256
|
+
if (control && _this.engine.assertInstance(control, CONTROL_TYPE.CALC)) {
|
|
244
257
|
result.push(control);
|
|
245
258
|
}
|
|
246
259
|
});
|
|
@@ -255,13 +268,12 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
255
268
|
* @description 监听控件的显隐事件,把显隐会影响的控件触发一遍计算
|
|
256
269
|
* */ function watchSchemaHideChange() {
|
|
257
270
|
var _this = this;
|
|
258
|
-
this.engine.on(
|
|
259
|
-
if (payload.props ===
|
|
260
|
-
var
|
|
261
|
-
var
|
|
262
|
-
var calcControls = (ref = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && ref !== void 0 ? ref : [];
|
|
271
|
+
this.engine.on("schema-change", function(payload) {
|
|
272
|
+
if (payload.props === "isHide") {
|
|
273
|
+
var _this_dependenciesTriggerMap_get;
|
|
274
|
+
var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
|
|
263
275
|
calcControls.forEach(function(calc) {
|
|
264
|
-
|
|
276
|
+
_this.computedCalcValue(calc);
|
|
265
277
|
});
|
|
266
278
|
}
|
|
267
279
|
});
|
|
@@ -273,23 +285,22 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
273
285
|
* @description 监听明细子表的change事件,把明细表会影响的控件触发一遍计算
|
|
274
286
|
* */ function watchSubtableChange() {
|
|
275
287
|
var _this = this;
|
|
276
|
-
this.engine.on(
|
|
277
|
-
var
|
|
278
|
-
var ref;
|
|
288
|
+
this.engine.on("list-change", function(payload) {
|
|
289
|
+
var _payload_options;
|
|
279
290
|
_this.resetDependencies();
|
|
280
|
-
var
|
|
281
|
-
var changedRows = (
|
|
291
|
+
var _payload_options_changed;
|
|
292
|
+
var changedRows = (_payload_options_changed = (_payload_options = payload.options) === null || _payload_options === void 0 ? void 0 : _payload_options.changed) !== null && _payload_options_changed !== void 0 ? _payload_options_changed : [];
|
|
282
293
|
// 对发生改变的行进行重新计算
|
|
283
294
|
var changedCalc = _this.getCalcControlsFromSubtableRows(changedRows);
|
|
284
295
|
// @ts-ignore
|
|
285
296
|
changedCalc.forEach(function(calcControl) {
|
|
286
|
-
|
|
297
|
+
_this.computedCalcValue(calcControl);
|
|
287
298
|
});
|
|
288
|
-
var
|
|
289
|
-
var calcControls = (
|
|
299
|
+
var _this_dependenciesTriggerMap_get;
|
|
300
|
+
var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(payload.instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
|
|
290
301
|
// @ts-ignore
|
|
291
302
|
calcControls.forEach(function(calcControl) {
|
|
292
|
-
|
|
303
|
+
_this.computedCalcValue(calcControl);
|
|
293
304
|
});
|
|
294
305
|
});
|
|
295
306
|
}
|
|
@@ -300,31 +311,29 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
300
311
|
* @description 监听控件的change事件,当控件change的时候,取到控件会影响的计算公式,然后执行对应的计算
|
|
301
312
|
* */ function watchControlChange() {
|
|
302
313
|
var _this = this;
|
|
303
|
-
this.engine.on(
|
|
314
|
+
this.engine.on("change", function(payload) {
|
|
304
315
|
var instance = payload.instance;
|
|
305
316
|
if (!_this.dependenciesTriggerMap.has(instance.id)) {
|
|
306
317
|
return;
|
|
307
318
|
}
|
|
308
|
-
var
|
|
309
|
-
var calcControls = (
|
|
319
|
+
var _this_dependenciesTriggerMap_get;
|
|
320
|
+
var calcControls = (_this_dependenciesTriggerMap_get = _this.dependenciesTriggerMap.get(instance.id)) !== null && _this_dependenciesTriggerMap_get !== void 0 ? _this_dependenciesTriggerMap_get : [];
|
|
310
321
|
// 在明细子表中的控件,如果计算公式也在明细子表,那只触发同一行的计算公式的计算
|
|
311
322
|
if (payload.rowIndex !== undefined && payload.rowIndex > -1) {
|
|
312
|
-
var _this7 = _this;
|
|
313
323
|
// @ts-ignore
|
|
314
324
|
calcControls.forEach(function(calcControl) {
|
|
315
|
-
if (
|
|
316
|
-
var calcIndex =
|
|
325
|
+
if (_this.controlInSubtable(calcControl)) {
|
|
326
|
+
var calcIndex = _this.engine.getInstanceRowIndex(calcControl);
|
|
317
327
|
if (calcIndex !== payload.rowIndex) {
|
|
318
328
|
return;
|
|
319
329
|
}
|
|
320
330
|
}
|
|
321
|
-
|
|
331
|
+
_this.computedCalcValue(calcControl);
|
|
322
332
|
});
|
|
323
333
|
} else {
|
|
324
|
-
var _this6 = _this;
|
|
325
334
|
// @ts-ignore
|
|
326
335
|
calcControls.forEach(function(calcControl) {
|
|
327
|
-
|
|
336
|
+
_this.computedCalcValue(calcControl);
|
|
328
337
|
});
|
|
329
338
|
}
|
|
330
339
|
});
|
|
@@ -335,8 +344,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
335
344
|
value: /**
|
|
336
345
|
* @description 控件在明细子表内
|
|
337
346
|
* */ function controlInSubtable(control) {
|
|
338
|
-
var
|
|
339
|
-
return ((
|
|
347
|
+
var _control_parent;
|
|
348
|
+
return ((_control_parent = control.parent) === null || _control_parent === void 0 ? void 0 : _control_parent.type) === CONTROL_TYPE.SUBTABLE_COLUMN;
|
|
340
349
|
}
|
|
341
350
|
},
|
|
342
351
|
{
|
|
@@ -380,10 +389,9 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
380
389
|
}
|
|
381
390
|
case CALC_TOKEN_TYPE.VariableInOtherSubTable:
|
|
382
391
|
{
|
|
383
|
-
var _this8 = _this;
|
|
384
392
|
var states = _this.engine.getState(current.id);
|
|
385
393
|
var values = Array.isArray(states) ? states.map(function(item) {
|
|
386
|
-
return
|
|
394
|
+
return _this.getNumberValue(item);
|
|
387
395
|
}) : [];
|
|
388
396
|
var value2 = _this.getAggregateTypeValue(values, current.aggregateType);
|
|
389
397
|
instance = _this.engine.getInstance(current.subTableId);
|
|
@@ -398,17 +406,17 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
398
406
|
result += 0;
|
|
399
407
|
}
|
|
400
408
|
return result;
|
|
401
|
-
},
|
|
402
|
-
var
|
|
409
|
+
}, "");
|
|
410
|
+
var value;
|
|
403
411
|
// 有缓存的话取缓存,没有缓存再执行eval
|
|
404
412
|
if (this.cacheComputedResult[scriptText] !== undefined) {
|
|
405
|
-
|
|
413
|
+
value = this.cacheComputedResult[scriptText];
|
|
406
414
|
} else {
|
|
407
415
|
// 解决js精准度问题
|
|
408
|
-
|
|
416
|
+
value = Number(format(new Function("return ".concat(scriptText))(), {
|
|
409
417
|
precision: 16
|
|
410
418
|
}));
|
|
411
|
-
this.cacheComputedResult[scriptText] =
|
|
419
|
+
this.cacheComputedResult[scriptText] = value;
|
|
412
420
|
}
|
|
413
421
|
// let rowIndex = undefined
|
|
414
422
|
if (this.controlInSubtable(control)) {
|
|
@@ -419,15 +427,15 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
419
427
|
}
|
|
420
428
|
}
|
|
421
429
|
var oldValue = this.engine.getState(control.id, rowIndex);
|
|
422
|
-
var
|
|
430
|
+
var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === "" ? value : Number(value.toFixed(control.props.precision));
|
|
423
431
|
// 如果值没变的话,不触发修改
|
|
424
|
-
if (
|
|
432
|
+
if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
|
|
425
433
|
return;
|
|
426
434
|
}
|
|
427
|
-
var
|
|
435
|
+
var _oldValue_unit;
|
|
428
436
|
this.engine.setState(control.id, {
|
|
429
|
-
result:
|
|
430
|
-
unit: (
|
|
437
|
+
result: result,
|
|
438
|
+
unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
|
|
431
439
|
}, rowIndex);
|
|
432
440
|
}
|
|
433
441
|
},
|
|
@@ -436,14 +444,14 @@ export var CalcPlugin = /*#__PURE__*/ function() {
|
|
|
436
444
|
value: /**
|
|
437
445
|
* @description 获取数字值,因为计算公式可以依赖计算公式和金额,所以需要从value中取到对应的值
|
|
438
446
|
* */ function getNumberValue(value) {
|
|
439
|
-
if (typeof value ===
|
|
440
|
-
if (
|
|
447
|
+
if (typeof value === "object" && value) {
|
|
448
|
+
if ("result" in value) {
|
|
441
449
|
return value.result;
|
|
442
|
-
} else if (
|
|
450
|
+
} else if ("amount" in value) {
|
|
443
451
|
return value.amount;
|
|
444
452
|
}
|
|
445
453
|
}
|
|
446
|
-
if (typeof value ===
|
|
454
|
+
if (typeof value === "number") {
|
|
447
455
|
return value;
|
|
448
456
|
}
|
|
449
457
|
return 0;
|