@zgfe/modules-settings 2.0.0-zhongyuan.0 → 2.0.0-zhongyuan.2

package/es/modules/pointMap/styles/tree.css

@@ -31,18 +31,18 @@
 }
 .setting-point-map-tree-search {
   position: relative;
-  margin-top: 16px;
   display: grid;
-  align-items: center;
-  grid-template-columns: 1fr 80px;
   grid-gap: 16px;
+  grid-template-columns: 1fr 20px;
+  align-items: center;
+  margin-top: 16px;
 }
 .setting-point-map-tree-search .qrcode-img {
   display: inline-flex;
   flex-direction: column;
   align-items: center;
   width: 200px;
-  min-height: 200px;
+  height: 200px;
   padding: 20px;
 }
 .setting-point-map-tree-search .qrcode-img > div {
@@ -57,6 +57,9 @@
   height: 144px;
   margin-top: 10px;
 }
+.setting-point-map-tree-search .ant-popover-placement-bottom .ant-popover-arrow {
+  left: 84% ;
+}
 .setting-point-map-tree-search .loading .ant-spin-nested-loading {
   padding-top: 138px;
 }

package/es/modules/pointMap/styles/tree.less

@@ -32,7 +32,7 @@
     position: relative;
     display: grid;
     grid-gap: 16px;
-    grid-template-columns: 1fr 80px;
+    grid-template-columns: 1fr 20px;
     align-items: center;
     margin-top: 16px;
     .qrcode-img {
@@ -40,7 +40,7 @@
       flex-direction: column;
       align-items: center;
       width: 200px;
-      min-height: 200px;
+      height: 200px;
       padding: 20px;
       > div {
         text-align: center;
@@ -55,6 +55,9 @@
         margin-top: 10px;
       }
     }
+    .ant-popover-placement-bottom .ant-popover-arrow {
+      left: 84%;
+    }
     .loading {
       .ant-spin-nested-loading {
         padding-top: 138px;

package/es/modules/pointMap/tree.js

@@ -597,11 +597,13 @@ var pointMap = function pointMap(props) {
     popupClassName: "".concat(classPrefix, "-search-popup")
   }), /*#__PURE__*/React.createElement(IconFont, {
     type: "sousuo"
-  })), /*#__PURE__*/React.createElement(Popover, {
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-search-pop")
+  }, /*#__PURE__*/React.createElement(Popover, {
     open: qrCodeShareShow,
     content: /*#__PURE__*/React.createElement("div", {
       className: "".concat(qrCodeLoading ? 'loading' : '', " qrcode-img")
-    }, /*#__PURE__*/React.createElement("div", null, "\u624B\u673A\u626B\u7801\u5206\u4EAB\u5F53\u524D\u770B\u677F"), /*#__PURE__*/React.createElement(Spin, {
+    }, /*#__PURE__*/React.createElement("div", null, "\u624B\u673A\u626B\u7801\u67E5\u770B\u57CB\u70B9\u5730\u56FE"), /*#__PURE__*/React.createElement(Spin, {
       spinning: qrCodeLoading
     }, qrCodeShare && /*#__PURE__*/React.createElement("img", {
       src: qrCodeShare
@@ -615,8 +617,8 @@ var pointMap = function pointMap(props) {
   }, /*#__PURE__*/React.createElement("div", {
     id: "share-qrcode-box"
   }, /*#__PURE__*/React.createElement(IconFont, {
-    type: "daochu"
-  }), "\u5206\u4EAB\u770B\u677F"))), /*#__PURE__*/React.createElement("div", {
+    type: "erweima"
+  }))))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tree")
   }, treeData && treeData.length ? (/*#__PURE__*/React.createElement(Tree, {
     ref: treeRef,

package/es/modules/systemSetting/Dictionary.js

@@ -71,7 +71,7 @@ var Dictionary = function Dictionary() {
                   }, o);
                 });
                 setDictionaryList(newArr);
-                setCurrentTypeId(function () {
+                newArr && newArr.length > 0 && setCurrentTypeId(function () {
                   getDictionaryContentList(newArr[0].key, searchValue);
                   return newArr[0].key;
                 });

package/es/modules/systemSetting/document-setting/index.js

@@ -53,11 +53,14 @@ var DocumentSetting = function DocumentSetting() {
   var _useContext = useContext(BizGlobalDataContext),
     projectList = _useContext.projectList,
     currentUser = _useContext.currentUser;
-  console.log(currentUser, 'currentUser');
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     documentList = _useState2[0],
     setDocumentList = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    newDocumentList = _useState4[0],
+    setNewDocumentList = _useState4[1];
   var currentObj = useRef();
   var columns = [{
     title: '序号',
@@ -162,27 +165,27 @@ var DocumentSetting = function DocumentSetting() {
       }
     });
   };
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    documentFlagLoading = _useState4[0],
-    setDocumentFlagLoading = _useState4[1];
-  var _useState5 = useState(''),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchValue = _useState6[0],
-    setSearchValue = _useState6[1];
-  // 文件上传
-  var _useState7 = useState(false),
+    documentFlagLoading = _useState6[0],
+    setDocumentFlagLoading = _useState6[1];
+  var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
-    isOpenUploadModal = _useState8[0],
-    setIsOpenUploadModal = _useState8[1];
+    searchValue = _useState8[0],
+    setSearchValue = _useState8[1];
+  // 文件上传
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isOpenUploadModal = _useState10[0],
+    setIsOpenUploadModal = _useState10[1];
   var handleValueCancel = function handleValueCancel() {
     setIsOpenUploadModal(false);
     setDocumentFlagLoading(false);
   };
-  var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    fileList = _useState10[0],
-    setFileList = _useState10[1];
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    fileList = _useState12[0],
+    setFileList = _useState12[1];
   var props = {
     name: 'file',
     multiple: true,
@@ -220,26 +223,26 @@ var DocumentSetting = function DocumentSetting() {
     });
   };
   // 共享  分享类型 1指定应用 2指定成员 3仅自己 4所有成员
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isOpenShareModal = _useState12[0],
-    setIsOpenShareModal = _useState12[1];
-  var _useState13 = useState(),
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    currentShareType = _useState14[0],
-    setCurrentShareType = _useState14[1];
-  var _useState15 = useState([]),
+    isOpenShareModal = _useState14[0],
+    setIsOpenShareModal = _useState14[1];
+  var _useState15 = useState(4),
     _useState16 = _slicedToArray(_useState15, 2),
-    adminOptionList = _useState16[0],
-    setAdminOptionList = _useState16[1]; // 成员列表
+    currentShareType = _useState16[0],
+    setCurrentShareType = _useState16[1];
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
-    currentAppArr = _useState18[0],
-    setCurrentAppArr = _useState18[1]; // 选中的应用id
+    adminOptionList = _useState18[0],
+    setAdminOptionList = _useState18[1]; // 成员列表
   var _useState19 = useState([]),
     _useState20 = _slicedToArray(_useState19, 2),
-    currentUserArr = _useState20[0],
-    setCurrentUserArr = _useState20[1]; // 选中的成员id
+    currentAppArr = _useState20[0],
+    setCurrentAppArr = _useState20[1]; // 选中的应用id
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    currentUserArr = _useState22[0],
+    setCurrentUserArr = _useState22[1]; // 选中的成员id
   var handleShareCancel = function handleShareCancel() {
     setIsOpenShareModal(false);
     setCurrentUserArr([]);
@@ -312,7 +315,12 @@ var DocumentSetting = function DocumentSetting() {
       setDocumentFlagLoading(false);
     });
   };
-  // end
+  useEffect(function () {
+    var searchList = searchValue ? documentList.filter(function (o) {
+      return o.name.includes(searchValue);
+    }) : documentList;
+    setNewDocumentList(searchList);
+  }, [documentList, searchValue]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(pageName),
     id: "DocumentSetting1",
@@ -346,9 +354,9 @@ var DocumentSetting = function DocumentSetting() {
     value: searchValue,
     onChange: function onChange(e) {
       (e === null || e === void 0 ? void 0 : e.target) && setSearchValue(function () {
-        var _e$target, _e$target2;
-        getFileList(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
-        return e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value;
+        var _e$target;
+        // getFileList(e?.target?.value);
+        return e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
       });
     }
   }), /*#__PURE__*/React.createElement(Button, {
@@ -357,9 +365,10 @@ var DocumentSetting = function DocumentSetting() {
       return setIsOpenUploadModal(true);
     }
   }, "\u4E0A\u4F20")), /*#__PURE__*/React.createElement(Table, {
+    key: 'id',
     columns: columns,
     loading: documentFlagLoading,
-    dataSource: documentList,
+    dataSource: newDocumentList,
     pagination: false
   }))), /*#__PURE__*/React.createElement(Modal, {
     title: "\u4E0A\u4F20",

package/es/modules/systemSetting/index.js

@@ -9,6 +9,7 @@ import { DesktopOutlined } from '@ant-design/icons';
 import Notice from './notice';
 import Approvalmanage from './approvalmanage';
 import SettingTabs from '../../components/settingTabs';
+import Dictionary from './Dictionary';
 import { DemoManage } from '@zgfe/modules-demo-manage';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import CreateProcess from '../createProcess';
@@ -72,13 +73,11 @@ var SystemSetting = function SystemSetting(_ref) {
     key: '5',
     label: '接口管理',
     content: /*#__PURE__*/React.createElement(AuthUrl, null)
-  },
-  // {
-  //   key: '6',
-  //   label: '字典管理',
-  //   content: <Dictionary />,
-  // },
-  {
+  }, {
+    key: '6',
+    label: '字典管理',
+    content: /*#__PURE__*/React.createElement(Dictionary, null)
+  }, {
     key: '7',
     label: '文档库',
     content: /*#__PURE__*/React.createElement(DocumentSetting, null)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.0",
+  "version": "2.0.0-zhongyuan.2",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",