fmui-base 2.3.37 → 2.3.38

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.38：选人组件增加参数noSelectRoot，为1时根组织不可选，默认根组织可选
 - 2.3.37：已办列表增加办理缓急标识，表单说明组件附件允许下载
 - 2.3.36：单选多选可输入，输入内容过多时不换行
 - 2.3.35：upload：鸿蒙微信端上传异常点击无反应问题

package/lib/form/form.js

@@ -1373,6 +1373,10 @@ var PageHome = function (_React$Component) {
             // }
 
           }
+          // 根组织不可选：仅开启时透传，与 PC data-noSelectRoot 一致
+          if (form.popuserMap.noSelectRoot == "1" || form.popuserMap.noSelectRoot == 1) {
+            itemParam.noSelectRoot = "1";
+          }
           scopeTable = form.popuserMap.scopeTable;
         } else {
           popCode = "user";
@@ -4337,10 +4341,7 @@ var PageHome = function (_React$Component) {
                 )
               )
             )
-          ) :
-
-          // 单行文本：未配置 textLineFeed 时默认自动换行（与 PC 属性设置默认「是」一致）
-          !this.state.itemParam.dataAttr || this.state.itemParam.dataAttr.textLineFeed == null || this.state.itemParam.dataAttr.textLineFeed === '' || this.state.itemParam.dataAttr.textLineFeed == 'yes' ? _react2.default.createElement(
+          ) : this.state.itemParam.dataAttr && this.state.itemParam.dataAttr.textLineFeed == 'yes' ? _react2.default.createElement(
             'div',
             { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle == null ? {} : t.state.itemParam.formStyleObj.contentStyle },
             _react2.default.createElement(
@@ -4404,7 +4405,7 @@ var PageHome = function (_React$Component) {
                 )
               )
             ),
-            _react2.default.createElement('div', { className: 't-FBH t-PL16 t-fw ueditor-content', dangerouslySetInnerHTML: { __html: t.state.itemParam.value } }),
+            _react2.default.createElement('div', { className: 't-FBH t-PL16 t-fw', dangerouslySetInnerHTML: { __html: t.state.itemParam.value } }),
             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',
@@ -4794,6 +4795,7 @@ var PageHome = function (_React$Component) {
                   defaultValue: t.state.itemParam.defaultValue,
                   queryLimit: t.state.itemParam.queryLimit,
                   limitData: t.state.itemParam.limitData,
+                  noSelectRoot: t.state.itemParam.noSelectRoot,
                   ref: "selectMember_" + t.state.itemParam.fieldData,
                   isDelete: !t.state.itemParam.readOnly,
                   includeDel: "2",
@@ -5043,7 +5045,6 @@ var PageHome = function (_React$Component) {
                   required: false,
                   canAdd: false,
                   canDel: false,
-                  canDownload: true,
                   initIds: t.state.itemParam.noteFileIds,
                   limitNo: '5',
                   fileSizeLimit: '10',

package/lib/selectMember/README.md

@@ -198,6 +198,7 @@ export default class DemoPage extends React.Component {
 |------|------|------|------|
 | `queryLimit` | string | 否 | `1` 自身及下级；`2` 仅自身；`3` 查询传入数据；`4` 自身及直接下级；`5` 自身及所有下级 |
 | `limitData` | string | `queryLimit` 有值时必填 | 与 `queryLimit` 对应的 ID，逗号分隔 |
+| `noSelectRoot` | string | 否 | `"1"` 时请求 `getPopuOrgInfo` 带 `noSelectRoot=1`，由接口返回的 `canUse` 控制是否可勾选 |
 
 ### 定密与其它
 

package/lib/selectMember/select.js

@@ -226,6 +226,7 @@ var Page = function (_React$Component) {
       placeholder: props.placeholder,
       queryLimit: props.queryLimit,
       limitData: props.limitData,
+      noSelectRoot: props.noSelectRoot, //是否禁止选择根组织 1-是
       showSecret: props.showSecret, //是否开启定密  true/false
       secretlevel: props.secretlevel == null ? "" : props.secretlevel, //密级       绝密-1/机密-2/秘密-3/非密-4
       chooseType: "",
@@ -2097,6 +2098,10 @@ var Page = function (_React$Component) {
       if (showSecret && secretlevel != null && secretlevel != '') {
         searchLimit += "&secretlevel=" + secretlevel;
       }
+      //根组织不可选：传给 getPopuOrgInfo，由接口返回 canUse 控制勾选
+      if (type == "org" && this.isNoSelectRoot()) {
+        searchLimit += "&noSelectRoot=1";
+      }
       var chooseType = this.getChooseType();
       var url = "";
       var orgType = this.getOrgType();
@@ -6538,6 +6543,15 @@ var Page = function (_React$Component) {
       return noUseNum;
     }
 
+    //是否开启根组织不可选（请求 getPopuOrgInfo 时传 noSelectRoot，由接口返回 canUse）
+
+  }, {
+    key: 'isNoSelectRoot',
+    value: function isNoSelectRoot() {
+      var v = this.props.noSelectRoot;
+      return v === "1" || v === 1 || v === true;
+    }
+
     //切换tab
 
   }, {

package/package.json

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