centaline-data-driven 1.2.1 → 1.2.11

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/centaline/loader/src/ctl/L.js +21 -23
  3. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  4. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.2.01",
3
+ "version": "1.2.11",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/centaline/loader/src/ctl/L.js CHANGED
@@ -3,34 +3,32 @@ import Base from './Base';
3
3
  const T = function (source) {
4
4
  var rtn = {
5
5
  get labelValue() {
6
- var rtn = "";
7
- var rtn1 = "";
8
- var rtn2 = "";
9
- if (source.name1) {
10
- rtn1 = source.name1;
11
- }
12
- else {
13
- if (source.code1) {
14
- rtn1 = source.code1;
15
- }
6
+ var val = "";
7
+ var lst = [];
8
+ var joinChar = source.joinChar == undefined ? '' : source.joinChar;
9
+ for (var i = 1; i <= 5; i++) {
10
+ getFileNameVal(i);
16
11
  }
12
+ val = lst.join(joinChar);
17
13
 
18
- if (source.name2) {
19
- rtn2 = source.name2;
20
- }
21
- else {
22
- if (source.code2) {
23
- rtn2 = source.code2;
14
+ return val;
15
+
16
+ function getFileNameVal(fieldNameIndex) {
17
+ var fieldVal = "";
18
+ if (source['fieldName' + fieldNameIndex]) {
19
+ if (source['name' + fieldNameIndex]) {
20
+ fieldVal = source['name' + fieldNameIndex];
21
+ }
22
+ else {
23
+ if (source['code' + fieldNameIndex]) {
24
+ fieldVal = source['code' + fieldNameIndex];
25
+ }
26
+ }
27
+ lst.push(fieldVal);
24
28
  }
25
29
  }
26
30
 
27
- if (rtn2.trim()) {
28
- rtn = rtn1 + " ~ " + rtn2;
29
- }
30
- else {
31
- rtn = rtn1;
32
- }
33
- return rtn;
31
+
34
32
  }
35
33
  };
36
34
  rtn = base.copy(Base(source), rtn);