fmui-base 2.3.36 → 2.3.38

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.38：选人组件增加参数noSelectRoot，为1时根组织不可选，默认根组织可选
+- 2.3.37：已办列表增加办理缓急标识，表单说明组件附件允许下载
 - 2.3.36：单选多选可输入，输入内容过多时不换行
 - 2.3.35：upload：鸿蒙微信端上传异常点击无反应问题
 - 2.3.34：移动端支持新疆CA电子签章功能，去除截图base64png图片的操作

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";
@@ -4791,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",

package/lib/process_list/processList.js

@@ -356,9 +356,15 @@ var ListItem = function (_React$Component) {
       var checkIsNotComplete = true;
       var urgencyTag = false;
       var tagClass = '';
-      if (data.type == 0) {
-        //待办
-        checkIsNotComplete = true;
+      if (data.type == 0 || data.type == 2) {
+        //待办 / 已办：缓急角标
+        if (data.type == 0) {
+          checkIsNotComplete = true;
+        } else if (data.status == 2) {
+          checkIsNotComplete = false;
+        } else {
+          checkIsNotComplete = true;
+        }
         if (data.urgency == '90') {
           urgencyTag = true;
           tagClass = 'label label-danger';
@@ -381,13 +387,6 @@ var ListItem = function (_React$Component) {
         } else {
           checkIsNotComplete = true;
         }
-      } else if (data.type == 2) {
-        //已办
-        if (data.status == 2) {
-          checkIsNotComplete = false;
-        } else {
-          checkIsNotComplete = true;
-        }
       } else if (data.type == 3) {
         //已阅
         if (data.status == 2) {

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/lib/select_input/selectInput.js

@@ -393,21 +393,13 @@ var SelectInput = function (_React$Component) {
             { className: 'dd-select-input-option-text' },
             option.text
           ),
-          showInput ? _react2.default.createElement('textarea', {
+          showInput ? _react2.default.createElement('input', {
             className: 'dd-select-input-text',
-            rows: 1,
+            type: 'text',
             value: _this3.state.inputValues[optionValue] || ''
             // 输入框只有在当前项已选中且 readOnly=false 时才允许输入。
             , disabled: inputDisabled,
-            ref: function ref(el) {
-              if (el) {
-                el.style.height = 'auto';
-                el.style.height = el.scrollHeight + 'px';
-              }
-            },
             onChange: function onChange(e) {
-              e.target.style.height = 'auto';
-              e.target.style.height = e.target.scrollHeight + 'px';
               _this3.handleInputChange(optionValue, e.target.value);
             },
             onBlur: function onBlur() {

package/lib/select_input/selectInput.less

@@ -1,103 +1,87 @@
-.dd-select-input-field {
-     width: 100%;
-}
-
-.dd-select-input-option {
-     display: flex;
-     align-items: flex-start;
-     width: 100%;
-     margin: 8px 0;
-     cursor: pointer;
-}
-
-.dd-select-input-native {
-     position: absolute;
-     opacity: 0;
-     pointer-events: none;
-}
-
-.dd-select-input-icon {
-     position: relative;
-     flex: 0 0 18px;
-     width: 18px;
-     height: 18px;
-     margin-right: 8px;
-     margin-top: 2px;
-     border: 1px solid #c7ced9;
-     background: #fff;
-     transition: all .2s ease;
-     box-sizing: border-box;
-}
-
-.dd-select-input-icon.radio {
-     border-radius: 50%;
-}
-
-.dd-select-input-icon.checkbox {
-     border-radius: 4px;
-}
-
-.dd-select-input-option.checked .dd-select-input-icon {
-     border-color: #3480fb;
-     background: #3480fb;
-}
-
-.dd-select-input-option.checked .dd-select-input-icon.radio::after {
-     content: '';
-     position: absolute;
-     top: 50%;
-     left: 50%;
-     width: 8px;
-     height: 8px;
-     border-radius: 50%;
-     background: #fff;
-     transform: translate(-50%, -50%);
-}
-
-.dd-select-input-option.checked .dd-select-input-icon.checkbox::after {
-     content: '';
-     position: absolute;
-     left: 5px;
-     top: 1px;
-     width: 5px;
-     height: 10px;
-     border: solid #fff;
-     border-width: 0 2px 2px 0;
-     transform: rotate(45deg);
-}
-
-.dd-select-input-option-text {
-     margin-right: 8px;
-     min-width: 32px;
-     max-width: 40%;
-     flex: 0 1 auto;
-     white-space: normal;
-     word-break: break-word;
-     line-height: 1.4;
-}
-
-.dd-select-input-text {
-     flex: 1 1 0;
-     min-width: 0;
-     width: auto;
-     max-width: 100%;
-     border: none;
-     border-bottom: 1px solid #ddd;
-     outline: none;
-     padding: 4px 2px;
-     font-size: 14px;
-     line-height: 1.4;
-     background-color: transparent;
-     white-space: pre-wrap;
-     word-break: break-all;
-     overflow-wrap: anywhere;
-     resize: none;
-     overflow: hidden;
-     field-sizing: content;
-}
-
-.dd-select-input-text:disabled {
-     color: #333;
-     border-bottom-color: #eee;
-     cursor: not-allowed;
-}
+.dd-select-input-field {
+     width: 100%;
+}
+
+.dd-select-input-option {
+     display: flex;
+     align-items: center;
+     margin: 8px 0;
+     cursor: pointer;
+}
+
+.dd-select-input-native {
+     position: absolute;
+     opacity: 0;
+     pointer-events: none;
+}
+
+.dd-select-input-icon {
+     position: relative;
+     flex: 0 0 18px;
+     width: 18px;
+     height: 18px;
+     margin-right: 8px;
+     border: 1px solid #c7ced9;
+     background: #fff;
+     transition: all .2s ease;
+     box-sizing: border-box;
+}
+
+.dd-select-input-icon.radio {
+     border-radius: 50%;
+}
+
+.dd-select-input-icon.checkbox {
+     border-radius: 4px;
+}
+
+.dd-select-input-option.checked .dd-select-input-icon {
+     border-color: #3480fb;
+     background: #3480fb;
+}
+
+.dd-select-input-option.checked .dd-select-input-icon.radio::after {
+     content: '';
+     position: absolute;
+     top: 50%;
+     left: 50%;
+     width: 8px;
+     height: 8px;
+     border-radius: 50%;
+     background: #fff;
+     transform: translate(-50%, -50%);
+}
+
+.dd-select-input-option.checked .dd-select-input-icon.checkbox::after {
+     content: '';
+     position: absolute;
+     left: 5px;
+     top: 1px;
+     width: 5px;
+     height: 10px;
+     border: solid #fff;
+     border-width: 0 2px 2px 0;
+     transform: rotate(45deg);
+}
+
+.dd-select-input-option-text {
+     margin-right: 8px;
+     min-width: 32px;
+}
+
+.dd-select-input-text {
+     flex: 1;
+     min-width: 120px;
+     border: none;
+     border-bottom: 1px solid #ddd;
+     outline: none;
+     padding: 4px 2px;
+     font-size: 14px;
+     background-color: transparent;
+}
+
+.dd-select-input-text:disabled {
+     color: #333;
+     border-bottom-color: #eee;
+     cursor: not-allowed;
+}

package/package.json

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