fmui-base 2.0.7 → 2.0.9

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.9: 党建流程二开功能支持修改；选人组件岗位切换问题修改
+- 2.0.8: 上传组件冒泡事件问题修复
 - 2.0.7: 上传组件结构调整
 - 2.0.6: 政治面貌全选问题修改
 - 2.0.5: 流程功能优化

package/lib/form/form.js

@@ -278,6 +278,7 @@ var PageHome = function (_React$Component) {
 
       var tableName = data.mainTblName;
       var itemParam = {}; //元素参数
+      itemParam.formKey = formKey;
       itemParam.tableName = tableName;
       itemParam.uniqueName = uniqueName;
       var commentList = this.props.commentList;

package/lib/process_info/processInfo.js

@@ -2014,14 +2014,23 @@ var PageHome = function (_React$Component) {
                 //提交
                 var sendData = t.state.editFormData;
                 sendData.formItem = [];
+                var allEditIds = this.getAllEditIds(t.state.editFormData);
+                var dataId = "";
+                if (allEditIds) {
+                    dataId = allEditIds.split(",")[0];
+                }
+                var editType = this.state.editType;
+                if (editType == "add" && dataId != "") {
+                    editType = "edit";
+                }
                 var param = {
                     taskId: this.state.taskId,
                     auditorUserIds: auditorUserIds,
                     allEditIds: this.getAllEditIds(t.state.editFormData),
                     code: this.state.code,
                     formData: JSON.stringify(sendData),
-                    dataId: this.state.dataId,
-                    editType: this.state.editType,
+                    dataId: dataId,
+                    editType: editType,
                     module: this.state.module,
                     lock: this.state.lock,
                     reminderContent: "",
@@ -3057,8 +3066,10 @@ var PageHome = function (_React$Component) {
             var allEditIdsArray = [];
 
             //主表id
-            var mainTableId = data.dataId;
-            allEditIdsArray.push(mainTableId);
+            if (data.dataId) {
+                var mainTableId = data.dataId;
+                allEditIdsArray.push(mainTableId);
+            }
 
             //关联表
             var relatedTbl = data.relatedTbl;
@@ -3317,10 +3328,15 @@ var PageHome = function (_React$Component) {
                 /* if(circulateShortMessage.length>0){
                      cshortMessage=circulateShortMessage[0].value;
                  }*/
+                var allEditIds = this.getAllEditIds(t.state.editFormData);
+                var dataId = "";
+                if (allEditIds) {
+                    dataId = allEditIds.split(",")[0];
+                }
                 var param = {
                     taskId: this.state.taskId,
                     selectedActivity: selectedActivity,
-                    allEditIds: this.getAllEditIds(t.state.editFormData),
+                    allEditIds: allEditIds,
                     corpId: corpid,
                     code: this.state.code,
                     formData: JSON.stringify(editFormData),
@@ -3328,7 +3344,7 @@ var PageHome = function (_React$Component) {
                     comment: newComment,
                     commentId: t.state.commentId,
                     hasCommentField: t.state.hasCommentField,
-                    dataId: t.state.dataId,
+                    dataId: dataId,
                     urgent: urgent,
                     lock: t.state.lock,
                     sendShortMessage: sendShortMessage,
@@ -3701,15 +3717,25 @@ var PageHome = function (_React$Component) {
                 newComment = t.state.defaultValue;
             }
             var isPush = t.state.isPush;
+
+            var allEditIds = this.getAllEditIds(t.state.editFormData);
+            var dataId = "";
+            if (allEditIds) {
+                dataId = allEditIds.split(",")[0];
+            }
+            var editType = this.state.editType;
+            if (editType == "add" && dataId != "") {
+                editType = "edit";
+            }
             var param = (_param = {
                 taskId: this.state.taskId,
                 module: t.state.module,
                 processInstanceId: t.state.processInstanceId,
-                allEditIds: t.getAllEditIds(t.state.editFormData),
+                allEditIds: allEditIds,
                 formData: JSON.stringify(editFormData),
                 formType: "4",
-                editType: this.state.editType
-            }, _defineProperty(_param, 'module', t.state.module), _defineProperty(_param, 'comment', newComment), _defineProperty(_param, 'commentType', 'text'), _defineProperty(_param, 'commentId', t.state.commentId), _defineProperty(_param, 'permissionCode', t.state.permissionCode), _defineProperty(_param, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param, 'dataId', t.state.dataId), _param);
+                editType: editType
+            }, _defineProperty(_param, 'module', t.state.module), _defineProperty(_param, 'comment', newComment), _defineProperty(_param, 'commentType', 'text'), _defineProperty(_param, 'commentId', t.state.commentId), _defineProperty(_param, 'permissionCode', t.state.permissionCode), _defineProperty(_param, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param, 'dataId', dataId), _param);
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -4014,6 +4040,10 @@ var PageHome = function (_React$Component) {
                 //新增
                 content = '是否要提交审批？';
             }
+
+            if (param.editType == "add" && param.dataId != "") {
+                param.editType = "edit";
+            }
             param.processInstanceId = t.state.processInstanceId;
             param.permissionCode = t.state.permissionCode;
             param.commentId = t.state.commentId;
@@ -6539,7 +6569,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/lib/selectMember/select.js

@@ -102,10 +102,13 @@ var Page = function (_React$Component) {
     // }
 
     var winHeight = parseInt(getScrollHigh(0, 0, 0));
-    var token = document.getElementById('token').value;
+    //var token = document.getElementById('token').value;
+    var token = getLoginUserInfo().token;
     //var baseContext = document.getElementById('baseContext').value;
-    var context = document.getElementById('context').value; //getLoginUserInfo().context;
-    var orgHiddenId = document.getElementById('orgHiddenId').value;
+    // var context = document.getElementById('context').value;//getLoginUserInfo().context;
+    var context = getLoginUserInfo().context;
+    var orgHiddenId = getLoginUserInfo().orgId;
+    // var orgHiddenId = document.getElementById('orgHiddenId').value;
     var baseCorpId = getLoginUserInfo().baseCorpId == null ? "0" : getLoginUserInfo().baseCorpId;
     _this.state = {
       bottomHeight: bottomHeight,
@@ -5248,7 +5251,7 @@ var Page = function (_React$Component) {
           return response.json();
         }).then(function (result) {
           //alert(JSON.stringify(result));
-          var stationList = result.data;
+          var stationList = result.data.stationList;
           var selectStaNum = 0,
               noUseStationNum = 0;
           var navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];

package/lib/upload/upload.js

@@ -614,10 +614,10 @@ var PageHome = function (_React$Component) {
                                 { className: 'upload-content' },
                                 _react2.default.createElement(
                                     'div',
-                                    { className: 'dd-t-border upload-list-item', onClick: _this3.view.bind(_this3, item) },
+                                    { className: 'dd-t-border upload-list-item' },
                                     _react2.default.createElement(
                                         'div',
-                                        { className: 'upload-list-item-content' },
+                                        { className: 'upload-list-item-content', onClick: _this3.view.bind(_this3, item) },
                                         _react2.default.createElement(
                                             'div',
                                             { className: 'upload-name-icon' },
@@ -636,7 +636,7 @@ var PageHome = function (_React$Component) {
                                     ),
                                     _react2.default.createElement(
                                         'div',
-                                        { className: 'upload-icon' },
+                                        { className: t.props.canDownload || t.state.canDel ? 'upload-icon' : 't-DN' },
                                         _react2.default.createElement('i', { className: t.props.canDownload ? 'iconfont icon-download1' : 't-DN', onClick: _this3.downloadFile.bind(_this3, item) }),
                                         _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-delete' : 't-DN', onClick: _this3.del.bind(_this3, i) })
                                     )

package/package.json

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