fmui-base 2.3.7 → 2.3.9

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.9：子表支持整个子表隐藏
+- 2.3.8：子表多列排版错乱处理
 - 2.3.7：选人组件：搜索项改为即时搜索，输入过程中1秒后未输入触发搜索
 - 2.3.6：待办表单支持切换组织
 - 2.3.5：联动字段保存后被清空

package/lib/form/form.js

@@ -1610,6 +1610,10 @@ var PageHome = function (_React$Component) {
           }
           if (t.props.dataType === 'sub') {
             t.applySubFormLabelStyle(itemParam);
+            // 子表多列：loadComponet 完成后同步排版（预判与 ref 不一致时需重排）
+            if (t.props.onSubFieldLayoutChange) {
+              t.props.onSubFieldLayoutChange();
+            }
           }
           this.props.onChange(data, itemParam);
         });
@@ -2047,6 +2051,7 @@ var PageHome = function (_React$Component) {
         var itemParam = this.state.itemParam;
         var selectText = ''; //多选值修改的显示文本
         var checkboxValueHas = false; //是否有多选值修改
+        var layoutNeedRefresh = false;
         for (var i = 0; i < itemNew.length; i++) {
           var key = itemNew[i].key;
           if (key == 'value') {
@@ -2099,6 +2104,9 @@ var PageHome = function (_React$Component) {
             if (key == 'isHidden' && itemNew[i].value) {
               itemParam.required = false;
             }
+            if (key === 'isHidden') {
+              layoutNeedRefresh = true;
+            }
           }
         }
         this.setState({
@@ -2130,6 +2138,9 @@ var PageHome = function (_React$Component) {
             var formData = this.props.data;
             this.dealwithData(itemParam, formData.mainTblData || [], formData.relatedTbl || []);
           }
+          if (layoutNeedRefresh && this.props.dataType === 'sub' && this.props.onSubFieldLayoutChange) {
+            this.props.onSubFieldLayoutChange();
+          }
           if (!silent && this.props.onChange) {
             this.props.onChange(this.props.data, itemParam);
           }

package/lib/form/formExtHelper.js

@@ -9,6 +9,10 @@ exports.clampSubColumnCount = clampSubColumnCount;
 exports.buildDetailItemParam = buildDetailItemParam;
 exports.applyDealwithFormParamExt = applyDealwithFormParamExt;
 exports.resolveSubColumnCountFromConfig = resolveSubColumnCountFromConfig;
+exports.normalizeRelaTriggerValue = normalizeRelaTriggerValue;
+exports.isRelaRuleMatched = isRelaRuleMatched;
+exports.getRelaTriggerFieldValueForLayout = getRelaTriggerFieldValueForLayout;
+exports.resolveFieldRelaHidden = resolveFieldRelaHidden;
 exports.mapCommentAttitudeSaveValue = mapCommentAttitudeSaveValue;
 /**
  * 表单扩展加载：流程 flow_common / 纯表单 form_common
@@ -228,6 +232,163 @@ function resolveSubColumnCountFromConfig(options) {
   return 1;
 }
 
+/** 关联触发值规范化（与 form.jsx / table.jsx normalizeRelaTriggerValue 一致） */
+function normalizeRelaTriggerValue(nowValue) {
+  if (nowValue == null || typeof nowValue === 'undefined') {
+    return '';
+  }
+  nowValue = String(nowValue);
+  if (nowValue.indexOf('[') >= 0 && nowValue.indexOf(']') >= 0) {
+    try {
+      var nowValueArray = JSON.parse(nowValue);
+      if (nowValueArray.length === 1) {
+        return nowValueArray[0];
+      }
+      return nowValueArray.join(',');
+    } catch (e) {
+      return nowValue;
+    }
+  }
+  if (nowValue !== '' && (nowValue.indexOf('$#$#') >= 0 || nowValue.indexOf('#$#$') >= 0)) {
+    if (nowValue.indexOf('#$#$') >= 0) {
+      var nowValueList = nowValue.split('#$#$');
+      if (nowValueList.length === 1) {
+        return nowValueList[0].replace(/\$#\$#/g, '');
+      }
+      return nowValueList.map(function (item) {
+        return item.replace(/\$#\$#/g, '');
+      }).join(',');
+    }
+    return nowValue.replace(/\$#\$#/g, '');
+  }
+  return nowValue;
+}
+
+/** 关联规则是否命中（与 form.jsx isRelaRuleMatched 一致） */
+function isRelaRuleMatched(rule, nowValue) {
+  var triggerFieldVal = rule.triggerFieldVal;
+  if (triggerFieldVal == ' ') {
+    triggerFieldVal = '';
+  }
+  if (triggerFieldVal === '') {
+    return true;
+  }
+  nowValue = nowValue == null ? '' : String(nowValue);
+  return triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) !== -1;
+}
+
+/** 读取关联触发字段当前值（布局预判，与 form.jsx 子表场景一致） */
+function getRelaTriggerFieldValueForLayout(rule, fullFormData, rowIndex) {
+  var nowValue = '';
+  if (!rule || !fullFormData) {
+    return '';
+  }
+  var mainTblName = fullFormData.mainTblName;
+  var mainTblData = fullFormData.mainTblData || [];
+  if (rule.triggerTblName === mainTblName) {
+    for (var i = 0; i < mainTblData.length; i++) {
+      if (mainTblData[i].key === rule.triggerFieldName) {
+        nowValue = mainTblData[i].value ? mainTblData[i].value : '';
+        break;
+      }
+    }
+  } else if (fullFormData.subTbl && fullFormData.subTbl.length > 0) {
+    var ridx = typeof rowIndex !== 'undefined' ? rowIndex : 0;
+    for (var j = 0; j < fullFormData.subTbl.length; j++) {
+      var subItem = fullFormData.subTbl[j];
+      if (subItem.subTblName === rule.triggerTblName && subItem.subTblData && subItem.subTblData.length > ridx) {
+        var subRow = subItem.subTblData[ridx];
+        for (var k = 0; k < subRow.length; k++) {
+          if (subRow[k].key === rule.triggerFieldName) {
+            nowValue = subRow[k].value ? subRow[k].value : '';
+          }
+        }
+      }
+    }
+  }
+  return normalizeRelaTriggerValue(nowValue);
+}
+
+/**
+ * 预判字段是否被关联规则隐藏（与 form.jsx dealwithRelaField 的 isHidden 逻辑一致）
+ * 用于子表多列首帧排版，避免等待 Form ref 就绪才隐藏。
+ */
+function resolveFieldRelaHidden(options) {
+  options = options || {};
+  var uniqueName = options.uniqueName;
+  var formRelaFieldMaps = options.formRelaFieldMaps;
+  var fieldControll = options.fieldControll || {};
+  var formReadOnly = !!options.formReadOnly;
+
+  if (!uniqueName || !formRelaFieldMaps || !formRelaFieldMaps[uniqueName]) {
+    return false;
+  }
+
+  var defaulthideFields = [];
+  var defaultshowFields = [];
+  var defaultmustFields = [];
+  if (fieldControll.hiddenFields) {
+    fieldControll.hiddenFields.split(',').forEach(function (f) {
+      if (f) {
+        defaulthideFields.push(f);
+      }
+    });
+  }
+  if (fieldControll.showFields) {
+    fieldControll.showFields.split(',').forEach(function (f) {
+      if (f) {
+        defaultshowFields.push(f);
+      }
+    });
+  }
+  if (fieldControll.mustFields) {
+    fieldControll.mustFields.split(',').forEach(function (f) {
+      if (f) {
+        defaultmustFields.push(f);
+      }
+    });
+  }
+
+  var baseline = {
+    isHidden: defaulthideFields.indexOf(uniqueName) !== -1 || !!options.baselineHidden,
+    required: defaultmustFields.indexOf(uniqueName) !== -1 || options.fieldValid === true,
+    readOnly: defaultshowFields.indexOf(uniqueName) !== -1 || formReadOnly
+  };
+
+  var skipEditMust = defaultshowFields.indexOf(uniqueName) !== -1 || defaultmustFields.indexOf(uniqueName) !== -1 || baseline.readOnly === true || formReadOnly;
+
+  var isHidden = baseline.isHidden;
+  var hideFlag = baseline.isHidden;
+  var mustFlag = baseline.required;
+
+  var rules = formRelaFieldMaps[uniqueName];
+  var sortedRules = rules.slice().sort(function (a, b) {
+    return (parseInt(a.sortNo, 10) || 0) - (parseInt(b.sortNo, 10) || 0);
+  });
+
+  for (var ri = sortedRules.length - 1; ri >= 0; ri--) {
+    var rule = sortedRules[ri];
+    var nowValue = getRelaTriggerFieldValueForLayout(rule, options.fullFormData, options.rowIndex);
+    var matched = isRelaRuleMatched(rule, nowValue);
+    var editType = rule.editType;
+    if (editType === 'hide' || editType === 'rowhide') {
+      if (matched) {
+        isHidden = true;
+        hideFlag = true;
+      } else if (!hideFlag) {
+        isHidden = baseline.isHidden;
+      }
+    } else if (editType === 'must') {
+      if (!skipEditMust && matched && !hideFlag) {
+        mustFlag = true;
+        isHidden = false;
+      }
+    }
+  }
+
+  return !!isHidden;
+}
+
 /** 批示意见态度显示值转存库值（与 PC comment_idea_radio 一致） */
 function mapCommentAttitudeSaveValue(displayValue) {
   var val = displayValue == null ? '' : String(displayValue);

package/lib/form/subForm.js

@@ -584,7 +584,112 @@ 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-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('') } });
+      return _react2.default.createElement('style', { dangerouslySetInnerHTML: { __html: [scope + '{display:block;}', scope + ' .subform-fields-flow{display:flex;flex-wrap:wrap;align-items:stretch;width:100%;box-sizing:border-box;}', 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;border-bottom:0.5px solid #e9ebee;}', scope + ' .subform-field-slot-hidden{display:none!important;width:0!important;height:0!important;overflow:hidden!important;margin:0!important;padding:0!important;border:none!important;}', 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('') } });
+    }
+
+    // 子表字段是否隐藏（设计隐藏 / 流程权限 / 关联规则 / 扩展方法）
+
+  }, {
+    key: 'isSubFormFieldHidden',
+    value: function isSubFormFieldHidden(field, rowIndex) {
+      if (field && field.isHidden) {
+        return true;
+      }
+      var fieldControll = this.state.fieldControll || this.props.fieldControll;
+      if (fieldControll && fieldControll.hiddenFields && field) {
+        var hiddenCsv = ',' + fieldControll.hiddenFields + ',';
+        if (field.uniqueName && hiddenCsv.indexOf(',' + field.uniqueName + ',') >= 0) {
+          return true;
+        }
+        var subTblName = this.state.itemParam && this.state.itemParam.key;
+        if (subTblName && field.itemCode && hiddenCsv.indexOf(',' + subTblName + '_' + field.itemCode + ',') >= 0) {
+          return true;
+        }
+      }
+      if (field && field.uniqueName != null && rowIndex != null) {
+        var fieldRef = this.refs[field.uniqueName + '_' + rowIndex];
+        if (fieldRef && fieldRef.state && fieldRef.state.loaded && fieldRef.state.itemParam) {
+          return !!fieldRef.state.itemParam.isHidden;
+        }
+      }
+      return this.predictSubFormFieldRelaHidden(field, rowIndex);
+    }
+
+    // ref 未就绪时按关联规则预判隐藏（与 Form.dealwithRelaField 一致）
+
+  }, {
+    key: 'predictSubFormFieldRelaHidden',
+    value: function predictSubFormFieldRelaHidden(field, rowIndex) {
+      if (!field || !field.uniqueName) {
+        return false;
+      }
+      return (0, _formExtHelper.resolveFieldRelaHidden)({
+        uniqueName: field.uniqueName,
+        formRelaFieldMaps: this.props.formRelaFieldMaps,
+        fieldControll: this.state.fieldControll || this.props.fieldControll,
+        fullFormData: this.props.data,
+        rowIndex: rowIndex,
+        baselineHidden: false,
+        formReadOnly: field.readOnly === true,
+        fieldValid: field.valid == 'true'
+      });
+    }
+
+    // 过滤当前行可见字段（多列排版仅参与可见字段）
+
+  }, {
+    key: 'getVisibleSubFormFields',
+    value: function getVisibleSubFormFields(formFields, rowIndex) {
+      var t = this;
+      return (formFields || []).filter(function (field) {
+        return !t.isSubFormFieldHidden(field, rowIndex);
+      });
+    }
+
+    // 子表字段显隐变化后刷新多列排版
+
+  }, {
+    key: 'notifySubFormLayoutChange',
+    value: function notifySubFormLayoutChange() {
+      if (this.resolveSubColumnCount(this.props) <= 1) {
+        return;
+      }
+      if (this._layoutRefreshTimer) {
+        clearTimeout(this._layoutRefreshTimer);
+      }
+      var t = this;
+      this._layoutRefreshTimer = setTimeout(function () {
+        t._layoutRefreshTimer = null;
+        t.forceUpdate();
+      }, 0);
+    }
+
+    // 基于可见字段计算多列排版元数据（保持 formFields 原始顺序挂载，避免 remount）
+
+  }, {
+    key: 'buildSubFormFieldLayoutMeta',
+    value: function buildSubFormFieldLayoutMeta(formFields, rowIndex, subColumnCount) {
+      var t = this;
+      var meta = {};
+      var visibleFields = t.getVisibleSubFormFields(formFields, rowIndex);
+      var rows = t.buildSubFormFieldRows(visibleFields, subColumnCount);
+      var order = 0;
+      rows.forEach(function (row) {
+        if (row.type === 'full') {
+          meta[row.field.uniqueName] = { type: 'full', order: order++, rowFieldCount: 1 };
+        } else {
+          var rowFieldCount = row.fields.length;
+          row.fields.forEach(function (field) {
+            meta[field.uniqueName] = { type: 'col', order: order++, rowFieldCount: rowFieldCount };
+          });
+        }
+      });
+      (formFields || []).forEach(function (field) {
+        if (!meta[field.uniqueName]) {
+          meta[field.uniqueName] = { type: 'hidden' };
+        }
+      });
+      return meta;
     }
 
     // 将字段列表按列数拆成行（整行字段单独成行）
@@ -642,7 +747,8 @@ var PageHome = function (_React$Component) {
         formRelaFieldMaps: t.props.formRelaFieldMaps,
         linkFields: t.props.linkFields,
         onChange: t.changeSub.bind(t, t.state.itemParam, rowIndex),
-        reloadSubItemParam: t.reloadSubItemParam.bind(t)
+        reloadSubItemParam: t.reloadSubItemParam.bind(t),
+        onSubFieldLayoutChange: t.notifySubFormLayoutChange.bind(t)
       });
       if (subColumnCount > 1) {
         return _react2.default.cloneElement(formEl, { subColumnCount: subColumnCount });
@@ -664,8 +770,7 @@ var PageHome = function (_React$Component) {
         });
       }
 
-      var colWidth = 100 / subColumnCount + '%';
-      var rows = t.buildSubFormFieldRows(formFields, subColumnCount);
+      var layoutMeta = t.buildSubFormFieldLayoutMeta(formFields, rowIndex, subColumnCount);
       return _react2.default.createElement(
         'div',
         null,
@@ -673,50 +778,42 @@ var PageHome = function (_React$Component) {
         _react2.default.createElement(
           'div',
           { className: 'subform-fields-wrap subform-fields-multi' },
-          rows.map(function (row, ri) {
-            if (row.type === 'full') {
-              var fullField = row.field;
+          _react2.default.createElement(
+            'div',
+            { className: 'subform-fields-flow' },
+            formFields.map(function (field) {
+              var fieldMeta = layoutMeta[field.uniqueName] || { type: 'hidden' };
+              var hidden = fieldMeta.type === 'hidden';
+              var fullWidth = fieldMeta.type === 'full';
+              var colWidth = hidden ? undefined : fullWidth ? '100%' : 100 / fieldMeta.rowFieldCount + '%';
+              var wrapperClass = 'subform-field-slot';
+              if (hidden) {
+                wrapperClass += ' subform-field-slot-hidden';
+              } else if (fullWidth) {
+                wrapperClass += ' subform-field-full';
+              } else {
+                wrapperClass += ' subform-field-col';
+              }
               return _react2.default.createElement(
                 'div',
-                { key: fullField.uniqueName || 'full_' + ri, className: 'subform-field-full' },
+                {
+                  key: field.uniqueName,
+                  className: wrapperClass,
+                  style: {
+                    order: hidden ? undefined : fieldMeta.order,
+                    width: colWidth,
+                    boxSizing: 'border-box'
+                  },
+                  'aria-hidden': hidden ? 'true' : undefined
+                },
                 _react2.default.createElement(
                   'div',
-                  { className: t.getSubFormFieldSlotClass(true, true, fullField.itemType) },
-                  t.renderSubFormFieldForm(fullField, rowIndex, subColumnCount)
+                  { className: t.getSubFormFieldSlotClass(true, fullWidth, field.itemType) },
+                  t.renderSubFormFieldForm(field, rowIndex, subColumnCount)
                 )
               );
-            }
-            var cells = [];
-            for (var ci = 0; ci < subColumnCount; ci++) {
-              var cellField = row.fields[ci];
-              if (cellField) {
-                cells.push(_react2.default.createElement(
-                  'div',
-                  {
-                    key: cellField.uniqueName || 'col_' + ri + '_' + ci,
-                    className: 'subform-field-col',
-                    style: { width: colWidth, boxSizing: 'border-box' }
-                  },
-                  _react2.default.createElement(
-                    'div',
-                    { className: t.getSubFormFieldSlotClass(true, false, cellField.itemType) },
-                    t.renderSubFormFieldForm(cellField, rowIndex, subColumnCount)
-                  )
-                ));
-              } else {
-                cells.push(_react2.default.createElement('div', {
-                  key: 'empty_' + ri + '_' + ci,
-                  className: 'subform-field-col subform-field-col-empty',
-                  style: { width: colWidth, boxSizing: 'border-box' }
-                }));
-              }
-            }
-            return _react2.default.createElement(
-              'div',
-              { key: 'row_' + ri, className: 'subform-fields-row' },
-              cells
-            );
-          })
+            })
+          )
         )
       );
     }
@@ -970,7 +1067,7 @@ var PageHome = function (_React$Component) {
       return subForm.map(function (item, i) {
         return _react2.default.createElement(
           'div',
-          { className: 'dd-drug-list' },
+          { className: item.rowHidden ? 'dd-drug-list t-DN' : 'dd-drug-list' },
           _react2.default.createElement(
             HBox,
             { className: 't-BCf dd-bottom-border', onClick: _this2.detailShow.bind(_this2, i, item.show) },

package/lib/nvoice/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _nvoice = require('./nvoice');
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_nvoice).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/nvoice/nvoice.js

@@ -0,0 +1,177 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = undefined;
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _Group = require('saltui/lib/Group');
+
+var _Group2 = _interopRequireDefault(_Group);
+
+var _Field = require('saltui/lib/Field');
+
+var _Field2 = _interopRequireDefault(_Field);
+
+var _upload = require('../upload/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
+var _Boxs = require('saltui/lib/Boxs');
+
+var _Boxs2 = _interopRequireDefault(_Boxs);
+
+var _db = require('../db/db');
+
+var _db2 = _interopRequireDefault(_db);
+
+require('./nvoice.less');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+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; }
+
+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; }
+
+var HBox = _Boxs2.default.HBox,
+    Box = _Boxs2.default.Box,
+    VBox = _Boxs2.default.VBox;
+
+var Nvoice = function (_React$Component) {
+    _inherits(Nvoice, _React$Component);
+
+    function Nvoice(props) {
+        _classCallCheck(this, Nvoice);
+
+        // 传入的props参数
+        var _this = _possibleConstructorReturn(this, (Nvoice.__proto__ || Object.getPrototypeOf(Nvoice)).call(this, props));
+
+        _this.initFn = function (id) {
+
+            // 初始发票详情数据  
+            _db2.default.form.getNoInvoiceList({
+                invoicedataid: id
+            }).then(function (content) {
+                _this.setState({
+                    invoicedata: content
+                });
+            }).catch(function (error) {
+                console.error('获取详情数据失败', error);
+            });
+        };
+
+        var invoicedataid = _this.props.id;
+        var title = _this.props.label || '发票详情';
+        var required = _this.props.required || false;
+
+        _this.state = {
+            invoicedataid: invoicedataid,
+            invoicedata: [],
+            title: title,
+            required: required
+        };
+
+        return _this;
+    }
+
+    _createClass(Nvoice, [{
+        key: 'componentDidMount',
+        value: function componentDidMount() {
+            this.initFn(this.state.invoicedataid);
+        }
+    }, {
+        key: 'downloadFile',
+
+
+        // 下载函数
+        value: function (_downloadFile) {
+            function downloadFile(_x) {
+                return _downloadFile.apply(this, arguments);
+            }
+
+            downloadFile.toString = function () {
+                return _downloadFile.toString();
+            };
+
+            return downloadFile;
+        }(function (file) {
+            downloadFile(file.relaObjId);
+        })
+    }, {
+        key: 'render',
+        value: function render() {
+            return _react2.default.createElement(
+                _Group2.default.List,
+                { borderTopNone: true },
+                _react2.default.createElement(
+                    _Field2.default,
+                    { required: this.state.required, label: this.state.title, layout: 'h', multiLine: true },
+                    _react2.default.createElement(
+                        'div',
+                        null,
+                        this.state.invoicedata.map(function (item, index) {
+                            var fileList = [];
+                            try {
+                                if (item.invoicefileInfo) {
+                                    fileList = JSON.parse(item.invoicefileInfo);
+                                }
+                            } catch (e) {
+                                console.error('发票附件解析失败', e);
+                            }
+
+                            return _react2.default.createElement(
+                                'div',
+                                { key: item.id, className: 't-MT2' },
+                                _react2.default.createElement(
+                                    VBox,
+                                    { className: 'nvoice-filetitle', hAlign: 'start' },
+                                    _react2.default.createElement(
+                                        Box,
+                                        null,
+                                        item.invoicename
+                                    ),
+                                    _react2.default.createElement(
+                                        HBox,
+                                        { vAlign: 'center' },
+                                        _react2.default.createElement(
+                                            Box,
+                                            { className: 'label label-primary' },
+                                            item.invoicetype
+                                        ),
+                                        _react2.default.createElement(
+                                            Box,
+                                            null,
+                                            '\uFFE5',
+                                            item.invoiceamount
+                                        )
+                                    )
+                                ),
+                                _react2.default.createElement(_upload2.default, {
+                                    required: false,
+                                    canDel: false,
+                                    canPreview: true,
+                                    canDownload: true,
+                                    initList: fileList,
+                                    dir: 'form_invoice',
+                                    ref: 'upload_invoice'
+                                })
+                            );
+                        })
+                    )
+                )
+            );
+        }
+    }]);
+
+    return Nvoice;
+}(_react2.default.Component);
+
+exports.default = Nvoice;

package/lib/tblform/FlowCommentPane.js

@@ -49,8 +49,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 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; }
 
-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; } /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
+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; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 */
 
 

package/package.json

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