fmui-base 2.1.81 → 2.1.83

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.83：相关对象移动端审批后会被置空
+- 2.1.82：月日时间类型显示
 - 2.1.81：关联字段隐藏冲突处理
 - 2.1.80：审批按钮扩展方法，公众号隐藏附件下载按钮，子表支持扩展按钮
 - 2.1.79：审批支持传阅范围设置

package/lib/db/db.js

@@ -1024,6 +1024,21 @@ context.create('FlowModuleAPI', {
       //   content: <Loading />
       // });
     }
+  },
+
+  getRelaObjByRelaId: {
+    mockUrl: 'query/queryCanBack.json',
+    url: _variables2.default.URLS.getRelaObjByRelaId,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    /*    header:{'content-Type':'application/x-www-form-urlencoded'},*/
+    willFetch: function willFetch() {
+      // Toast.show({
+      //   content: <Loading />
+      // });
+    }
   }
 
 });

package/lib/db/variables.js

@@ -124,7 +124,8 @@ exports.default = {
         cancelLimit: approveUrlPrefix + "cancelLimit" + '?', //取消超时
         getCanCancelLimit: approveUrlPrefix + "getCanCancelLimit" + '?', //是否可以取消超时
         getUserInfo: approveUrlPrefix + "getUserInfo" + '?', //获取用户信息
-        getProcessListByCodes: approveUrlPrefix + "getProcessListByCodes" + '?' //获取可发起的子流程
+        getProcessListByCodes: approveUrlPrefix + "getProcessListByCodes" + '?', //获取可发起的子流程
+        getRelaObjByRelaId: approveUrlPrefix + "getRelaObjByRelaId" + '?' //获取相关对象
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/form/form.js

@@ -917,6 +917,8 @@ var PageHome = function (_React$Component) {
             dateFormat = "YMDHM";
           } else if (dateDisplayFormat == "YearMon") {
             dateFormat = "YM";
+          } else if (dateDisplayFormat == "MonthDay") {
+            dateFormat = "MD";
           } else if (dateDisplayFormat == "Year") {
             dateFormat = "Y";
           } else if (dateDisplayFormat == "ODate") {
@@ -1370,6 +1372,17 @@ var PageHome = function (_React$Component) {
         });
         // console.log(updatedHtml);
         value = updatedHtml;
+      } else if (itemType == 'relaobj') {
+        //相关对象
+        // console.log("relaobj===1271");
+        // var newVal = this.getRelaObjByRelaId(value);
+        // console.log("newVal==="+newVal);
+        //     // if(value && value!=''){
+        //     //   value = this.getRelaObjByRelaId(value);
+        //     // }
+        if (value && value != '') {
+          this.ralaObjChange(itemParam.key, value, "");
+        }
       }
       itemParam = t.dealwithLinkField(itemParam, data, status);
       itemParam = t.dealwithRelaField(itemParam, allForm);
@@ -2434,6 +2447,9 @@ var PageHome = function (_React$Component) {
           } else if (formatStr == 'YM') {
             //年月
             return year + '-' + month;
+          } else if (formatStr == 'MD') {
+            //月日
+            return month + '-' + dates;
           } else if (formatStr == 'YMDT') {
             //年月日，上下午
             var hour = this.dealwithDate(date.getHours());
@@ -2606,6 +2622,38 @@ var PageHome = function (_React$Component) {
       // ];
     }
 
+    //相关对象
+
+  }, {
+    key: 'ralaObjChange',
+    value: function ralaObjChange(code, newValue, oldValue) {
+      var _this2 = this;
+
+      console.log("===ralaObjChange===");
+      var t = this;
+      var userId = "";
+
+      var data = this.props.data;
+      if (newValue) {
+        _db2.default.FlowModuleAPI.getRelaObjByRelaId({ relaId: newValue
+        }).then(function (content) {
+          newValue = JSON.stringify(content);
+          data = _this2.editData(code, newValue, data);
+          var itemParam = _this2.state.itemParam;
+          itemParam.value = newValue;
+          _this2.setState({
+            itemParam: itemParam
+          });
+          _this2.props.onChange(data, itemParam);
+        }).catch(function (error) {
+          _Toast2.default.show({
+            type: 'error',
+            content: error.errorMsg
+          });
+        });
+      }
+    }
+
     //开关切换方法
 
   }, {
@@ -2781,7 +2829,7 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'getDetai',
     value: function getDetai() {
-      var _this2 = this;
+      var _this3 = this;
 
       var t = this;
       var subForm = this.state.itemParam.subForm;
@@ -2799,12 +2847,12 @@ var PageHome = function (_React$Component) {
             ),
             _react2.default.createElement(
               Box,
-              { flex: 1, className: 't-LH46 t-FC9', onClick: _this2.detailShow.bind(_this2, i, item.show) },
+              { flex: 1, className: 't-LH46 t-FC9', onClick: _this3.detailShow.bind(_this3, i, item.show) },
               i + 1
             ),
             _react2.default.createElement(
               Box,
-              { 'data-key': i, onClick: _this2.detailDel.bind(_this2, i), className: 't-P16 theme-color' },
+              { 'data-key': i, onClick: _this3.detailDel.bind(_this3, i), className: 't-P16 theme-color' },
               '\u5220\u9664'
             )
           ),
@@ -2812,7 +2860,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              return _react2.default.createElement(Form, { keyNo: j, dataType: 'sub', module: t.state.module, status: t.state.status, form: item2, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
+              return _react2.default.createElement(Form, { keyNo: j, dataType: 'sub', module: t.state.module, status: t.state.status, form: item2, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, onChange: _this3.changeSub.bind(_this3, _this3.state.itemParam, i) });
             })
           )
         );
@@ -2950,10 +2998,30 @@ var PageHome = function (_React$Component) {
       });
       this.props.newspyj.content = spyj + commonwords[0].text;
     }
+
+    //获取相关对象
+
+  }, {
+    key: 'getRelaObjByRelaId',
+    value: function getRelaObjByRelaId(relaId) {
+      var t = this;
+      if (relaId) {
+        //获取常用语列表
+        _db2.default.FlowModuleAPI.getRelaObjByRelaId({ relaId: relaId
+        }).then(function (content) {
+          return JSON.stringify(content);
+        }).catch(function (error) {
+          _Toast2.default.show({
+            type: 'error',
+            content: error.errorMsg
+          });
+        });
+      }
+    }
   }, {
     key: 'render',
     value: function render() {
-      var _this3 = this;
+      var _this4 = this;
 
       var t = this;
       var radioFieldProps = {
@@ -3503,10 +3571,10 @@ var PageHome = function (_React$Component) {
                         limitNo: 5,
                         initList: this.state.commentInitList,
                         onChange: function onChange(value, isInit) {
-                          _this3.changeSpyj4(_this3, value);
+                          _this4.changeSpyj4(_this4, value);
                         },
                         onDel: function onDel(value) {
-                          t.changeSpyj4(_this3, value);
+                          t.changeSpyj4(_this4, value);
                         }
                       })
                     )
@@ -3675,6 +3743,28 @@ var PageHome = function (_React$Component) {
             ),
             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' } }) : ""
           )
+        ) : this.state.itemParam.itemType == 'relaobj' ? _react2.default.createElement(
+          'div',
+          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          _react2.default.createElement(
+            _Group2.default.List,
+            { borderTopNone: true },
+            _react2.default.createElement(
+              'div',
+              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
+              _react2.default.createElement(_TextareaField2.default, {
+                className: 't-W100',
+                required: t.state.itemParam.required,
+                label: t.state.itemParam.title,
+                readOnly: true,
+                minRows: 1,
+                placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder
+                // value={t.state.itemParam.value}
+                , onChange: this.ralaObjChange.bind(this, t.state.itemParam.key)
+              }),
+              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' } }) : ""
+            )
+          )
         ) : _react2.default.createElement('div', null)
       );
     }

package/package.json

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