fmui-base 1.0.46 → 1.0.48

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 CHANGED
@@ -3,6 +3,8 @@
3
3
  ---
4
4
 
5
5
  ## 更新日志
6
+ - 1.0.48:选人组件政治面貌修改;表单提交必填校验加背景颜色;说明组件修复
7
+ - 1.0.47:说明组件增加附件,图片
6
8
  - 1.0.46:项目模块扩展开发修改
7
9
  - 1.0.45:表单字段选人默认值
8
10
  - 1.0.44:增加表单锚点
package/lib/form/form.js CHANGED
@@ -100,6 +100,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
100
100
 
101
101
 
102
102
  var HBox = _Boxs2.default.HBox,
103
+ VBox = _Boxs2.default.VBox,
103
104
  Box = _Boxs2.default.Box;
104
105
  //import 'babel-polyfill';
105
106
 
@@ -144,6 +145,7 @@ var PageHome = function (_React$Component) {
144
145
  status: status,
145
146
  fieldControll: props.fieldControll,
146
147
  commentField: props.commentField,
148
+ hasCommentField: props.hasCommentField,
147
149
  urlPrev: context + '/dingisv/api/common/viewImage?fid=',
148
150
  calc: [],
149
151
  itemParam: {
@@ -615,7 +617,7 @@ var PageHome = function (_React$Component) {
615
617
  if (selectItem) {
616
618
  var valueArray = [];
617
619
  //if(status != '0'){
618
- if (value != 0 && value) {
620
+ if (value || value == 0) {
619
621
  if (value.indexOf("[") >= 0) {
620
622
  valueArray = JSON.parse(value);
621
623
  } else {
@@ -858,6 +860,10 @@ var PageHome = function (_React$Component) {
858
860
  }
859
861
  itemParam.topicType = itemType;
860
862
  value = commentFieldList;
863
+
864
+ if (t.state.commentField == itemParam.uniqueName && t.state.hasCommentField == '1') {
865
+ this.props.newspyj.documentId = t.state.prefixName + "_" + itemParam.key;
866
+ }
861
867
  } else if (itemType == 'upload' || itemType == 'image') {
862
868
  //附件图片
863
869
  var uploadFileNumLimit = form.uploadFileNumLimit; //上传个数限制
@@ -959,6 +965,8 @@ var PageHome = function (_React$Component) {
959
965
  itemParam.explain = form.explain;
960
966
  itemParam.explainUrl = form.explainUrl;
961
967
  itemParam.explainShow = form.explainShow;
968
+ itemParam.noteFileIds = form.noteFileIds ? form.noteFileIds : "";
969
+ itemParam.noteImageIds = form.noteImageIds ? form.noteImageIds : "";
962
970
  } else if (itemType == 'switch') {
963
971
  //开关
964
972
  if (status != '0') {
@@ -1131,6 +1139,14 @@ var PageHome = function (_React$Component) {
1131
1139
  if (itemType == 'upload' || itemType == 'image' || itemType == 'weboffice') {
1132
1140
  this.refs["upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key].initData();
1133
1141
  }
1142
+ if (itemType == 'note') {
1143
+ if (itemParam.noteFileIds) {
1144
+ this.refs["note_file_" + t.state.itemParam.fieldId].initData();
1145
+ }
1146
+ if (itemParam.noteImageIds) {
1147
+ this.refs["note_image_" + t.state.itemParam.fieldId].initData();
1148
+ }
1149
+ }
1134
1150
 
1135
1151
  //修改样式
1136
1152
  var styleStr = "";
@@ -1651,6 +1667,14 @@ var PageHome = function (_React$Component) {
1651
1667
 
1652
1668
  }
1653
1669
  }*/
1670
+ if (this.checkEmoji(newValue)) {
1671
+ _Toast2.default.show({
1672
+ type: 'error',
1673
+ content: "请输入非表情字符"
1674
+ });
1675
+ return false;
1676
+ }
1677
+
1654
1678
  if (typeof length != "undefined" && length != null && length != "" && inputFormat == "char") {
1655
1679
  if (newValue.length > length) {
1656
1680
  _Toast2.default.show({
@@ -1757,6 +1781,19 @@ var PageHome = function (_React$Component) {
1757
1781
  return result;
1758
1782
  }
1759
1783
 
1784
+ //校验emoji表情
1785
+
1786
+ }, {
1787
+ key: 'checkEmoji',
1788
+ value: function checkEmoji(content) {
1789
+ var result = false;
1790
+ var regStr = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/gi;
1791
+ if (regStr.test(content)) {
1792
+ result = true;
1793
+ }
1794
+ return result;
1795
+ }
1796
+
1760
1797
  //多行文本
1761
1798
 
1762
1799
  }, {
@@ -1767,6 +1804,13 @@ var PageHome = function (_React$Component) {
1767
1804
  var itemParam = this.state.itemParam;
1768
1805
  var length = itemParam.maxlength;
1769
1806
 
1807
+ if (this.checkEmoji(newValue)) {
1808
+ _Toast2.default.show({
1809
+ type: 'error',
1810
+ content: "请输入非表情字符"
1811
+ });
1812
+ return false;
1813
+ }
1770
1814
  if (typeof length != "undefined" && length != null && length != "" && itemParam.fieldType == 'char') {
1771
1815
  if (newValue.length > length) {
1772
1816
  _Toast2.default.show({
@@ -2066,11 +2110,10 @@ var PageHome = function (_React$Component) {
2066
2110
  }, {
2067
2111
  key: 'changeSpyj3',
2068
2112
  value: function changeSpyj3(newValue) {
2069
- var regRule = /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
2070
- if (newValue.match(regRule)) {
2113
+ if (this.checkEmoji(newValue)) {
2071
2114
  _Toast2.default.show({
2072
2115
  type: 'error',
2073
- content: '不能输入表情'
2116
+ content: "请输入非表情字符"
2074
2117
  });
2075
2118
  return false;
2076
2119
  }
@@ -2490,13 +2533,13 @@ var PageHome = function (_React$Component) {
2490
2533
  )
2491
2534
  ) : this.state.itemParam.itemType == 'textarea' ? _react2.default.createElement(
2492
2535
  'div',
2493
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2536
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2494
2537
  _react2.default.createElement(
2495
2538
  _Group2.default.List,
2496
2539
  { borderTopNone: true },
2497
2540
  _react2.default.createElement(
2498
2541
  'div',
2499
- { className: 't-FBH' },
2542
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2500
2543
  _react2.default.createElement(_TextareaField2.default, {
2501
2544
  className: 't-W100',
2502
2545
  required: t.state.itemParam.required,
@@ -2514,13 +2557,13 @@ var PageHome = function (_React$Component) {
2514
2557
  )
2515
2558
  ) : this.state.itemParam.itemType == 'radio' ? _react2.default.createElement(
2516
2559
  'div',
2517
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2560
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2518
2561
  _react2.default.createElement(
2519
2562
  _Group2.default.List,
2520
2563
  { borderTopNone: true },
2521
2564
  _react2.default.createElement(
2522
2565
  'div',
2523
- { className: 't-FBH' },
2566
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2524
2567
  _react2.default.createElement(
2525
2568
  'div',
2526
2569
  { className: 't-W100' },
@@ -2539,13 +2582,13 @@ var PageHome = function (_React$Component) {
2539
2582
  )
2540
2583
  ) : this.state.itemParam.itemType == 'checkbox' ? _react2.default.createElement(
2541
2584
  'div',
2542
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2585
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2543
2586
  _react2.default.createElement(
2544
2587
  _Group2.default.List,
2545
2588
  { borderTopNone: true },
2546
2589
  _react2.default.createElement(
2547
2590
  'div',
2548
- { className: 't-FBH' },
2591
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2549
2592
  _react2.default.createElement(
2550
2593
  'div',
2551
2594
  { className: 't-W100' },
@@ -2565,13 +2608,13 @@ var PageHome = function (_React$Component) {
2565
2608
  )
2566
2609
  ) : this.state.itemParam.itemType == 'select' ? _react2.default.createElement(
2567
2610
  'div',
2568
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2611
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2569
2612
  _react2.default.createElement(
2570
2613
  _Group2.default.List,
2571
2614
  { borderTopNone: true },
2572
2615
  _react2.default.createElement(
2573
2616
  'div',
2574
- { className: 't-FBH' },
2617
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2575
2618
  _react2.default.createElement(_SelectField2.default, {
2576
2619
  className: 't-W100',
2577
2620
  required: t.state.itemParam.required,
@@ -2610,13 +2653,13 @@ var PageHome = function (_React$Component) {
2610
2653
  )
2611
2654
  ) : this.state.itemParam.itemType == 'datetimeStep' ? _react2.default.createElement(
2612
2655
  'div',
2613
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2656
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2614
2657
  _react2.default.createElement(
2615
2658
  _Group2.default.List,
2616
2659
  { borderTopNone: true },
2617
2660
  _react2.default.createElement(
2618
2661
  'div',
2619
- { className: 't-FBH' },
2662
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2620
2663
  _react2.default.createElement(
2621
2664
  HBox,
2622
2665
  { className: 't-field-box t-FBAC t-W100' },
@@ -2662,13 +2705,13 @@ var PageHome = function (_React$Component) {
2662
2705
  )
2663
2706
  ) : this.state.itemParam.itemType == 'poppage' ? _react2.default.createElement(
2664
2707
  'div',
2665
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2708
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2666
2709
  _react2.default.createElement(
2667
2710
  _Group2.default.List,
2668
2711
  { borderTopNone: true },
2669
2712
  _react2.default.createElement(
2670
2713
  'div',
2671
- { className: 't-FBH' },
2714
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2672
2715
  _react2.default.createElement(
2673
2716
  'div',
2674
2717
  { className: 't-W100' },
@@ -2688,13 +2731,13 @@ var PageHome = function (_React$Component) {
2688
2731
  )
2689
2732
  ) : this.state.itemParam.itemType == 'popuser' ? _react2.default.createElement(
2690
2733
  'div',
2691
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2734
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2692
2735
  _react2.default.createElement(
2693
2736
  _Group2.default.List,
2694
2737
  { borderTopNone: true },
2695
2738
  _react2.default.createElement(
2696
2739
  'div',
2697
- { className: 't-FBH' },
2740
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2698
2741
  _react2.default.createElement(
2699
2742
  'div',
2700
2743
  { className: 't-W100' },
@@ -2724,13 +2767,13 @@ var PageHome = function (_React$Component) {
2724
2767
  )
2725
2768
  ) : this.state.itemParam.itemType == 'upload' ? _react2.default.createElement(
2726
2769
  'div',
2727
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2770
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2728
2771
  _react2.default.createElement(
2729
2772
  _Group2.default.List,
2730
2773
  { borderTopNone: true },
2731
2774
  _react2.default.createElement(
2732
2775
  'div',
2733
- { className: 't-FBH' },
2776
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2734
2777
  _react2.default.createElement(
2735
2778
  'div',
2736
2779
  { className: 't-W100' },
@@ -2758,13 +2801,13 @@ var PageHome = function (_React$Component) {
2758
2801
  )
2759
2802
  ) : this.state.itemParam.itemType == 'image' ? _react2.default.createElement(
2760
2803
  'div',
2761
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2804
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2762
2805
  _react2.default.createElement(
2763
2806
  _Group2.default.List,
2764
2807
  { borderTopNone: true },
2765
2808
  _react2.default.createElement(
2766
2809
  'div',
2767
- { className: 't-FBH' },
2810
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2768
2811
  _react2.default.createElement(
2769
2812
  'div',
2770
2813
  { className: 't-W100' },
@@ -2793,7 +2836,7 @@ var PageHome = function (_React$Component) {
2793
2836
  )
2794
2837
  ) : this.state.itemParam.itemType == 'comment' ? _react2.default.createElement(
2795
2838
  'div',
2796
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2839
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2797
2840
  _react2.default.createElement(
2798
2841
  _Group2.default.List,
2799
2842
  { borderTopNone: true },
@@ -2821,33 +2864,15 @@ var PageHome = function (_React$Component) {
2821
2864
  { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-FCddblue t-P6 t-FS16 commonwords' : 't-DN', onClick: this.selectCommonwords.bind(this) },
2822
2865
  '\u5E38\u7528\u8BED'
2823
2866
  ),
2824
- _react2.default.createElement(_TextareaField2.default, {
2825
- readOnly: false,
2826
- minRows: 3, maxRows: 5,
2827
- placeholder: '请输入批示意见',
2828
- value: t.state.spyj,
2829
- onChange: this.changeSpyj3.bind(this) }),
2830
- _react2.default.createElement(_CheckboxField2.default, {
2831
- className: this.state.hasCommentField == '1' ? "" : "t-DN",
2832
- data: this.state.savePhraseList,
2833
- mode: 'list',
2834
- onChange: this.selectSavePhrase.bind(this),
2835
- required: false
2836
- }),
2837
2867
  _react2.default.createElement(
2838
- _FoldablePane2.default,
2839
- { foldHeight: 0, isFold: this.state.fold },
2840
- _react2.default.createElement(
2841
- 'div',
2842
- { className: 'phrase-list' },
2843
- this.state.phraseListNew.length > 0 ? this.state.phraseListNew.map(function (item, i) {
2844
- return _react2.default.createElement(
2845
- 'div',
2846
- { className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
2847
- item.value
2848
- );
2849
- }.bind(this)) : ''
2850
- )
2868
+ 'div',
2869
+ { id: t.state.prefixName + "_" + t.state.itemParam.key },
2870
+ _react2.default.createElement(_TextareaField2.default, {
2871
+ readOnly: false,
2872
+ minRows: 3, maxRows: 5,
2873
+ placeholder: '请输入批示意见',
2874
+ value: t.state.spyj,
2875
+ onChange: this.changeSpyj3.bind(this) })
2851
2876
  )
2852
2877
  )
2853
2878
  )
@@ -2860,33 +2885,55 @@ var PageHome = function (_React$Component) {
2860
2885
  _Group2.default.List,
2861
2886
  { borderTopNone: true },
2862
2887
  _react2.default.createElement(
2863
- HBox,
2864
- { vAlign: 'center', className: 't-LH40 t-FCddblue t-BCf dd-bottom-border t-PL16 t-PR16', onClick: this.noticeClick.bind(this, t.state.itemParam.explainUrl) },
2888
+ VBox,
2889
+ { vAlign: 'center', className: 't-LH40 t-FCddblue t-BCf dd-bottom-border t-PL16 t-PR16' },
2865
2890
  _react2.default.createElement(
2866
2891
  Box,
2867
2892
  { flex: 1, className: 't-PR' },
2868
2893
  _react2.default.createElement(
2869
2894
  'span',
2870
- { className: 't-ML26', style: { color: t.state.itemParam.formStyleObj.contentStyle.color } },
2895
+ { className: "t-ML16", style: { color: t.state.itemParam.formStyleObj.contentStyle.color }, onClick: this.noticeClick.bind(this, t.state.itemParam.explainUrl) },
2871
2896
  t.state.itemParam.explain
2872
2897
  )
2873
2898
  ),
2874
2899
  _react2.default.createElement(
2875
2900
  Box,
2876
- { className: t.state.itemParam.explainUrl == "" ? "t-DN" : "" },
2877
- _react2.default.createElement('b', { className: 'iconfont icon-back t-rotate-180 t-FCc t-FS16 t-FS14' })
2901
+ { className: t.state.itemParam.noteFileIds == "" ? "t-DN" : "" },
2902
+ _react2.default.createElement(_upload2.default, {
2903
+ required: false,
2904
+ canAdd: false,
2905
+ canDel: false,
2906
+ initIds: t.state.itemParam.noteFileIds,
2907
+ limitNo: '5',
2908
+ fileSizeLimit: '10',
2909
+ ref: "note_file_" + t.state.itemParam.fieldId
2910
+ })
2911
+ ),
2912
+ _react2.default.createElement(
2913
+ Box,
2914
+ { className: t.state.itemParam.noteImageIds == "" ? "t-DN" : "" },
2915
+ _react2.default.createElement(_upload2.default, {
2916
+ uploadType: 'image',
2917
+ required: false,
2918
+ canAdd: false,
2919
+ canDel: false,
2920
+ initIds: t.state.itemParam.noteImageIds,
2921
+ limitNo: '5',
2922
+ fileSizeLimit: '10',
2923
+ ref: "note_image_" + t.state.itemParam.fieldId
2924
+ })
2878
2925
  )
2879
2926
  )
2880
2927
  )
2881
2928
  ) : this.state.itemParam.itemType == 'switch' ? _react2.default.createElement(
2882
2929
  'div',
2883
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2930
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2884
2931
  _react2.default.createElement(
2885
2932
  _Group2.default.List,
2886
2933
  { borderTopNone: true },
2887
2934
  _react2.default.createElement(
2888
2935
  'div',
2889
- { className: 't-FBH' },
2936
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2890
2937
  _react2.default.createElement(_SwitchField2.default, {
2891
2938
  className: 't-W100',
2892
2939
  required: t.state.itemParam.required,
@@ -2900,13 +2947,13 @@ var PageHome = function (_React$Component) {
2900
2947
  )
2901
2948
  ) : this.state.itemParam.itemType == 'positioning' ? _react2.default.createElement(
2902
2949
  'div',
2903
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2950
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2904
2951
  _react2.default.createElement(
2905
2952
  _Group2.default.List,
2906
2953
  { borderTopNone: true },
2907
2954
  _react2.default.createElement(
2908
2955
  'div',
2909
- { className: 't-FBH' },
2956
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2910
2957
  _react2.default.createElement(
2911
2958
  'div',
2912
2959
  { className: 't-W100' },
@@ -2925,13 +2972,13 @@ var PageHome = function (_React$Component) {
2925
2972
  )
2926
2973
  ) : this.state.itemParam.itemType == 'weboffice' ? _react2.default.createElement(
2927
2974
  'div',
2928
- { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2975
+ { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
2929
2976
  _react2.default.createElement(
2930
2977
  _Group2.default.List,
2931
2978
  { borderTopNone: true },
2932
2979
  _react2.default.createElement(
2933
2980
  'div',
2934
- { className: 't-FBH' },
2981
+ { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
2935
2982
  _react2.default.createElement(
2936
2983
  'div',
2937
2984
  { className: 't-W100' },
package/lib/form/table.js CHANGED
@@ -1348,11 +1348,11 @@ var PageHome = function (_React$Component) {
1348
1348
  }, {
1349
1349
  key: 'changeSpyj1',
1350
1350
  value: function changeSpyj1(newValue) {
1351
- var regRule = /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
1351
+ var regRule = /[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/gi;
1352
1352
  if (newValue.match(regRule)) {
1353
1353
  _Toast2.default.show({
1354
1354
  type: 'error',
1355
- content: '不能输入表情'
1355
+ content: '请输入非表情字符'
1356
1356
  });
1357
1357
  return false;
1358
1358
  }
@@ -1628,12 +1628,16 @@ var PageHome = function (_React$Component) {
1628
1628
  { className: 't-FCddblue t-P6 t-FS16 commonwords', onClick: this.selectCommonwords.bind(this) },
1629
1629
  '\u5E38\u7528\u8BED'
1630
1630
  ),
1631
- _react2.default.createElement(_TextareaField2.default, {
1632
- readOnly: false,
1633
- minRows: 3, maxRows: 5,
1634
- placeholder: '请输入批示意见',
1635
- value: this.state.spyj,
1636
- onChange: this.changeSpyj1.bind(this) }),
1631
+ _react2.default.createElement(
1632
+ 'div',
1633
+ { id: 'defaultCommentInput' },
1634
+ _react2.default.createElement(_TextareaField2.default, {
1635
+ readOnly: false,
1636
+ minRows: 3, maxRows: 5,
1637
+ placeholder: '请输入批示意见',
1638
+ value: this.state.spyj,
1639
+ onChange: this.changeSpyj1.bind(this) })
1640
+ ),
1637
1641
  _react2.default.createElement(_CheckboxField2.default, {
1638
1642
  className: this.state.hasCommentField == '1' ? "" : "t-DN",
1639
1643
  data: this.state.savePhraseList,
@@ -328,6 +328,7 @@ var PageHome = function (_React$Component) {
328
328
  commentFieldList: [], //字段审批意见
329
329
  defaultValue: "",
330
330
  commentId: "",
331
+ commentField: "", //批示意见字段
331
332
  hasCommentField: '0', //是否有审批意见
332
333
  commentIsNull: '0', //审批意见是否可为空,0是,1否
333
334
  commentIsNotNull: '0', //审批意见是否可为空,0是,1否
@@ -1501,6 +1502,7 @@ var PageHome = function (_React$Component) {
1501
1502
  //元素id
1502
1503
  var anchorElement = document.getElementById(anchorname); //找到滚动到的元素
1503
1504
  if (anchorElement) {
1505
+ anchorElement.style.backgroundColor = "rgba(245, 108, 108, 0.1)";
1504
1506
  anchorElement.scrollIntoView(); // 让页面滚动到元素所在位置
1505
1507
  }
1506
1508
  }
@@ -1705,8 +1707,16 @@ var PageHome = function (_React$Component) {
1705
1707
  return false;
1706
1708
  }
1707
1709
  } else if (hasCommentField == '1' && defaultComValue == '') {
1710
+
1708
1711
  if (commentIsNull == '1' || commentIsNotNull == '1') {
1709
1712
  //不可为空
1713
+ var documentId = t.state.newspyj.documentId;
1714
+ if (t.state.commentField == 'default') {
1715
+ documentId = "defaultCommentInput";
1716
+ }
1717
+ if (documentId) {
1718
+ this.scrollToAnchor(documentId);
1719
+ }
1710
1720
  _Toast2.default.show({
1711
1721
  type: 'error',
1712
1722
  content: '意见不能为空!'
@@ -2583,16 +2593,16 @@ var PageHome = function (_React$Component) {
2583
2593
  t.setState({
2584
2594
  pageStatus: '1',
2585
2595
  operate: 12,
2586
- urgeContent: ''
2596
+ urgeContent: '请您尽快审批!'
2587
2597
  });
2588
2598
  t.state.selectUrgeActivity = [];
2589
2599
  for (var n = 0; n < t.state.urgeDataList.length; n++) {
2590
2600
  t.state.urgeDataList[n].checked = false;
2591
2601
  }
2592
- t.state.reminders = [];
2593
- for (var n = 0; n < t.state.remindersList.length; n++) {
2594
- t.state.remindersList[n].checked = false;
2595
- }
2602
+ // t.state.reminders=[];
2603
+ // for(var n=0;n<t.state.remindersList.length;n++){
2604
+ // t.state.remindersList[n].checked=false;
2605
+ // }
2596
2606
 
2597
2607
  $(window).scrollTop(0);
2598
2608
  } else if (operate == 13) {
@@ -8776,7 +8776,7 @@ var Page = function (_React$Component) {
8776
8776
  nameHtml = _react2.default.createElement(
8777
8777
  'div',
8778
8778
  { className: 't-FC9 t-DIB' },
8779
- item.name
8779
+ item.politicalOutlookName
8780
8780
  );
8781
8781
  } else {
8782
8782
  nameHtml = _react2.default.createElement(
@@ -8784,7 +8784,7 @@ var Page = function (_React$Component) {
8784
8784
  { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
8785
8785
  t.handleNavClick(item.id, "politicalOutlook", "");
8786
8786
  } },
8787
- item.name
8787
+ item.politicalOutlookName
8788
8788
  );
8789
8789
  }
8790
8790
  return _react2.default.createElement(
@@ -8938,7 +8938,7 @@ var Page = function (_React$Component) {
8938
8938
  ),
8939
8939
  _react2.default.createElement(
8940
8940
  HBox,
8941
- { vAlign: 'center', className: 't-FBH t-FBAC t-PL10 t-BCf dd-top-border', style: { position: "fixed", bottom: '' + t.state.bottomHeight, left: "0px", right: "0px" } },
8941
+ { vAlign: 'center', className: 't-FBH t-FBAC t-PL10 t-BCf dd-top-border', style: { position: "fixed", paddingBottom: '' + t.state.bottomHeight, left: "0px", right: "0px", bottom: "0px" } },
8942
8942
  _react2.default.createElement(
8943
8943
  Box,
8944
8944
  { flex: 1, className: 't-FS16 t-FCddblue', onClick: function onClick() {
@@ -1,29 +1,29 @@
1
- .t-crumb-scroll{
2
- width:100% !important;
3
-
4
- }
5
- .t-crumb{
6
- height: 34px;
7
- padding:5px 16px;
8
- }
9
- .t-disable-mask{
10
- position: absolute;
11
- left: 0;
12
- right: 0;
13
- top: 0;
14
- bottom: 0;
15
- background-color: rgba(255,255,255,.4);
16
- }
17
- .t-checkbox-field-icon-list.disabled {
18
- background-color: rgba(31,56,88,.1);
19
- }
20
- .dd-app-avatar{
21
- height: 101px !important;
22
- }
23
- .t-checkbox-field-icon-list {
24
- background: #38adff;
25
- }
26
- .select-member-div-top{
27
- left: 0;
28
- background: #f7f7f7;
1
+ .t-crumb-scroll{
2
+ width:100% !important;
3
+
4
+ }
5
+ .t-crumb{
6
+ height: 34px;
7
+ padding:5px 16px;
8
+ }
9
+ .t-disable-mask{
10
+ position: absolute;
11
+ left: 0;
12
+ right: 0;
13
+ top: 0;
14
+ bottom: 0;
15
+ background-color: rgba(255,255,255,.4);
16
+ }
17
+ .t-checkbox-field-icon-list.disabled {
18
+ background-color: rgba(31,56,88,.1);
19
+ }
20
+ .dd-app-avatar{
21
+ height: 101px !important;
22
+ }
23
+ .t-checkbox-field-icon-list {
24
+ background: #38adff;
25
+ }
26
+ .select-member-div-top{
27
+ left: 0;
28
+ background: #f7f7f7;
29
29
  }
@@ -493,7 +493,9 @@ var PageHome = function (_React$Component) {
493
493
  res.json().then(function (obj) {
494
494
  var objList = obj.data;
495
495
  initList = initList.concat(objList);
496
- t.props.onChange(initList);
496
+ if (t.props.onChange) {
497
+ t.props.onChange(initList);
498
+ }
497
499
  t.setState({
498
500
  initList: initList
499
501
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "1.0.46",
3
+ "version": "1.0.48",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",