fmui-base 2.0.1 → 2.0.2

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.2: 时间字段增加“xxxx年xx月xx日”中文显示
 - 2.0.1: 流程表单选人组件联动开发 
 - 2.0.0: 2.0正式版 
 - 2.1.1-beta.1：流程列表样式修改

package/lib/form/form.js

@@ -846,6 +846,7 @@ var PageHome = function (_React$Component) {
           }
         }
         var dateFormat = form.dateFormat;
+        var dateFormatShow = "";
         if (form.dataAttr && typeof form.dataAttr != "undefined") {
           var dateDisplayFormat = form.dataAttr.dateDisplayFormat;
           if (dateDisplayFormat == "STime" || dateFormat == "YMDHM") {
@@ -854,12 +855,13 @@ var PageHome = function (_React$Component) {
             dateFormat = "YM";
           } else if (dateDisplayFormat == "Year") {
             dateFormat = "Y";
+          } else if (dateDisplayFormat == "ODate") {
+            dateFormat = "YMD";
+          } else if (dateDisplayFormat == "zhDate") {
+            dateFormat = "YMD";
+            dateFormatShow = "zhDate";
           } else {
-            if (dateDisplayFormat == "ODate") {
-              dateFormat = "YMD";
-            } else {
-              dateFormat = "YMDHM";
-            }
+            dateFormat = "YMDHM";
           }
           var minDate = form.dataAttr.minDate;
           var maxDate = form.dataAttr.maxDate;
@@ -890,7 +892,7 @@ var PageHome = function (_React$Component) {
           } else {
             value = null;
           }
-          var dateFormt = itemParam.dateFormat;
+          // var dateFormt = itemParam.dateFormat;
 
           var dateStr = this.dateFormat(value, dateFormt);
           var mainTblData = data.mainTblData;
@@ -914,6 +916,11 @@ var PageHome = function (_React$Component) {
           }
           value = null;
         }
+
+        if (readOnly == true) {
+          var dateStr = this.dateFormat(value, dateFormat, dateFormatShow);
+          value = dateStr;
+        }
       } else if (itemType == 'datetimeStep') {
         //时间
         var dateFormat = form.dateFormat;
@@ -1420,6 +1427,14 @@ var PageHome = function (_React$Component) {
       return itemParam;
     }
 
+    // 左边补零
+
+  }, {
+    key: 'addZero',
+    value: function addZero(num) {
+      return '' + (num < 10 ? '0' : '') + num;
+    }
+
     //处理关联字段初始化
 
   }, {
@@ -2120,12 +2135,17 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dateFormat',
-    value: function dateFormat(date, formatStr) {
+    value: function dateFormat(date, formatStr, dateFormatShow) {
       if (date) {
         date = new Date(date);
         var year = date.getFullYear();
         var month = this.dealwithDate(date.getMonth() + 1);
         var dates = this.dealwithDate(date.getDate());
+        if (dateFormatShow) {
+          if (dateFormatShow == "zhDate") {
+            return year + '年' + month + '月' + dates + '日';
+          }
+        }
         if (formatStr == 'YMD') {
           //年月日
           return year + '-' + month + '-' + dates;
@@ -2819,7 +2839,15 @@ var PageHome = function (_React$Component) {
             _react2.default.createElement(
               'div',
               { id: t.state.prefixName + "_" + t.state.itemParam.key, className: 't-FBH' },
-              _react2.default.createElement(_DatetimeField2.default, {
+              t.state.itemParam.readOnly ? _react2.default.createElement(_TextareaField2.default, {
+                className: 't-W100',
+                required: t.state.itemParam.required,
+                label: t.state.itemParam.title,
+                readOnly: t.state.itemParam.readOnly,
+                minRows: 1,
+                placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
+                value: t.state.itemParam.value
+              }) : _react2.default.createElement(_DatetimeField2.default, {
                 className: 't-W100',
                 label: t.state.itemParam.title,
                 required: t.state.itemParam.required,

package/package.json

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