fmui-base 2.1.75 → 2.1.76

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.76：扩展选人回显选中
 - 2.1.75：已阅批示意见保存
 - 2.1.74：新建默认赋值
 - 2.1.73：宏值增加赋值属性

package/lib/form/table.js

@@ -57,8 +57,6 @@ var _db2 = _interopRequireDefault(_db);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return 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; }
@@ -1732,8 +1730,7 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'render',
 		value: function render() {
-			var _this2 = this,
-			    _React$createElement;
+			var _this2 = this;
 
 			var t = this;
 			var allForm = this.props.allForm;
@@ -1870,18 +1867,21 @@ var PageHome = function (_React$Component) {
 								_react2.default.createElement(
 									'div',
 									{ className: t.props.commentUpload == '1' ? "" : "t-DN" },
-									_react2.default.createElement(_upload2.default, (_React$createElement = {
+									_react2.default.createElement(_upload2.default, {
 										ref: "upload_default",
 										canAdd: true,
 										dir: this.state.module,
 										fileSizeLimit: 0,
 										canDel: true,
-										limitNo: 5
-									}, _defineProperty(_React$createElement, 'fileSizeLimit', 0), _defineProperty(_React$createElement, 'initList', this.state.commentInitList), _defineProperty(_React$createElement, 'onChange', function onChange(value, isInit) {
-										_this2.changeSpyj4(_this2, value);
-									}), _defineProperty(_React$createElement, 'onDel', function onDel(value) {
-										t.changeSpyj4(_this2, value);
-									}), _React$createElement))
+										limitNo: 5,
+										initList: this.state.commentInitList,
+										onChange: function onChange(value, isInit) {
+											_this2.changeSpyj4(_this2, value);
+										},
+										onDel: function onDel(value) {
+											t.changeSpyj4(_this2, value);
+										}
+									})
 								),
 								_react2.default.createElement(_CheckboxField2.default, {
 									className: this.state.hasCommentField == '1' ? "" : "t-DN",

package/lib/selectMember/select.js

@@ -493,7 +493,9 @@ var Page = function (_React$Component) {
           selectGroups = [],
           selectPersonalGroups = [],
           selectDutys = [],
-          selectPoliticalOutlooks = [];
+          selectPoliticalOutlooks = [],
+          selectExts = [];
+      var type = "";
       for (var i = 0; i < scopeLists.length; i++) {
         var scope = scopeLists[i];
         if (defaultList != null) {
@@ -549,6 +551,14 @@ var Page = function (_React$Component) {
             "politicalOutlookName": scope.scopeName
           };
           selectPoliticalOutlooks.push(politicalOutlook);
+        } else {
+          type = scope.scopeType;
+          var typeName = type + "Name";
+          var typeJson = {
+            "id": scope.scopeValue,
+            typeName: scope.scopeName
+          };
+          selectExts.push(typeJson);
         }
       }
       selectedList.selectUsers = selectUsers;
@@ -559,6 +569,9 @@ var Page = function (_React$Component) {
       selectedList.selectPersonalGroups = selectPersonalGroups;
       selectedList.selectDutys = selectDutys;
       selectedList.selectPoliticalOutlooks = selectPoliticalOutlooks;
+      if (type != "" && selectExts && selectExts.length > 0) {
+        selectedList["select" + type + "s"] = selectExts;
+      }
       return selectedList;
     }
 
@@ -6261,6 +6274,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'handleTabChange',
     value: function handleTabChange(obj) {
+      console.log("popuser===handleTabChange===");
       var isShowNav = false;
       var isShowCheckAll = false;
       var checkType = this.props.checkType;

package/package.json

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