fmui-base 1.0.49 → 2.0.1

package/README.md

@@ -1,37 +1,20 @@
 ## 移动端组件
 
----
+---npm publish
 
 ## 更新日志
-- 1.0.49：选人组件常用页签修改；上传组件下载；上传组件加载样式
-- 1.0.48：选人组件政治面貌修改；表单提交必填校验加背景颜色；说明组件修复
-- 1.0.47：说明组件增加附件，图片
-- 1.0.46：项目模块扩展开发修改
-- 1.0.45：表单字段选人默认值
-- 1.0.44：增加表单锚点
-- 1.0.43：移动端支持默认选中参与人
-- 1.0.42：项目模块扩展开发;流程活动节点可以设置流程办理默认的提醒内容
-- 1.0.41：上传附件敏感词拦截;
-- 1.0.40：修复审批验签重复问题;
-- 1.0.39：移动审批扩展;选人组件问题修复
-- 1.0.38：移动审批自动通过;选人组件增加政治面貌和职务
-- 1.0.37：移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置
-- 1.0.36：移动审批保存时不校验必填项;关联字段功能实现;移动端子表扩展功能开发
-- 1.0.35：流程支持CA加签验签问题修复
-- 1.0.34：退回流程支持上传附件;流程支持CA加签验签
-- 1.0.33：表单说明字段额外扩展样式实现
-- 1.0.32：去掉批量办理标题旁的new icon;矩阵式表单额外扩展样式实现
-- 1.0.31：修复pc企业微信客户端预览查看问题
-- 1.0.30：流程批量办理增加必填校验，流程组件在钉钉PC客户端办理后关闭页面修改;日期组件增加区间选项
-- 1.0.29：流程项目开发外扩展js修改
-- 1.0.28：选人个人群组适配
-- 1.0.27：流程批示意见问题修复
-- 1.0.26：流程项目开发外扩展js
-- 1.0.25：流程列表增加类型all情况下查所有流程问题修改
-- 1.0.24：流程列表增加类型all全局待办module编码，增加流程表单外扩展js
-- 1.0.23：流程列表批量办理按钮增加配置项可控制隐藏
-- 1.0.22：修改流程列表统一待办和搜索
-- 1.0.21：修改流程列表统一待办
-- 1.0.20：修改推送打开作废流程提示
-- 1.0.19：修改流程图请求参数，增加流程实例id
+- 2.0.1: 流程表单选人组件联动开发 
+- 2.0.0: 2.0正式版 
+- 2.1.1-beta.1：流程列表样式修改
+- 2.1.1-beta.0：流程表单修改
+- 2.1.0-beta.9：流程表单修改
+- 2.1.0-beta.8：周补丁功能合并
+- 2.1.0-beta.7：移动端关联表功能
+- 2.1.0-beta.6：按钮修改和选人组件兼职组织修复
+- 2.1.0-beta.5：选人组件修改
+- 2.1.0-beta.4：表单html组件样式修改;上传组件修改;上传进度条增加
+- 2.1.0-beta.3：各种样式修复
+- 2.1.0-beta.2：修改上传组件样式
+- 2.1.0-beta.1：修改基础组件样式
+- 2.1.0-beta.0：2.0beta版本提交
 

package/lib/db/variables.js

@@ -104,6 +104,7 @@ exports.default = {
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",
+    approvalCardIcon: context + "/mobile/fmui/images/approvalCard.png",
     SQLX: {
         qjsq: 'qjsq', //请假申请
         bxsq: 'baoxiu', //保修申请

package/lib/form/form.js

@@ -53,6 +53,10 @@ var _Boxs = require('saltui/lib/Boxs');
 
 var _Boxs2 = _interopRequireDefault(_Boxs);
 
+var _Field = require('saltui/lib/Field');
+
+var _Field2 = _interopRequireDefault(_Field);
+
 var _FoldablePane = require('saltui/lib/FoldablePane');
 
 var _FoldablePane2 = _interopRequireDefault(_FoldablePane);
@@ -92,13 +96,13 @@ 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; }
+
+_Field2.default;
 // import Slot from 'saltui/lib/Slot';
 
 // import SelectFileNo from '../select-fileno/pageHome';
 // import SelectSerialNumber from '../select-serialnumber/pageHome';
 //import 'babel-polyfill';
-
-
 var HBox = _Boxs2.default.HBox,
     VBox = _Boxs2.default.VBox,
     Box = _Boxs2.default.Box;
@@ -260,6 +264,8 @@ var PageHome = function (_React$Component) {
       }
       var status = this.props.status; //判断是否能选择,0新增，1修改,2查看
       var formKey = this.props.formKey; //表单code
+      var allForm = this.props.allForm; //表单属性
+      var formTblId = allForm.formTblId; //表单的表id
       var data = this.props.data; //数据
       var dataType = this.props.dataType; //数据类型，main:主表，sub：子表，
       var module = this.props.module;
@@ -286,6 +292,10 @@ var PageHome = function (_React$Component) {
       itemParam.key = key;
       var itemType = form.itemType; //类型
       itemParam.itemType = itemType;
+      var fieldTblId = form.tblId;
+      var fieldTblName = form.tblName;
+      itemParam.tblId = fieldTblId;
+      itemParam.tblName = fieldTblName;
 
       var required = false;
       if (itemType != "comment") {
@@ -302,6 +312,7 @@ var PageHome = function (_React$Component) {
       itemParam.isHidden = form.isHidden ? form.isHidden : false; //默认不隐藏
 
       var mainTblData = data.mainTblData; //主表数据
+      var relatedTbl = data.relatedTbl; //关联表数据
       var subTbl = data.subTbl; //子表
       var readOnly = false;
       var value = '';
@@ -345,23 +356,72 @@ var PageHome = function (_React$Component) {
           //新增 
           value = form.defaultValue;
 
-          var hasField = false;
-          mainTblData.map(function (item) {
-            if (item.key == key) {
-              hasField = true;
+          if (formTblId.indexOf(fieldTblId) > 0) {
+            var hasTable = false;
+            var hasField = false;
+            relatedTbl.map(function (item) {
+              if (item.relatedMainTblName == fieldTblName) {
+                hasTable = true;
+                item.relatedMainTblData.map(function (item2) {
+                  if (item2.key == key) {
+                    hasField = true;
+                  }
+                });
+              }
+            });
+
+            if (!hasField) {
+              //字段不存在
+
+              tableData.key = key;
+              tableData.value = form.defaultValue;
+              tableData.required = required;
+              tableData.label = title;
+              tableData.inputFormat = form.inputFormat;
+              tableData.decimalPlace = form.decimalPlace;
+              tableData.fieldId = form.fieldId;
+              tableData.uniqueName = uniqueName;
+              tableData.itemType = form.itemType;
+
+              if (!hasTable) {
+                //表不存在
+                var relatedTblData = {};
+                relatedTblData.relaDataId = null;
+                relatedTblData.relatedMainTblName = fieldTblName;
+                relatedTblData.relatedSubTblData = [];
+
+                var relatedMainTblData = [];
+                relatedMainTblData.push(tableData);
+                relatedTblData.relatedMainTblData = relatedMainTblData;
+                relatedTbl.push(relatedTblData);
+              } else {
+                relatedTbl.map(function (item) {
+                  if (item.relatedMainTblName == fieldTblName) {
+                    var relatedMainTblData = item.relatedMainTblData;
+                    relatedMainTblData.push(tableData);
+                  }
+                });
+              }
+            }
+          } else {
+            var hasField = false;
+            mainTblData.map(function (item) {
+              if (item.key == key) {
+                hasField = true;
+              }
+            });
+            if (!hasField) {
+              tableData.key = key;
+              tableData.value = form.defaultValue;
+              tableData.required = required;
+              tableData.label = title;
+              tableData.inputFormat = form.inputFormat;
+              tableData.decimalPlace = form.decimalPlace;
+              tableData.fieldId = form.fieldId;
+              tableData.uniqueName = uniqueName;
+              tableData.itemType = form.itemType;
+              mainTblData.push(tableData);
             }
-          });
-          if (!hasField) {
-            tableData.key = key;
-            tableData.value = form.defaultValue;
-            tableData.required = required;
-            tableData.label = title;
-            tableData.inputFormat = form.inputFormat;
-            tableData.decimalPlace = form.decimalPlace;
-            tableData.fieldId = form.fieldId;
-            tableData.uniqueName = uniqueName;
-            tableData.itemType = form.itemType;
-            mainTblData.push(tableData);
           }
         } else if (status == '1') {
           //编辑
@@ -369,7 +429,7 @@ var PageHome = function (_React$Component) {
           if (!dataId) {
             if (dataType == "sub") {
               if (this.checkIsHasSub(mainTblData, key)) {
-                value = this.dealwithData(itemParam, mainTblData);
+                value = this.dealwithData(itemParam, mainTblData, relatedTbl);
               } else {
                 value = form.value;
                 tableData.key = key;
@@ -381,7 +441,16 @@ var PageHome = function (_React$Component) {
                 tableData.fieldId = form.fieldId;
                 tableData.uniqueName = uniqueName;
                 tableData.itemType = form.itemType;
-                mainTblData.push(tableData);
+                if (formTblId.indexOf(fieldTblId) > 0) {
+                  relatedTbl.map(function (item) {
+                    if (item.relatedMainTblName == fieldTblName) {
+                      var relatedMainTblData = item.relatedMainTblData;
+                      relatedMainTblData.push(tableData);
+                    }
+                  });
+                } else {
+                  mainTblData.push(tableData);
+                }
               }
             } else {
               value = form.value;
@@ -394,10 +463,19 @@ var PageHome = function (_React$Component) {
               tableData.fieldId = form.fieldId;
               tableData.uniqueName = uniqueName;
               tableData.itemType = form.itemType;
-              mainTblData.push(tableData);
+              if (formTblId.indexOf(fieldTblId) > 0) {
+                relatedTbl.map(function (item) {
+                  if (item.relatedMainTblName == fieldTblName) {
+                    var relatedMainTblData = item.relatedMainTblData;
+                    relatedMainTblData.push(tableData);
+                  }
+                });
+              } else {
+                mainTblData.push(tableData);
+              }
             }
           } else {
-            value = this.dealwithData(itemParam, mainTblData); //初始化值
+            value = this.dealwithData(itemParam, mainTblData, relatedTbl); //初始化值
           }
         } else {
           //显示
@@ -410,7 +488,7 @@ var PageHome = function (_React$Component) {
           tableData.fieldId = form.fieldId;
           tableData.uniqueName = uniqueName;
           tableData.itemType = form.itemType;
-          value = this.dealwithData(itemParam, mainTblData); //初始化值
+          value = this.dealwithData(itemParam, mainTblData, relatedTbl); //初始化值
         }
       }
 
@@ -875,29 +953,36 @@ var PageHome = function (_React$Component) {
       } else if (itemType == 'upload' || itemType == 'image') {
         //附件图片
         var formDataAttr = form.dataAttr;
+        var uploadFileNumLimit = "";
+        var uploadFileLimit = "";
+        var canDownload = "";
         if (formDataAttr) {
-          var uploadFileNumLimit = formDataAttr.uploadFileNumLimit; //上传个数限制
-          var uploadFileLimit = formDataAttr.uploadFileLimit; //上传类型限制
-          var canDownload = formDataAttr.canDownload; //是否下载
-          if (value) {
-            value = value.replace(/\|/g, ",");
-            itemParam.initIds = value;
-            value = [];
-          } else {
-            value = [];
-          }
-          if (uploadFileNumLimit) {
-            itemParam.uploadFileNumLimit = uploadFileNumLimit;
-          } else {
-            itemParam.uploadFileNumLimit = -1;
-          }
+          uploadFileNumLimit = formDataAttr.uploadFileNumLimit; //上传个数限制
+          uploadFileLimit = formDataAttr.uploadFileLimit; //上传类型限制
+          canDownload = formDataAttr.canDownload; //是否下载
+        }
+        if (value) {
+          value = value.replace(/\|/g, ",");
+          itemParam.initIds = value;
+          value = [];
+        } else {
+          value = [];
+        }
+        if (uploadFileNumLimit) {
+          itemParam.uploadFileNumLimit = uploadFileNumLimit;
+        } else {
+          itemParam.uploadFileNumLimit = -1;
+        }
 
-          if (uploadFileLimit) {
-            itemParam.uploadFileLimit = uploadFileLimit;
-          } else {
-            itemParam.uploadFileLimit = "";
-          }
+        if (uploadFileLimit) {
+          itemParam.uploadFileLimit = uploadFileLimit;
+        } else {
+          itemParam.uploadFileLimit = "";
+        }
+        if (canDownload) {
           itemParam.canDownload = canDownload;
+        } else {
+          itemParam.canDownload = "0";
         }
       } else if (itemType == 'poppage') {
         //弹出选择
@@ -1214,7 +1299,22 @@ var PageHome = function (_React$Component) {
 
       //CA验签
       if (status > 0 && preCaFields.indexOf("," + uniqueName + ",") >= 0 && itemType != 'popuser') {
-        this.casigin(itemParam, data, uniqueName, isVerifySingValue);
+        //项目开发扩展
+        var mobileExt;
+        try {
+          if (formKey) {
+            mobileExt = typeof eval(module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(module + "_" + formKey + "_mobileExt") : null;
+          }
+        } catch (e) {
+          // alert("exception: "+e.message);
+        }
+        if (typeof mobileExt !== 'undefined' && typeof mobileExt["casigin"] === "function") {
+          var isVerifySing = mobileExt["casigin"](itemParam, data, uniqueName, isVerifySingValue);
+          itemParam.isVerifySing = isVerifySing;
+          this.setState(itemParam);
+        } else {
+          this.casigin(itemParam, data, uniqueName, isVerifySingValue);
+        }
       }
     }
 
@@ -1547,38 +1647,82 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dealwithData',
-    value: function dealwithData(itemParam, mainTblData) {
+    value: function dealwithData(itemParam, mainTblData, relatedTbl) {
       var itemCode = itemParam.key;
       var itemType = itemParam.itemType;
       var value = '';
-      if (mainTblData.length > 0) {
-        for (var i = 0; i < mainTblData.length; i++) {
-          var item = mainTblData[i];
-          if (item.key == itemCode) {
-            mainTblData[i].required = itemParam.required;
-            mainTblData[i].label = itemParam.title;
-            mainTblData[i].inputFormat = itemParam.inputFormat;
-            mainTblData[i].decimalPlace = itemParam.decimalPlace;
-            // if(item.showValue){
-            //   value = item.showValue;
-            //   item.showValue = null;
-            // }else{
-            if (item.value || item.value == 0) {
-              value = item.value;
-            }
 
-            //}
-            if (itemType == 'text' || itemType == 'textarea') {
-              if (value) {
-                mainTblData[i].value = value + '';
+      var formTblId = this.props.allForm.formTblId;
+      var fieldTblId = itemParam.tblId;
+      var fieldTblName = itemParam.tblName;
+      if (formTblId.indexOf(fieldTblId) > 0) {
+        if (relatedTbl.length > 0) {
+          for (var i = 0; i < relatedTbl.length; i++) {
+            var item = relatedTbl[i];
+            if (item.relatedMainTblName == fieldTblName) {
+              var relatedMainTblData = item.relatedMainTblData;
+              if (relatedMainTblData) {
+                for (var j = 0; j < relatedMainTblData.length; j++) {
+                  var relatedItem = relatedMainTblData[j];
+                  if (relatedItem.key == itemCode) {
+                    relatedItem.required = itemParam.required;
+                    relatedItem.label = itemParam.title;
+                    relatedItem.inputFormat = itemParam.inputFormat;
+                    relatedItem.decimalPlace = itemParam.decimalPlace;
+                    // if(item.showValue){
+                    //   value = item.showValue;
+                    //   item.showValue = null;
+                    // }else{
+                    if (relatedItem.value || relatedItem.value == 0) {
+                      value = relatedItem.value;
+                    }
+
+                    //}
+                    if (itemType == 'text' || itemType == 'textarea') {
+                      if (value) {
+                        relatedItem.value = value + '';
+                      }
+                    }
+                    break;
+                  }
+                }
               }
             }
-            break;
-          }
-        };
-        return value;
+          };
+          return value;
+        } else {
+          return value;
+        }
       } else {
-        return value;
+        if (mainTblData.length > 0) {
+          for (var i = 0; i < mainTblData.length; i++) {
+            var item = mainTblData[i];
+            if (item.key == itemCode) {
+              mainTblData[i].required = itemParam.required;
+              mainTblData[i].label = itemParam.title;
+              mainTblData[i].inputFormat = itemParam.inputFormat;
+              mainTblData[i].decimalPlace = itemParam.decimalPlace;
+              // if(item.showValue){
+              //   value = item.showValue;
+              //   item.showValue = null;
+              // }else{
+              if (item.value || item.value == 0) {
+                value = item.value;
+              }
+
+              //}
+              if (itemType == 'text' || itemType == 'textarea') {
+                if (value) {
+                  mainTblData[i].value = value + '';
+                }
+              }
+              break;
+            }
+          };
+          return value;
+        } else {
+          return value;
+        }
       }
     }
 
@@ -1625,6 +1769,11 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'editData',
     value: function editData(itemCode, value, data) {
+      var itemParam = this.state.itemParam;
+      var allForm = this.props.allForm;
+      var formTblId = this.props.allForm.formTblId;
+      var fieldTblId = itemParam.tblId;
+      var fieldTblName = itemParam.tblName;
       //处理操作返回数据
       if (typeof FlowCommon.dealwithReturnData === "function") {
         FlowCommon.dealwithReturnData(itemCode, value, function (itemCode1, value1) {
@@ -1643,12 +1792,27 @@ var PageHome = function (_React$Component) {
           });
         }
       } else {
-        var mainTblData = data.mainTblData;
-        mainTblData.map(function (item, index) {
-          if (item.key == itemCode) {
-            item.value = value;
+        if (formTblId.indexOf(fieldTblId) > 0) {
+          var relatedTbl = data.relatedTbl;
+          for (var i = 0; i < relatedTbl.length; i++) {
+            var item = relatedTbl[i];
+            if (item.relatedMainTblName == fieldTblName) {
+              var relatedMainTblData = item.relatedMainTblData;
+              for (var j = 0; j < relatedMainTblData.length; j++) {
+                if (relatedMainTblData[j].key == itemCode) {
+                  relatedMainTblData[j].value = value;
+                }
+              }
+            }
           }
-        });
+        } else {
+          var mainTblData = data.mainTblData;
+          mainTblData.map(function (item, index) {
+            if (item.key == itemCode) {
+              item.value = value;
+            }
+          });
+        }
       }
 
       return data;
@@ -1800,7 +1964,7 @@ var PageHome = function (_React$Component) {
     key: 'checkEmoji',
     value: function checkEmoji(content) {
       var result = false;
-      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;
+      var regStr = /(\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]/g;
       if (regStr.test(content)) {
         result = true;
       }
@@ -2078,12 +2242,12 @@ var PageHome = function (_React$Component) {
         newValue = "";
       }
       data = this.editData(code, newValue, data);
-      // var itemParam = this.state.itemParam;
-      // itemParam.value = newValue;
-      // this.setState({
-      //   itemParam: itemParam
-      // });
-      this.props.onChange(data, this.state.itemParam);
+      var itemParam = this.state.itemParam;
+      itemParam.value = newValue;
+      this.setState({
+        itemParam: itemParam
+      });
+      this.props.onChange(data, itemParam);
       // var json = [
       //   {"scopeValue":'113',"scopeType":"user","scopeName":"葛萌"}
       // ];
@@ -2269,7 +2433,7 @@ var PageHome = function (_React$Component) {
             ),
             _react2.default.createElement(
               Box,
-              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 t-FCddblue' },
+              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 t-FCblue' },
               '\u5220\u9664'
             )
           ),
@@ -2540,7 +2704,6 @@ var PageHome = function (_React$Component) {
                 label: t.state.itemParam.title,
                 readOnly: t.state.itemParam.readOnly,
                 minRows: 3,
-                layout: 'v',
                 placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
                 value: t.state.itemParam.value,
                 onChange: function onChange(value) {
@@ -2792,17 +2955,15 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
+              { className: 't-W100', id: t.state.prefixName + "_" + t.state.itemParam.key },
               _react2.default.createElement(
-                'div',
-                { className: 't-W100' },
+                _Field2.default,
+                { label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
                 _react2.default.createElement(_upload2.default, {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
-                  required: t.state.itemParam.required,
                   canAdd: t.state.itemParam.readOnly == true ? false : true,
                   canDel: t.state.itemParam.readOnly == true ? false : true,
                   canDownload: this.state.itemParam.canDownload == "1" ? true : false,
-                  label: t.state.itemParam.title,
                   initList: t.state.itemParam.value,
                   initIds: t.state.itemParam.initIds,
                   dir: t.state.module,
@@ -2827,16 +2988,14 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               'div',
-              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
+              { className: 't-W100', id: t.state.prefixName + "_" + t.state.itemParam.key },
               _react2.default.createElement(
-                'div',
-                { className: 't-W100' },
+                _Field2.default,
+                { label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
                 _react2.default.createElement(_upload2.default, {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
-                  required: t.state.itemParam.required,
                   canAdd: t.state.itemParam.readOnly == true ? false : true,
                   canDel: t.state.itemParam.readOnly == true ? false : true,
-                  label: t.state.itemParam.title,
                   initList: t.state.itemParam.value,
                   initIds: t.state.itemParam.initIds,
                   dir: t.state.module,
@@ -2893,21 +3052,21 @@ var PageHome = function (_React$Component) {
                       placeholder: '请输入批示意见',
                       value: t.state.spyj,
                       onChange: this.changeSpyj3.bind(this) })
-                  ),
+                  )
+                ),
+                _react2.default.createElement(
+                  _FoldablePane2.default,
+                  { foldHeight: 0, isFold: this.state.fold },
                   _react2.default.createElement(
-                    _FoldablePane2.default,
-                    { foldHeight: 0, isFold: this.state.fold },
-                    _react2.default.createElement(
-                      'div',
-                      { className: 'phrase-list' },
-                      this.state.phraseListNew.length > 0 ? this.state.phraseListNew.map(function (item, i) {
-                        return _react2.default.createElement(
-                          'div',
-                          { className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
-                          item.value
-                        );
-                      }.bind(this)) : ''
-                    )
+                    'div',
+                    { className: 'phrase-list' },
+                    this.state.phraseListNew.length > 0 ? this.state.phraseListNew.map(function (item, i) {
+                      return _react2.default.createElement(
+                        'div',
+                        { className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
+                        item.value
+                      );
+                    }.bind(this)) : ''
                   )
                 )
               )
@@ -2921,7 +3080,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               VBox,
-              { vAlign: 'center', className: 't-LH40  t-FCddblue t-BCf dd-bottom-border t-PL16 t-PR16' },
+              { vAlign: 'center', className: 't-LH40  t-FCblue t-BCf dd-bottom-border t-PL16 t-PR16' },
               _react2.default.createElement(
                 Box,
                 { flex: 1, className: 't-PR' },

package/lib/form/subForm.js

@@ -648,7 +648,7 @@ var PageHome = function (_React$Component) {
             ),
             _react2.default.createElement(
               Box,
-              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: t.state.itemParam.subtableReadonly || subForm.length == 1 ? 't-DN' : 't-P16 t-FCddblue' },
+              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: t.state.itemParam.subtableReadonly || subForm.length == 1 ? 't-DN' : 't-P16 t-FCblue' },
               '\u5220\u9664'
             )
           ),
@@ -656,7 +656,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              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) });
+              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) });
             })
           )
         );
@@ -751,7 +751,7 @@ var PageHome = function (_React$Component) {
           ),
           _react2.default.createElement(
             Box,
-            { className: 't-FCddblue' },
+            null,
             _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" })
           )
         ),