fmui-base 2.3.1 → 2.3.3

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.3：移动端表单下拉单选和按钮按钮组件样式更换
+- 2.3.2：流程设置支持配置流程转交是否填写批示意见
 - 2.3.1：传阅节点设置的参与人默认全部选中
 - 2.2.99：移动端保存批示意见态度
 - 2.2.98：批示意见态度增加回调方法

package/lib/form/form.js

@@ -15,9 +15,9 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _SelectField = require('saltui/lib/SelectField');
+var _RadioField = require('saltui/lib/RadioField');
 
-var _SelectField2 = _interopRequireDefault(_SelectField);
+var _RadioField2 = _interopRequireDefault(_RadioField);
 
 var _CheckboxField = require('saltui/lib/CheckboxField');
 
@@ -2716,6 +2716,44 @@ var PageHome = function (_React$Component) {
 
     //下拉
 
+  }, {
+    key: 'buildRadioFieldData',
+    value: function buildRadioFieldData(selectOptions, currentValue) {
+      var selectedValue = null;
+      if (currentValue != null && currentValue !== '') {
+        selectedValue = (typeof currentValue === 'undefined' ? 'undefined' : _typeof(currentValue)) === 'object' ? currentValue.value : currentValue;
+      }
+      return (selectOptions || []).map(function (opt) {
+        return {
+          value: opt.value,
+          label: opt.text,
+          content: opt.text,
+          checked: selectedValue != null && String(selectedValue) === String(opt.value),
+          disable: !!opt.disable
+        };
+      });
+    }
+  }, {
+    key: 'formatRadioFieldDisplay',
+    value: function formatRadioFieldDisplay(item) {
+      if (!item) {
+        return '';
+      }
+      if (item.label != null && item.label !== '') {
+        return item.label;
+      }
+      return typeof item.content === 'string' ? item.content : '';
+    }
+  }, {
+    key: 'radioSelectChange',
+    value: function radioSelectChange(code, value, index, data) {
+      var item = data[index];
+      if (!item) {
+        return;
+      }
+      var text = item.label || (typeof item.content === 'string' ? item.content : '');
+      this.selectChange(code, { value: item.value, text: text });
+    }
   }, {
     key: 'selectChange',
     value: function selectChange(code, value) {
@@ -3980,16 +4018,23 @@ var PageHome = function (_React$Component) {
               { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
               _react2.default.createElement(
                 'div',
-                { className: 't-W100' },
-                _react2.default.createElement(_SelectField2.default, {
+                { className: 't-W100 form-radio-field-host' },
+                _react2.default.createElement(_RadioField2.default, {
+                  className: 'form-radio-field-wrap',
+                  layout: subFormFieldLayout,
                   required: t.state.itemParam.required,
                   label: t.state.itemParam.title,
                   readOnly: t.state.itemParam.readOnly,
-                  options: t.state.itemParam.selectOptions,
                   placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
-                  onSelect: t.selectChange.bind(t, t.state.itemParam.key),
-                  value: t.state.itemParam.value,
-                  multiLine: true
+                  mode: 'popup',
+                  multiLine: true,
+                  formatter: t.formatRadioFieldDisplay,
+                  data: t.buildRadioFieldData(t.state.itemParam.selectOptions, t.state.itemParam.value),
+                  onChange: t.radioSelectChange.bind(t, t.state.itemParam.key),
+                  groupListArgument: {
+                    lineIndent: 15,
+                    itemIndent: 15
+                  }
                 })
               ),
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
@@ -4057,18 +4102,27 @@ var PageHome = function (_React$Component) {
             _react2.default.createElement(
               'div',
               { className: isSubFormMultiCol ? '' : 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
-              _react2.default.createElement(_SelectField2.default, {
-                className: 't-W100',
-                layout: subFormFieldLayout,
-                required: t.state.itemParam.required,
-                label: t.state.itemParam.title,
-                readOnly: t.state.itemParam.readOnly,
-                options: t.state.itemParam.selectOptions,
-                placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
-                onSelect: t.selectChange.bind(t, t.state.itemParam.key),
-                value: t.state.itemParam.value,
-                multiLine: true
-              }),
+              _react2.default.createElement(
+                'div',
+                { className: isSubFormMultiCol ? 'form-radio-field-host' : 't-W100 form-radio-field-host' },
+                _react2.default.createElement(_RadioField2.default, {
+                  className: 'form-radio-field-wrap',
+                  layout: subFormFieldLayout,
+                  required: t.state.itemParam.required,
+                  label: t.state.itemParam.title,
+                  readOnly: t.state.itemParam.readOnly,
+                  placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
+                  mode: 'popup',
+                  multiLine: true,
+                  formatter: t.formatRadioFieldDisplay,
+                  data: t.buildRadioFieldData(t.state.itemParam.selectOptions, t.state.itemParam.value),
+                  onChange: t.radioSelectChange.bind(t, t.state.itemParam.key),
+                  groupListArgument: {
+                    lineIndent: 15,
+                    itemIndent: 15
+                  }
+                })
+              ),
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
             )
           )

package/lib/form/form.less

@@ -1,3 +1,116 @@
 .t-select-field-content>.t-select-field-value>.t-omit {
-     -webkit-line-clamp: initial !important;
-    }
+  -webkit-line-clamp: initial !important;
+}
+
+// 下拉/单选 RadioField popup：选中值先占满一行再换行；弹层超出最大高度可滚动
+.form-radio-field-host {
+  width: 100%;
+  min-width: 0;
+  flex: 1;
+}
+
+.t-FBH > .form-radio-field-host {
+  flex: 1 1 0%;
+  min-width: 0;
+}
+
+.t-field.t-radio-field.form-radio-field-wrap {
+  width: 95%;
+  max-width: 95%;
+  cursor: pointer;
+
+  // 点击事件在 Field 根节点，子层放行 pointer-events 以保证整行可点
+  &:not(.t-field-disabled) {
+    .t-field-pos-box,
+    .t-field-box,
+    .t-field-content-box,
+    .t-field-multi,
+    .t-radio-field-value,
+    .t-radio-field-value span {
+      pointer-events: none;
+    }
+
+    .t-field-pos-icon {
+      pointer-events: auto;
+    }
+  }
+
+  &.t-FBH .t-field-pos-box {
+    flex: 1 1 auto;
+    min-width: 0;
+    width: auto;
+  }
+
+  .t-field-box,
+  .t-field-multi {
+    width: 100%;
+    min-width: 0;
+  }
+
+  .t-field-multi > div {
+    width: 100%;
+    min-width: 0;
+  }
+
+  .t-radio-field-value {
+    width: 95%;
+    min-width: 0;
+    align-items: flex-start;
+    flex-wrap: wrap;
+  }
+
+  // 解除 SaltUI t-omit 的 -webkit-box 竖排，避免选中后逐字换行
+  .t-radio-field-value > .t-omit,
+  .t-radio-field-value > .t-FB1,
+  .t-radio-field-value > .t-FB1.t-omit {
+    display: block !important;
+    width: 100% !important;
+    max-width: 100% !important;
+    min-width: 0 !important;
+    white-space: normal !important;
+    word-break: normal !important;
+    overflow-wrap: break-word !important;
+    word-wrap: break-word !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+    -webkit-line-clamp: unset !important;
+    line-clamp: unset !important;
+    -webkit-box-orient: horizontal !important;
+    box-orient: horizontal !important;
+    line-height: 1.5;
+  }
+}
+
+.form-radio-field-wrap {
+  &.t-radio-field.is-group {
+    max-height: 60vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  .t-radio-field-content {
+    flex: 1;
+    min-width: 0;
+    max-width: 100%;
+    white-space: normal !important;
+    word-break: normal !important;
+    overflow-wrap: break-word !important;
+    word-wrap: break-word !important;
+    line-height: 1.5;
+  }
+
+  .t-radio-field-row {
+    align-items: flex-start;
+    min-height: auto;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    width: 100%;
+  }
+
+  .t-radio-field-icon-wrapper {
+    align-items: flex-start;
+    flex-shrink: 0;
+    padding-top: 2px;
+  }
+}

package/lib/form/subForm.js

@@ -584,7 +584,7 @@ var PageHome = function (_React$Component) {
       var text = scope + ' .subform-col-field-slot-text';
       var pick = scope + ' .subform-col-field-slot-pick';
       var pickCol = pick + ' ' + col;
-      return _react2.default.createElement('style', { dangerouslySetInnerHTML: { __html: [scope + '{display:block;}', row + '{display:flex;align-items:stretch;width:100%;border-bottom:0.5px solid #e9ebee;box-sizing:border-box;}', scope + ' .subform-field-full{width:100%;box-sizing:border-box;border-bottom:0.5px solid #e9ebee;}', scope + ' .subform-field-col{display:flex;flex-direction:column;box-sizing:border-box;}', scope + ' .subform-field-col-empty{visibility:hidden;}', slot + '{box-sizing:border-box;padding:8px 16px 8px 0;overflow:hidden;}', col + '{width:100%;}', col + ' .t-group-list{border-bottom:none!important;background:transparent;}', col + ' .t-group-list-item::after{display:none!important;}', col + '>.t-group-list>.t-group-list-item::after{display:none!important;}', col + ' .t-field-box.t-field-content-box{display:flex!important;flex-direction:column!important;align-items:stretch!important;width:100%!important;min-height:0!important;padding-left:0!important;padding-right:0!important;}', col + ' .t-field-layout-h-label,' + col + ' .t-field-layout-v-label,' + col + ' .t-field-layout-v-label-left{width:100%!important;max-width:100%!important;margin-left:0!important;padding-left:0!important;padding-right:0!important;color:rgb(51,51,51)!important;background:transparent!important;}', col + ' .t-field-box{padding-left:0!important;padding-right:0!important;}', col + ' .t-field-content-box{justify-content:flex-start!important;align-items:flex-start!important;}', col + ' .t-field-content-box .t-FB1,' + col + ' .t-field-multi{width:100%!important;max-width:100%!important;padding:0 0 4px 0!important;text-align:left!important;}', col + ' .t-field-content-box .t-FB1 span,' + col + ' .t-field-multi span,' + col + ' .t-text-field-content-main span{text-align:left!important;word-break:break-word;}', col + ' .t-text-field-content{width:100%;justify-content:flex-start!important;}', col + ' .t-text-field-input{text-align:left!important;}', text + ' .t-text-field-input,' + text + ' .t-text-field-content-main span{white-space:normal!important;word-wrap:break-word;word-break:break-word;line-height:20px;}', text + ' .t-text-field-placeholder.t-DN{display:none!important;}', pickCol + '.t-field.t-select-field.t-FBH,' + pickCol + '.t-field.t-datetime-field.t-FBH{display:block!important;position:relative!important;width:100%!important;}', pickCol + '.t-field-pos-box{width:100%!important;padding-right:28px!important;box-sizing:border-box;}', pickCol + '.t-field-layout-v-label{margin-left:0!important;padding-left:0!important;}', pickCol + '.t-field-content-box{display:flex!important;flex-direction:row!important;align-items:center!important;justify-content:flex-start!important;width:100%!important;min-height:24px!important;padding:2px 0 11px 0!important;}', pickCol + '.t-field-pos-icon{position:absolute!important;right:0!important;top:auto!important;bottom:10px!important;margin:0!important;height:26px!important;display:flex!important;align-items:center!important;justify-content:center!important;}', pickCol + '.t-select-field-content,' + pickCol + '.t-datetime-field-value,' + pickCol + '.t-datetime-field-placeholder,' + pickCol + '.t-select-field-placeholder{min-height:24px!important;line-height:24px!important;}', pickCol + '.t-field-content-box>.t-FB1{flex:1!important;width:100%!important;min-width:0!important;max-width:100%!important;padding:0!important;text-align:left!important;}', pickCol + '.t-select-field-content,' + pickCol + '.t-field-content-box>.t-FB1>div{width:100%!important;text-align:left!important;}', pickCol + '.t-select-field-placeholder,' + pickCol + '.t-datetime-field-placeholder,' + pickCol + '.t-select-field-value,' + pickCol + '.t-datetime-field-value{text-align:left!important;justify-content:flex-start!important;width:100%!important;}', pickCol + '.t-select-field-placeholder,' + pickCol + '.t-datetime-field-placeholder{position:static!important;height:auto!important;line-height:24px!important;flex:none!important;max-width:100%!important;}', pickCol + '.t-select-field-value,' + pickCol + '.t-datetime-field-value{display:flex!important;flex-direction:row!important;align-items:center!important;flex-wrap:nowrap!important;}', pickCol + '.t-select-field-value .t-FB1,' + pickCol + '.t-datetime-field-value .t-FB1,' + pickCol + '.t-select-field-value span,' + pickCol + '.t-datetime-field-value span{text-align:left!important;width:100%!important;}'].join('') } });
+      return _react2.default.createElement('style', { dangerouslySetInnerHTML: { __html: [scope + '{display:block;}', row + '{display:flex;align-items:stretch;width:100%;border-bottom:0.5px solid #e9ebee;box-sizing:border-box;}', scope + ' .subform-field-full{width:100%;box-sizing:border-box;border-bottom:0.5px solid #e9ebee;}', scope + ' .subform-field-col{display:flex;flex-direction:column;box-sizing:border-box;}', scope + ' .subform-field-col-empty{visibility:hidden;}', slot + '{box-sizing:border-box;padding:8px 16px 8px 0;overflow:hidden;}', col + '{width:100%;}', col + ' .t-group-list{border-bottom:none!important;background:transparent;}', col + ' .t-group-list-item::after{display:none!important;}', col + '>.t-group-list>.t-group-list-item::after{display:none!important;}', col + ' .t-field-box.t-field-content-box{display:flex!important;flex-direction:column!important;align-items:stretch!important;width:100%!important;min-height:0!important;padding-left:0!important;padding-right:0!important;}', col + ' .t-field-layout-h-label,' + col + ' .t-field-layout-v-label,' + col + ' .t-field-layout-v-label-left{width:100%!important;max-width:100%!important;margin-left:0!important;padding-left:0!important;padding-right:0!important;color:rgb(51,51,51)!important;background:transparent!important;}', col + ' .t-field-box{padding-left:0!important;padding-right:0!important;}', col + ' .t-field-content-box{justify-content:flex-start!important;align-items:flex-start!important;}', col + ' .t-field-content-box .t-FB1,' + col + ' .t-field-multi{width:100%!important;max-width:100%!important;padding:0 0 4px 0!important;text-align:left!important;}', col + ' .t-field-content-box .t-FB1 span,' + col + ' .t-field-multi span,' + col + ' .t-text-field-content-main span{text-align:left!important;word-break:break-word;}', col + ' .t-text-field-content{width:100%;justify-content:flex-start!important;}', col + ' .t-text-field-input{text-align:left!important;}', text + ' .t-text-field-input,' + text + ' .t-text-field-content-main span{white-space:normal!important;word-wrap:break-word;word-break:break-word;line-height:20px;}', text + ' .t-text-field-placeholder.t-DN{display:none!important;}', pickCol + '.t-field.t-select-field.t-FBH,' + pickCol + '.t-field.t-radio-field.t-FBH,' + pickCol + '.t-field.t-datetime-field.t-FBH{display:block!important;position:relative!important;width:100%!important;}', pickCol + '.t-field-pos-box{width:100%!important;padding-right:28px!important;box-sizing:border-box;}', pickCol + '.t-field-layout-v-label{margin-left:0!important;padding-left:0!important;}', pickCol + '.t-field-content-box{display:flex!important;flex-direction:row!important;align-items:center!important;justify-content:flex-start!important;width:100%!important;min-height:24px!important;padding:2px 0 11px 0!important;}', pickCol + '.t-field-pos-icon{position:absolute!important;right:0!important;top:auto!important;bottom:10px!important;margin:0!important;height:26px!important;display:flex!important;align-items:center!important;justify-content:center!important;}', pickCol + '.t-select-field-content,' + pickCol + '.t-radio-field-value,' + pickCol + '.t-datetime-field-value,' + pickCol + '.t-datetime-field-placeholder,' + pickCol + '.t-select-field-placeholder{min-height:24px!important;line-height:24px!important;}', pickCol + '.t-field-content-box>.t-FB1{flex:1!important;width:100%!important;min-width:0!important;max-width:100%!important;padding:0!important;text-align:left!important;}', pickCol + '.t-select-field-content,' + pickCol + '.t-field-content-box>.t-FB1>div{width:100%!important;text-align:left!important;}', pickCol + '.t-select-field-placeholder,' + pickCol + '.t-datetime-field-placeholder,' + pickCol + '.t-select-field-value,' + pickCol + '.t-radio-field-value,' + pickCol + '.t-datetime-field-value{text-align:left!important;justify-content:flex-start!important;width:100%!important;}', pickCol + '.t-select-field-placeholder,' + pickCol + '.t-datetime-field-placeholder{position:static!important;height:auto!important;line-height:24px!important;flex:none!important;max-width:100%!important;}', pickCol + '.t-select-field-value,' + pickCol + '.t-radio-field-value,' + pickCol + '.t-datetime-field-value{display:flex!important;flex-direction:row!important;align-items:flex-start!important;flex-wrap:wrap!important;}', pickCol + '.t-select-field-value .t-FB1,' + pickCol + '.t-radio-field-value .t-FB1,' + pickCol + '.t-datetime-field-value .t-FB1,' + pickCol + '.t-select-field-value span,' + pickCol + '.t-radio-field-value span,' + pickCol + '.t-datetime-field-value span{display:block!important;width:100%!important;max-width:100%!important;white-space:normal!important;word-break:normal!important;overflow-wrap:break-word!important;-webkit-line-clamp:unset!important;line-clamp:unset!important;-webkit-box-orient:horizontal!important;text-align:left!important;}'].join('') } });
     }
 
     // 将字段列表按列数拆成行（整行字段单独成行）

package/lib/process_info/processInfo.js

@@ -129,6 +129,14 @@ var ButtonGroup = _Button2.default.ButtonGroup,
     TextButton = _Button2.default.TextButton;
 //import UserInfo from '../approval-details/UserInfo';
 
+/** 转交批示意见系统设置是否必填；无 getSysSettingByMark 方法时视为不必填 */
+function isSysTransferCommentRequired() {
+    if (typeof getSysSettingByMark !== 'function') {
+        return false;
+    }
+    return getSysSettingByMark('approveTransferComment') == '1';
+}
+
 var isCaReload = false;
 window.addEventListener('pageshow', function () {
     console.log("isCaReload===" + isCaReload);
@@ -2175,7 +2183,11 @@ var PageHome = function (_React$Component) {
                     }
                 } else if (hasCommentField == '1' && defaultComValue == '') {
 
-                    if (commentIsNull == '1' || commentIsNotNull == '1') {
+                    var commentRequired = commentIsNull == '1' || commentIsNotNull == '1';
+                    if (operate == 3) {
+                        commentRequired = commentRequired && isSysTransferCommentRequired();
+                    }
+                    if (commentRequired) {
                         //不可为空
                         var documentId = t.state.newspyj.documentId;
                         if (t.state.commentField == 'default') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",