fmui-base 1.0.49 → 2.0.0
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/README.md +13 -32
- package/lib/db/variables.js +1 -0
- package/lib/form/form.js +234 -82
- package/lib/form/subForm.js +3 -3
- package/lib/form/table.js +25 -14
- package/lib/form_info/formInfo.js +2 -2
- package/lib/poppage/table/table.js +2 -2
- package/lib/process_batch/processBatch.js +3 -3
- package/lib/process_info/FlowChart.js +62 -99
- package/lib/process_info/processInfo.js +117 -80
- package/lib/process_list/processList.js +94 -68
- package/lib/process_list/processList.less +1 -1
- package/lib/selectMember/select.js +281 -351
- package/lib/selectMember/select.less +21 -10
- package/lib/signature/sign.js +2 -2
- package/lib/upload/upload.js +38 -23
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -1,37 +1,18 @@
|
|
|
1
1
|
## 移动端组件
|
|
2
2
|
|
|
3
|
-
---
|
|
3
|
+
---npm publish --tag beta
|
|
4
4
|
|
|
5
5
|
## 更新日志
|
|
6
|
-
- 1.
|
|
7
|
-
- 1.0
|
|
8
|
-
- 1.0.
|
|
9
|
-
- 1.0.
|
|
10
|
-
- 1.0.
|
|
11
|
-
- 1.0.
|
|
12
|
-
- 1.0.
|
|
13
|
-
- 1.0.
|
|
14
|
-
- 1.0.
|
|
15
|
-
- 1.0.
|
|
16
|
-
- 1.0.
|
|
17
|
-
- 1.0.
|
|
18
|
-
- 1.0.37:移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置
|
|
19
|
-
- 1.0.36:移动审批保存时不校验必填项;关联字段功能实现;移动端子表扩展功能开发
|
|
20
|
-
- 1.0.35:流程支持CA加签验签问题修复
|
|
21
|
-
- 1.0.34:退回流程支持上传附件;流程支持CA加签验签
|
|
22
|
-
- 1.0.33:表单说明字段额外扩展样式实现
|
|
23
|
-
- 1.0.32:去掉批量办理标题旁的new icon;矩阵式表单额外扩展样式实现
|
|
24
|
-
- 1.0.31:修复pc企业微信客户端预览查看问题
|
|
25
|
-
- 1.0.30:流程批量办理增加必填校验,流程组件在钉钉PC客户端办理后关闭页面修改;日期组件增加区间选项
|
|
26
|
-
- 1.0.29:流程项目开发外扩展js修改
|
|
27
|
-
- 1.0.28:选人个人群组适配
|
|
28
|
-
- 1.0.27:流程批示意见问题修复
|
|
29
|
-
- 1.0.26:流程项目开发外扩展js
|
|
30
|
-
- 1.0.25:流程列表增加类型all情况下查所有流程问题修改
|
|
31
|
-
- 1.0.24:流程列表增加类型all全局待办module编码,增加流程表单外扩展js
|
|
32
|
-
- 1.0.23:流程列表批量办理按钮增加配置项可控制隐藏
|
|
33
|
-
- 1.0.22:修改流程列表统一待办和搜索
|
|
34
|
-
- 1.0.21:修改流程列表统一待办
|
|
35
|
-
- 1.0.20:修改推送打开作废流程提示
|
|
36
|
-
- 1.0.19:修改流程图请求参数,增加流程实例id
|
|
6
|
+
- 2.1.1-beta.1:流程列表样式修改
|
|
7
|
+
- 2.1.1-beta.0:流程表单修改
|
|
8
|
+
- 2.1.0-beta.9:流程表单修改
|
|
9
|
+
- 2.1.0-beta.8:周补丁功能合并
|
|
10
|
+
- 2.1.0-beta.7:移动端关联表功能
|
|
11
|
+
- 2.1.0-beta.6:按钮修改和选人组件兼职组织修复
|
|
12
|
+
- 2.1.0-beta.5:选人组件修改
|
|
13
|
+
- 2.1.0-beta.4:表单html组件样式修改;上传组件修改;上传进度条增加
|
|
14
|
+
- 2.1.0-beta.3:各种样式修复
|
|
15
|
+
- 2.1.0-beta.2:修改上传组件样式
|
|
16
|
+
- 2.1.0-beta.1:修改基础组件样式
|
|
17
|
+
- 2.1.0-beta.0:2.0beta版本提交
|
|
37
18
|
|
package/lib/db/variables.js
CHANGED
|
@@ -104,6 +104,7 @@ exports.default = {
|
|
|
104
104
|
},
|
|
105
105
|
nodataIcon: context + "/mobile/fmui/images/noData.png",
|
|
106
106
|
loadingIcon: context + "/mobile/fmui/images/loading.gif",
|
|
107
|
+
approvalCardIcon: context + "/mobile/fmui/images/approvalCard.png",
|
|
107
108
|
SQLX: {
|
|
108
109
|
qjsq: 'qjsq', //请假申请
|
|
109
110
|
bxsq: 'baoxiu', //保修申请
|
package/lib/form/form.js
CHANGED
|
@@ -53,6 +53,10 @@ var _Boxs = require('saltui/lib/Boxs');
|
|
|
53
53
|
|
|
54
54
|
var _Boxs2 = _interopRequireDefault(_Boxs);
|
|
55
55
|
|
|
56
|
+
var _Field = require('saltui/lib/Field');
|
|
57
|
+
|
|
58
|
+
var _Field2 = _interopRequireDefault(_Field);
|
|
59
|
+
|
|
56
60
|
var _FoldablePane = require('saltui/lib/FoldablePane');
|
|
57
61
|
|
|
58
62
|
var _FoldablePane2 = _interopRequireDefault(_FoldablePane);
|
|
@@ -92,13 +96,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
92
96
|
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
|
|
93
97
|
|
|
94
98
|
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
|
|
99
|
+
|
|
100
|
+
_Field2.default;
|
|
95
101
|
// import Slot from 'saltui/lib/Slot';
|
|
96
102
|
|
|
97
103
|
// import SelectFileNo from '../select-fileno/pageHome';
|
|
98
104
|
// import SelectSerialNumber from '../select-serialnumber/pageHome';
|
|
99
105
|
//import 'babel-polyfill';
|
|
100
|
-
|
|
101
|
-
|
|
102
106
|
var HBox = _Boxs2.default.HBox,
|
|
103
107
|
VBox = _Boxs2.default.VBox,
|
|
104
108
|
Box = _Boxs2.default.Box;
|
|
@@ -260,6 +264,8 @@ var PageHome = function (_React$Component) {
|
|
|
260
264
|
}
|
|
261
265
|
var status = this.props.status; //判断是否能选择,0新增,1修改,2查看
|
|
262
266
|
var formKey = this.props.formKey; //表单code
|
|
267
|
+
var allForm = this.props.allForm; //表单属性
|
|
268
|
+
var formTblId = allForm.formTblId; //表单的表id
|
|
263
269
|
var data = this.props.data; //数据
|
|
264
270
|
var dataType = this.props.dataType; //数据类型,main:主表,sub:子表,
|
|
265
271
|
var module = this.props.module;
|
|
@@ -286,6 +292,10 @@ var PageHome = function (_React$Component) {
|
|
|
286
292
|
itemParam.key = key;
|
|
287
293
|
var itemType = form.itemType; //类型
|
|
288
294
|
itemParam.itemType = itemType;
|
|
295
|
+
var fieldTblId = form.tblId;
|
|
296
|
+
var fieldTblName = form.tblName;
|
|
297
|
+
itemParam.tblId = fieldTblId;
|
|
298
|
+
itemParam.tblName = fieldTblName;
|
|
289
299
|
|
|
290
300
|
var required = false;
|
|
291
301
|
if (itemType != "comment") {
|
|
@@ -302,6 +312,7 @@ var PageHome = function (_React$Component) {
|
|
|
302
312
|
itemParam.isHidden = form.isHidden ? form.isHidden : false; //默认不隐藏
|
|
303
313
|
|
|
304
314
|
var mainTblData = data.mainTblData; //主表数据
|
|
315
|
+
var relatedTbl = data.relatedTbl; //关联表数据
|
|
305
316
|
var subTbl = data.subTbl; //子表
|
|
306
317
|
var readOnly = false;
|
|
307
318
|
var value = '';
|
|
@@ -345,23 +356,72 @@ var PageHome = function (_React$Component) {
|
|
|
345
356
|
//新增
|
|
346
357
|
value = form.defaultValue;
|
|
347
358
|
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
359
|
+
if (formTblId.indexOf(fieldTblId) > 0) {
|
|
360
|
+
var hasTable = false;
|
|
361
|
+
var hasField = false;
|
|
362
|
+
relatedTbl.map(function (item) {
|
|
363
|
+
if (item.relatedMainTblName == fieldTblName) {
|
|
364
|
+
hasTable = true;
|
|
365
|
+
item.relatedMainTblData.map(function (item2) {
|
|
366
|
+
if (item2.key == key) {
|
|
367
|
+
hasField = true;
|
|
368
|
+
}
|
|
369
|
+
});
|
|
370
|
+
}
|
|
371
|
+
});
|
|
372
|
+
|
|
373
|
+
if (!hasField) {
|
|
374
|
+
//字段不存在
|
|
375
|
+
|
|
376
|
+
tableData.key = key;
|
|
377
|
+
tableData.value = form.defaultValue;
|
|
378
|
+
tableData.required = required;
|
|
379
|
+
tableData.label = title;
|
|
380
|
+
tableData.inputFormat = form.inputFormat;
|
|
381
|
+
tableData.decimalPlace = form.decimalPlace;
|
|
382
|
+
tableData.fieldId = form.fieldId;
|
|
383
|
+
tableData.uniqueName = uniqueName;
|
|
384
|
+
tableData.itemType = form.itemType;
|
|
385
|
+
|
|
386
|
+
if (!hasTable) {
|
|
387
|
+
//表不存在
|
|
388
|
+
var relatedTblData = {};
|
|
389
|
+
relatedTblData.relaDataId = null;
|
|
390
|
+
relatedTblData.relatedMainTblName = fieldTblName;
|
|
391
|
+
relatedTblData.relatedSubTblData = [];
|
|
392
|
+
|
|
393
|
+
var relatedMainTblData = [];
|
|
394
|
+
relatedMainTblData.push(tableData);
|
|
395
|
+
relatedTblData.relatedMainTblData = relatedMainTblData;
|
|
396
|
+
relatedTbl.push(relatedTblData);
|
|
397
|
+
} else {
|
|
398
|
+
relatedTbl.map(function (item) {
|
|
399
|
+
if (item.relatedMainTblName == fieldTblName) {
|
|
400
|
+
var relatedMainTblData = item.relatedMainTblData;
|
|
401
|
+
relatedMainTblData.push(tableData);
|
|
402
|
+
}
|
|
403
|
+
});
|
|
404
|
+
}
|
|
405
|
+
}
|
|
406
|
+
} else {
|
|
407
|
+
var hasField = false;
|
|
408
|
+
mainTblData.map(function (item) {
|
|
409
|
+
if (item.key == key) {
|
|
410
|
+
hasField = true;
|
|
411
|
+
}
|
|
412
|
+
});
|
|
413
|
+
if (!hasField) {
|
|
414
|
+
tableData.key = key;
|
|
415
|
+
tableData.value = form.defaultValue;
|
|
416
|
+
tableData.required = required;
|
|
417
|
+
tableData.label = title;
|
|
418
|
+
tableData.inputFormat = form.inputFormat;
|
|
419
|
+
tableData.decimalPlace = form.decimalPlace;
|
|
420
|
+
tableData.fieldId = form.fieldId;
|
|
421
|
+
tableData.uniqueName = uniqueName;
|
|
422
|
+
tableData.itemType = form.itemType;
|
|
423
|
+
mainTblData.push(tableData);
|
|
352
424
|
}
|
|
353
|
-
});
|
|
354
|
-
if (!hasField) {
|
|
355
|
-
tableData.key = key;
|
|
356
|
-
tableData.value = form.defaultValue;
|
|
357
|
-
tableData.required = required;
|
|
358
|
-
tableData.label = title;
|
|
359
|
-
tableData.inputFormat = form.inputFormat;
|
|
360
|
-
tableData.decimalPlace = form.decimalPlace;
|
|
361
|
-
tableData.fieldId = form.fieldId;
|
|
362
|
-
tableData.uniqueName = uniqueName;
|
|
363
|
-
tableData.itemType = form.itemType;
|
|
364
|
-
mainTblData.push(tableData);
|
|
365
425
|
}
|
|
366
426
|
} else if (status == '1') {
|
|
367
427
|
//编辑
|
|
@@ -369,7 +429,7 @@ var PageHome = function (_React$Component) {
|
|
|
369
429
|
if (!dataId) {
|
|
370
430
|
if (dataType == "sub") {
|
|
371
431
|
if (this.checkIsHasSub(mainTblData, key)) {
|
|
372
|
-
value = this.dealwithData(itemParam, mainTblData);
|
|
432
|
+
value = this.dealwithData(itemParam, mainTblData, relatedTbl);
|
|
373
433
|
} else {
|
|
374
434
|
value = form.value;
|
|
375
435
|
tableData.key = key;
|
|
@@ -381,7 +441,16 @@ var PageHome = function (_React$Component) {
|
|
|
381
441
|
tableData.fieldId = form.fieldId;
|
|
382
442
|
tableData.uniqueName = uniqueName;
|
|
383
443
|
tableData.itemType = form.itemType;
|
|
384
|
-
|
|
444
|
+
if (formTblId.indexOf(fieldTblId) > 0) {
|
|
445
|
+
relatedTbl.map(function (item) {
|
|
446
|
+
if (item.relatedMainTblName == fieldTblName) {
|
|
447
|
+
var relatedMainTblData = item.relatedMainTblData;
|
|
448
|
+
relatedMainTblData.push(tableData);
|
|
449
|
+
}
|
|
450
|
+
});
|
|
451
|
+
} else {
|
|
452
|
+
mainTblData.push(tableData);
|
|
453
|
+
}
|
|
385
454
|
}
|
|
386
455
|
} else {
|
|
387
456
|
value = form.value;
|
|
@@ -394,10 +463,19 @@ var PageHome = function (_React$Component) {
|
|
|
394
463
|
tableData.fieldId = form.fieldId;
|
|
395
464
|
tableData.uniqueName = uniqueName;
|
|
396
465
|
tableData.itemType = form.itemType;
|
|
397
|
-
|
|
466
|
+
if (formTblId.indexOf(fieldTblId) > 0) {
|
|
467
|
+
relatedTbl.map(function (item) {
|
|
468
|
+
if (item.relatedMainTblName == fieldTblName) {
|
|
469
|
+
var relatedMainTblData = item.relatedMainTblData;
|
|
470
|
+
relatedMainTblData.push(tableData);
|
|
471
|
+
}
|
|
472
|
+
});
|
|
473
|
+
} else {
|
|
474
|
+
mainTblData.push(tableData);
|
|
475
|
+
}
|
|
398
476
|
}
|
|
399
477
|
} else {
|
|
400
|
-
value = this.dealwithData(itemParam, mainTblData); //初始化值
|
|
478
|
+
value = this.dealwithData(itemParam, mainTblData, relatedTbl); //初始化值
|
|
401
479
|
}
|
|
402
480
|
} else {
|
|
403
481
|
//显示
|
|
@@ -410,7 +488,7 @@ var PageHome = function (_React$Component) {
|
|
|
410
488
|
tableData.fieldId = form.fieldId;
|
|
411
489
|
tableData.uniqueName = uniqueName;
|
|
412
490
|
tableData.itemType = form.itemType;
|
|
413
|
-
value = this.dealwithData(itemParam, mainTblData); //初始化值
|
|
491
|
+
value = this.dealwithData(itemParam, mainTblData, relatedTbl); //初始化值
|
|
414
492
|
}
|
|
415
493
|
}
|
|
416
494
|
|
|
@@ -1214,7 +1292,22 @@ var PageHome = function (_React$Component) {
|
|
|
1214
1292
|
|
|
1215
1293
|
//CA验签
|
|
1216
1294
|
if (status > 0 && preCaFields.indexOf("," + uniqueName + ",") >= 0 && itemType != 'popuser') {
|
|
1217
|
-
|
|
1295
|
+
//项目开发扩展
|
|
1296
|
+
var mobileExt;
|
|
1297
|
+
try {
|
|
1298
|
+
if (formKey) {
|
|
1299
|
+
mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
|
|
1300
|
+
}
|
|
1301
|
+
} catch (e) {
|
|
1302
|
+
// alert("exception: "+e.message);
|
|
1303
|
+
}
|
|
1304
|
+
if (typeof mobileExt !== 'undefined' && typeof mobileExt["casigin"] === "function") {
|
|
1305
|
+
var isVerifySing = mobileExt["casigin"](itemParam, data, uniqueName, isVerifySingValue);
|
|
1306
|
+
itemParam.isVerifySing = isVerifySing;
|
|
1307
|
+
this.setState(itemParam);
|
|
1308
|
+
} else {
|
|
1309
|
+
this.casigin(itemParam, data, uniqueName, isVerifySingValue);
|
|
1310
|
+
}
|
|
1218
1311
|
}
|
|
1219
1312
|
}
|
|
1220
1313
|
|
|
@@ -1547,38 +1640,82 @@ var PageHome = function (_React$Component) {
|
|
|
1547
1640
|
|
|
1548
1641
|
}, {
|
|
1549
1642
|
key: 'dealwithData',
|
|
1550
|
-
value: function dealwithData(itemParam, mainTblData) {
|
|
1643
|
+
value: function dealwithData(itemParam, mainTblData, relatedTbl) {
|
|
1551
1644
|
var itemCode = itemParam.key;
|
|
1552
1645
|
var itemType = itemParam.itemType;
|
|
1553
1646
|
var value = '';
|
|
1554
|
-
if (mainTblData.length > 0) {
|
|
1555
|
-
for (var i = 0; i < mainTblData.length; i++) {
|
|
1556
|
-
var item = mainTblData[i];
|
|
1557
|
-
if (item.key == itemCode) {
|
|
1558
|
-
mainTblData[i].required = itemParam.required;
|
|
1559
|
-
mainTblData[i].label = itemParam.title;
|
|
1560
|
-
mainTblData[i].inputFormat = itemParam.inputFormat;
|
|
1561
|
-
mainTblData[i].decimalPlace = itemParam.decimalPlace;
|
|
1562
|
-
// if(item.showValue){
|
|
1563
|
-
// value = item.showValue;
|
|
1564
|
-
// item.showValue = null;
|
|
1565
|
-
// }else{
|
|
1566
|
-
if (item.value || item.value == 0) {
|
|
1567
|
-
value = item.value;
|
|
1568
|
-
}
|
|
1569
1647
|
|
|
1570
|
-
|
|
1571
|
-
|
|
1572
|
-
|
|
1573
|
-
|
|
1648
|
+
var formTblId = this.props.allForm.formTblId;
|
|
1649
|
+
var fieldTblId = itemParam.tblId;
|
|
1650
|
+
var fieldTblName = itemParam.tblName;
|
|
1651
|
+
if (formTblId.indexOf(fieldTblId) > 0) {
|
|
1652
|
+
if (relatedTbl.length > 0) {
|
|
1653
|
+
for (var i = 0; i < relatedTbl.length; i++) {
|
|
1654
|
+
var item = relatedTbl[i];
|
|
1655
|
+
if (item.relatedMainTblName == fieldTblName) {
|
|
1656
|
+
var relatedMainTblData = item.relatedMainTblData;
|
|
1657
|
+
if (relatedMainTblData) {
|
|
1658
|
+
for (var j = 0; j < relatedMainTblData.length; j++) {
|
|
1659
|
+
var relatedItem = relatedMainTblData[j];
|
|
1660
|
+
if (relatedItem.key == itemCode) {
|
|
1661
|
+
relatedItem.required = itemParam.required;
|
|
1662
|
+
relatedItem.label = itemParam.title;
|
|
1663
|
+
relatedItem.inputFormat = itemParam.inputFormat;
|
|
1664
|
+
relatedItem.decimalPlace = itemParam.decimalPlace;
|
|
1665
|
+
// if(item.showValue){
|
|
1666
|
+
// value = item.showValue;
|
|
1667
|
+
// item.showValue = null;
|
|
1668
|
+
// }else{
|
|
1669
|
+
if (relatedItem.value || relatedItem.value == 0) {
|
|
1670
|
+
value = relatedItem.value;
|
|
1671
|
+
}
|
|
1672
|
+
|
|
1673
|
+
//}
|
|
1674
|
+
if (itemType == 'text' || itemType == 'textarea') {
|
|
1675
|
+
if (value) {
|
|
1676
|
+
relatedItem.value = value + '';
|
|
1677
|
+
}
|
|
1678
|
+
}
|
|
1679
|
+
break;
|
|
1680
|
+
}
|
|
1681
|
+
}
|
|
1574
1682
|
}
|
|
1575
1683
|
}
|
|
1576
|
-
|
|
1577
|
-
|
|
1578
|
-
}
|
|
1579
|
-
|
|
1684
|
+
};
|
|
1685
|
+
return value;
|
|
1686
|
+
} else {
|
|
1687
|
+
return value;
|
|
1688
|
+
}
|
|
1580
1689
|
} else {
|
|
1581
|
-
|
|
1690
|
+
if (mainTblData.length > 0) {
|
|
1691
|
+
for (var i = 0; i < mainTblData.length; i++) {
|
|
1692
|
+
var item = mainTblData[i];
|
|
1693
|
+
if (item.key == itemCode) {
|
|
1694
|
+
mainTblData[i].required = itemParam.required;
|
|
1695
|
+
mainTblData[i].label = itemParam.title;
|
|
1696
|
+
mainTblData[i].inputFormat = itemParam.inputFormat;
|
|
1697
|
+
mainTblData[i].decimalPlace = itemParam.decimalPlace;
|
|
1698
|
+
// if(item.showValue){
|
|
1699
|
+
// value = item.showValue;
|
|
1700
|
+
// item.showValue = null;
|
|
1701
|
+
// }else{
|
|
1702
|
+
if (item.value || item.value == 0) {
|
|
1703
|
+
value = item.value;
|
|
1704
|
+
}
|
|
1705
|
+
|
|
1706
|
+
//}
|
|
1707
|
+
if (itemType == 'text' || itemType == 'textarea') {
|
|
1708
|
+
if (value) {
|
|
1709
|
+
mainTblData[i].value = value + '';
|
|
1710
|
+
}
|
|
1711
|
+
}
|
|
1712
|
+
break;
|
|
1713
|
+
}
|
|
1714
|
+
};
|
|
1715
|
+
return value;
|
|
1716
|
+
} else {
|
|
1717
|
+
return value;
|
|
1718
|
+
}
|
|
1582
1719
|
}
|
|
1583
1720
|
}
|
|
1584
1721
|
|
|
@@ -1625,6 +1762,11 @@ var PageHome = function (_React$Component) {
|
|
|
1625
1762
|
}, {
|
|
1626
1763
|
key: 'editData',
|
|
1627
1764
|
value: function editData(itemCode, value, data) {
|
|
1765
|
+
var itemParam = this.state.itemParam;
|
|
1766
|
+
var allForm = this.props.allForm;
|
|
1767
|
+
var formTblId = this.props.allForm.formTblId;
|
|
1768
|
+
var fieldTblId = itemParam.tblId;
|
|
1769
|
+
var fieldTblName = itemParam.tblName;
|
|
1628
1770
|
//处理操作返回数据
|
|
1629
1771
|
if (typeof FlowCommon.dealwithReturnData === "function") {
|
|
1630
1772
|
FlowCommon.dealwithReturnData(itemCode, value, function (itemCode1, value1) {
|
|
@@ -1643,12 +1785,27 @@ var PageHome = function (_React$Component) {
|
|
|
1643
1785
|
});
|
|
1644
1786
|
}
|
|
1645
1787
|
} else {
|
|
1646
|
-
|
|
1647
|
-
|
|
1648
|
-
|
|
1649
|
-
item
|
|
1788
|
+
if (formTblId.indexOf(fieldTblId) > 0) {
|
|
1789
|
+
var relatedTbl = data.relatedTbl;
|
|
1790
|
+
for (var i = 0; i < relatedTbl.length; i++) {
|
|
1791
|
+
var item = relatedTbl[i];
|
|
1792
|
+
if (item.relatedMainTblName == fieldTblName) {
|
|
1793
|
+
var relatedMainTblData = item.relatedMainTblData;
|
|
1794
|
+
for (var j = 0; j < relatedMainTblData.length; j++) {
|
|
1795
|
+
if (relatedMainTblData[j].key == itemCode) {
|
|
1796
|
+
relatedMainTblData[j].value = value;
|
|
1797
|
+
}
|
|
1798
|
+
}
|
|
1799
|
+
}
|
|
1650
1800
|
}
|
|
1651
|
-
}
|
|
1801
|
+
} else {
|
|
1802
|
+
var mainTblData = data.mainTblData;
|
|
1803
|
+
mainTblData.map(function (item, index) {
|
|
1804
|
+
if (item.key == itemCode) {
|
|
1805
|
+
item.value = value;
|
|
1806
|
+
}
|
|
1807
|
+
});
|
|
1808
|
+
}
|
|
1652
1809
|
}
|
|
1653
1810
|
|
|
1654
1811
|
return data;
|
|
@@ -1800,7 +1957,7 @@ var PageHome = function (_React$Component) {
|
|
|
1800
1957
|
key: 'checkEmoji',
|
|
1801
1958
|
value: function checkEmoji(content) {
|
|
1802
1959
|
var result = false;
|
|
1803
|
-
var regStr = /
|
|
1960
|
+
var regStr = /(\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]/g;
|
|
1804
1961
|
if (regStr.test(content)) {
|
|
1805
1962
|
result = true;
|
|
1806
1963
|
}
|
|
@@ -2269,7 +2426,7 @@ var PageHome = function (_React$Component) {
|
|
|
2269
2426
|
),
|
|
2270
2427
|
_react2.default.createElement(
|
|
2271
2428
|
Box,
|
|
2272
|
-
{ 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 t-
|
|
2429
|
+
{ 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 t-FCblue' },
|
|
2273
2430
|
'\u5220\u9664'
|
|
2274
2431
|
)
|
|
2275
2432
|
),
|
|
@@ -2540,7 +2697,6 @@ var PageHome = function (_React$Component) {
|
|
|
2540
2697
|
label: t.state.itemParam.title,
|
|
2541
2698
|
readOnly: t.state.itemParam.readOnly,
|
|
2542
2699
|
minRows: 3,
|
|
2543
|
-
layout: 'v',
|
|
2544
2700
|
placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
|
|
2545
2701
|
value: t.state.itemParam.value,
|
|
2546
2702
|
onChange: function onChange(value) {
|
|
@@ -2792,17 +2948,15 @@ var PageHome = function (_React$Component) {
|
|
|
2792
2948
|
{ borderTopNone: true },
|
|
2793
2949
|
_react2.default.createElement(
|
|
2794
2950
|
'div',
|
|
2795
|
-
{ className: 't-
|
|
2951
|
+
{ className: 't-W100', id: t.state.prefixName + "_" + t.state.itemParam.key },
|
|
2796
2952
|
_react2.default.createElement(
|
|
2797
|
-
|
|
2798
|
-
{
|
|
2953
|
+
_Field2.default,
|
|
2954
|
+
{ label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
|
|
2799
2955
|
_react2.default.createElement(_upload2.default, {
|
|
2800
2956
|
ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
|
|
2801
|
-
required: t.state.itemParam.required,
|
|
2802
2957
|
canAdd: t.state.itemParam.readOnly == true ? false : true,
|
|
2803
2958
|
canDel: t.state.itemParam.readOnly == true ? false : true,
|
|
2804
2959
|
canDownload: this.state.itemParam.canDownload == "1" ? true : false,
|
|
2805
|
-
label: t.state.itemParam.title,
|
|
2806
2960
|
initList: t.state.itemParam.value,
|
|
2807
2961
|
initIds: t.state.itemParam.initIds,
|
|
2808
2962
|
dir: t.state.module,
|
|
@@ -2827,16 +2981,14 @@ var PageHome = function (_React$Component) {
|
|
|
2827
2981
|
{ borderTopNone: true },
|
|
2828
2982
|
_react2.default.createElement(
|
|
2829
2983
|
'div',
|
|
2830
|
-
{ className: 't-
|
|
2984
|
+
{ className: 't-W100', id: t.state.prefixName + "_" + t.state.itemParam.key },
|
|
2831
2985
|
_react2.default.createElement(
|
|
2832
|
-
|
|
2833
|
-
{
|
|
2986
|
+
_Field2.default,
|
|
2987
|
+
{ label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
|
|
2834
2988
|
_react2.default.createElement(_upload2.default, {
|
|
2835
2989
|
ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
|
|
2836
|
-
required: t.state.itemParam.required,
|
|
2837
2990
|
canAdd: t.state.itemParam.readOnly == true ? false : true,
|
|
2838
2991
|
canDel: t.state.itemParam.readOnly == true ? false : true,
|
|
2839
|
-
label: t.state.itemParam.title,
|
|
2840
2992
|
initList: t.state.itemParam.value,
|
|
2841
2993
|
initIds: t.state.itemParam.initIds,
|
|
2842
2994
|
dir: t.state.module,
|
|
@@ -2893,21 +3045,21 @@ var PageHome = function (_React$Component) {
|
|
|
2893
3045
|
placeholder: '请输入批示意见',
|
|
2894
3046
|
value: t.state.spyj,
|
|
2895
3047
|
onChange: this.changeSpyj3.bind(this) })
|
|
2896
|
-
)
|
|
3048
|
+
)
|
|
3049
|
+
),
|
|
3050
|
+
_react2.default.createElement(
|
|
3051
|
+
_FoldablePane2.default,
|
|
3052
|
+
{ foldHeight: 0, isFold: this.state.fold },
|
|
2897
3053
|
_react2.default.createElement(
|
|
2898
|
-
|
|
2899
|
-
{
|
|
2900
|
-
|
|
2901
|
-
|
|
2902
|
-
|
|
2903
|
-
|
|
2904
|
-
|
|
2905
|
-
|
|
2906
|
-
|
|
2907
|
-
item.value
|
|
2908
|
-
);
|
|
2909
|
-
}.bind(this)) : ''
|
|
2910
|
-
)
|
|
3054
|
+
'div',
|
|
3055
|
+
{ className: 'phrase-list' },
|
|
3056
|
+
this.state.phraseListNew.length > 0 ? this.state.phraseListNew.map(function (item, i) {
|
|
3057
|
+
return _react2.default.createElement(
|
|
3058
|
+
'div',
|
|
3059
|
+
{ className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
|
|
3060
|
+
item.value
|
|
3061
|
+
);
|
|
3062
|
+
}.bind(this)) : ''
|
|
2911
3063
|
)
|
|
2912
3064
|
)
|
|
2913
3065
|
)
|
|
@@ -2921,7 +3073,7 @@ var PageHome = function (_React$Component) {
|
|
|
2921
3073
|
{ borderTopNone: true },
|
|
2922
3074
|
_react2.default.createElement(
|
|
2923
3075
|
VBox,
|
|
2924
|
-
{ vAlign: 'center', className: 't-LH40 t-
|
|
3076
|
+
{ vAlign: 'center', className: 't-LH40 t-FCblue t-BCf dd-bottom-border t-PL16 t-PR16' },
|
|
2925
3077
|
_react2.default.createElement(
|
|
2926
3078
|
Box,
|
|
2927
3079
|
{ flex: 1, className: 't-PR' },
|
package/lib/form/subForm.js
CHANGED
|
@@ -648,7 +648,7 @@ var PageHome = function (_React$Component) {
|
|
|
648
648
|
),
|
|
649
649
|
_react2.default.createElement(
|
|
650
650
|
Box,
|
|
651
|
-
{ 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: t.state.itemParam.subtableReadonly || subForm.length == 1 ? 't-DN' : 't-P16 t-
|
|
651
|
+
{ 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: t.state.itemParam.subtableReadonly || subForm.length == 1 ? 't-DN' : 't-P16 t-FCblue' },
|
|
652
652
|
'\u5220\u9664'
|
|
653
653
|
)
|
|
654
654
|
),
|
|
@@ -656,7 +656,7 @@ var PageHome = function (_React$Component) {
|
|
|
656
656
|
'div',
|
|
657
657
|
{ className: item.show ? "" : "t-DN" },
|
|
658
658
|
item.form.map(function (item2, j) {
|
|
659
|
-
return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
|
|
659
|
+
return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
|
|
660
660
|
})
|
|
661
661
|
)
|
|
662
662
|
);
|
|
@@ -751,7 +751,7 @@ var PageHome = function (_React$Component) {
|
|
|
751
751
|
),
|
|
752
752
|
_react2.default.createElement(
|
|
753
753
|
Box,
|
|
754
|
-
|
|
754
|
+
null,
|
|
755
755
|
_react2.default.createElement('i', { className: this.state.itemParam.show ? "iconfont icon-arrow-down t-FS18 t-FCc" : "iconfont icon-arrow-up t-rotate-90 t-FS18 t-FCc" })
|
|
756
756
|
)
|
|
757
757
|
),
|