@tddc/assign-modal 1.0.1 → 1.0.4

package/lib/AssignModal/AssignApp/index.js

@@ -57,6 +57,8 @@ var path = []; // 上级机构到当前机构的路径
 var allOrgList = [];
 
 var AssignModal = function AssignModal(props) {
+  var _dataItem$appCodes;
+
   var _props$orgList = props.orgList,
       orgList = _props$orgList === void 0 ? [] : _props$orgList,
       _props$dataItem = props.dataItem,
@@ -70,7 +72,7 @@ var AssignModal = function AssignModal(props) {
       checkedKeys = _useState2[0],
       setCheckedKeys = _useState2[1];
 
-  var _useState3 = (0, _react.useState)((dataItem === null || dataItem === void 0 ? void 0 : dataItem.appCodes) || []),
+  var _useState3 = (0, _react.useState)((dataItem === null || dataItem === void 0 ? void 0 : (_dataItem$appCodes = dataItem.appCodes) === null || _dataItem$appCodes === void 0 ? void 0 : _dataItem$appCodes.split(',')) || []),
       _useState4 = _slicedToArray(_useState3, 2),
       appKeys = _useState4[0],
       setAppKeys = _useState4[1];
@@ -90,12 +92,15 @@ var AssignModal = function AssignModal(props) {
   }
 
   (0, _react.useEffect)(function () {
+    var _dataItem$orgCodes, _dataItem$appCodes2;
+
     // path 和 allOrgList 赋值
     path = (0, _utils.findSameCodePath)(orgList[0], dataItem.orgCode);
     allOrgList = (0, _utils.preorder)(orgList[0]);
-    var initKeys = Array.from(new Set([].concat(_toConsumableArray((dataItem === null || dataItem === void 0 ? void 0 : dataItem.orgCodes) || []), _toConsumableArray(path))));
+    var initKeys = Array.from(new Set([].concat(_toConsumableArray((dataItem === null || dataItem === void 0 ? void 0 : (_dataItem$orgCodes = dataItem.orgCodes) === null || _dataItem$orgCodes === void 0 ? void 0 : _dataItem$orgCodes.split(',')) || []), _toConsumableArray(path))));
     setCheckedKeys(initKeys);
-  }, [dataItem.orgCode]);
+    setAppKeys((dataItem === null || dataItem === void 0 ? void 0 : (_dataItem$appCodes2 = dataItem.appCodes) === null || _dataItem$appCodes2 === void 0 ? void 0 : _dataItem$appCodes2.split(',')) || []);
+  }, [dataItem]);
   (0, _react.useEffect)(function () {
     // 机构和应用 全选
     if (appList.length > 0) {
@@ -161,6 +166,7 @@ var AssignModal = function AssignModal(props) {
 
     if (!info.node.isLeaf() && !info.node.checked) {
       var arr = (0, _utils.preorder)(info.node.props.item);
+      arr.splice(0, 1);
       arr.map(function (item) {
         var i = checked.findIndex(function (i) {
           return i === item;
@@ -176,7 +182,7 @@ var AssignModal = function AssignModal(props) {
     setCheckedKeys(checked);
     onChange && onChange({
       appKeys: appKeys,
-      checkedKeys: keys.checked
+      checkedKeys: checked
     });
   };
 
@@ -247,49 +253,26 @@ var AssignModal = function AssignModal(props) {
     className: "left"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "menu-header"
-  }, "\u6388\u6743\u53EF\u7528\u673A\u6784"), /*#__PURE__*/_react.default.createElement("div", {
-    className: "menu-header"
-  }, "\u673A\u6784\u5217\u8868", /*#__PURE__*/_react.default.createElement("div", {
+  }, "\u6388\u6743\u53EF\u7528\u673A\u6784\u5217\u8868", /*#__PURE__*/_react.default.createElement("div", {
     className: "menu-all-checked"
   }, /*#__PURE__*/_react.default.createElement(_checkbox.default, {
     onChange: checkAllOrg,
     checked: allOrgChecked,
     disabled: disabled
   }, "\u5168\u9009"))), /*#__PURE__*/_react.default.createElement(_tree.default, {
+    blockNode: true,
+    className: "tree-list",
     checkable: true,
-    defaultExpandedKeys: ['0-0-0', '0-0-1'],
-    defaultSelectedKeys: ['0-0-0', '0-0-1'],
-    defaultCheckedKeys: ['0-0-0', '0-0-1']
-  }, /*#__PURE__*/_react.default.createElement(TreeNode, {
-    title: "parent 1",
-    key: "0-0"
-  }, /*#__PURE__*/_react.default.createElement(TreeNode, {
-    title: "parent 1-0",
-    key: "0-0-0",
-    disabled: true
-  }, /*#__PURE__*/_react.default.createElement(TreeNode, {
-    title: "leaf",
-    key: "0-0-0-0"
-  }), /*#__PURE__*/_react.default.createElement(TreeNode, {
-    title: "leaf",
-    key: "0-0-0-1"
-  })), /*#__PURE__*/_react.default.createElement(TreeNode, {
-    title: "parent 1-1",
-    key: "0-0-1"
-  }, /*#__PURE__*/_react.default.createElement(TreeNode, {
-    title: /*#__PURE__*/_react.default.createElement("span", {
-      style: {
-        color: '#1890ff'
-      }
-    }, "sss"),
-    key: "0-0-1-0"
-  }))))), /*#__PURE__*/_react.default.createElement("div", {
+    checkStrictly: true,
+    checkedKeys: checkedKeys,
+    defaultExpandAll: true,
+    onCheck: onCheck,
+    disabled: disabled
+  }, loopTreeNodes(orgList))), /*#__PURE__*/_react.default.createElement("div", {
     className: "right"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "menu-header"
-  }, "\u6388\u6743\u53EF\u7528\u6E20\u9053"), /*#__PURE__*/_react.default.createElement("div", {
-    className: "menu-header"
-  }, "\u6E20\u9053\u5217\u8868", /*#__PURE__*/_react.default.createElement("div", {
+  }, "\u6388\u6743\u53EF\u7528\u6E20\u9053\u5217\u8868", /*#__PURE__*/_react.default.createElement("div", {
     className: "menu-all-checked"
   }, /*#__PURE__*/_react.default.createElement(_checkbox.default, {
     onChange: checkedAllApp,

package/lib/AssignModal/AssignApp/index.less

@@ -1,6 +1,6 @@
 .assign-box-container {
   display: flex;
-  min-height: 556px;
+  height: 550px;
   background-color: #fff;
   .menu-header {
     display: flex;
@@ -11,15 +11,12 @@
     color: #17233d;
     font-size: 14px;
     border-bottom: 1px solid #e1e6ee;
-
-    .menu-all-checked {
-    }
   }
 
   .left {
     position: relative;
     z-index: 1;
-    width: 420px;
+    width: 430px;
     background: #ffffff;
     box-shadow: 0px 0px 6px 0px rgba(58, 48, 48, 0.12);
     .tree-list {

package/lib/AssignModal/index.js

@@ -66,7 +66,7 @@ var AssignModal = function AssignModal(props) {
     className: "modelTool-assign",
     title: title,
     visible: visible,
-    width: '60%',
+    width: '65%',
     onCancel: close,
     onOk: submit,
     maskClosable: false,

package/lib/AssignModal/index.less

@@ -1,5 +1,6 @@
 .modelTool-assign {
   .ant-modal-body {
+    height: 550px;
     padding: 0;
     overflow: hidden;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tddc/assign-modal",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "Layout",
   "author": "zj <jun.zhang002383@tongdun.net>",
   "license": "ISC",
@@ -18,5 +18,5 @@
   "dependencies": {
     "jsencrypt": "^3.2.1"
   },
-  "gitHead": "d74d6c1689eeef1c769956a932a33234f86f0d7d"
+  "gitHead": "dc24855b156049b5700bf1c84f33bfda3c6c5791"
 }