@zgfe/modules-settings 2.0.0-zhongyuan.1 → 2.0.0-zhongyuan.4

package/es/modules/companySetting/user/index.js

@@ -401,12 +401,12 @@ var User = function User(props) {
     render: function render(data) {
       return /*#__PURE__*/React.createElement("div", {
         className: "operate"
-      }, /*#__PURE__*/React.createElement("a", {
+      }, authority[1000921] && (/*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           setMoveWorkModal(true);
           setCurrentRowData(data);
         }
-      }, "\u8F6C\u4EA4\u5DE5\u4F5C"), authority[10090] && /*#__PURE__*/React.createElement("a", {
+      }, "\u8F6C\u4EA4\u5DE5\u4F5C")), authority[10090] && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return showUserEditAuthEvent(data);
         }
@@ -644,7 +644,7 @@ var User = function User(props) {
       color: '#1890ff',
       marginRight: '6px'
     }
-  }), "\u6539\u529F\u80FD\u53EA\u4F1A\u8F6C\u4EA4\u8D44\u6E90\u7684\u6240\u5C5E\u5173\u7CFB\uFF0C\u4E0D\u4F1A\u8F6C\u4EA4\u8D26\u53F7\u7684\u6743\u9650"), /*#__PURE__*/React.createElement(Form, {
+  }), "\u8BE5\u529F\u80FD\u53EA\u4F1A\u8F6C\u4EA4\u8D44\u6E90\u7684\u6240\u5C5E\u5173\u7CFB\uFF0C\u4E0D\u4F1A\u8F6C\u4EA4\u8D26\u53F7\u7684\u6743\u9650"), /*#__PURE__*/React.createElement(Form, {
     form: form,
     labelCol: {
       span: 6

package/es/modules/messageList/index.js

@@ -73,8 +73,8 @@ var CreateProcess = function CreateProcess(props) {
       console.log(err);
     });
   };
-  var gotoPage = function gotoPage(businessId) {
-    var pageNmae = businessId === -1 ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/setting/systemSetting/createDemand?id=' + businessId;
+  var gotoPage = function gotoPage(businessId, content) {
+    var pageNmae = businessId === -1 ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : content.includes('埋点待测试') ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/setting/systemSetting/createDemand?id=' + businessId;
     window.open(pageNmae, '_blank');
     // const pageNmae = businessId === -1 ? routes.dataAccess.manage : routes.createDemand;
     // const currentPage =
@@ -166,7 +166,7 @@ var CreateProcess = function CreateProcess(props) {
           color: '#67727F'
         },
         onClick: function onClick() {
-          gotoPage(v.businessId);
+          gotoPage(v.businessId, v.content);
           props.onClose();
           // changeAllRead(v.id);
         }
@@ -189,7 +189,7 @@ var CreateProcess = function CreateProcess(props) {
       }, /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-content-list-item-title"),
         onClick: function onClick() {
-          gotoPage(v.businessId);
+          gotoPage(v.businessId, v.content);
           props.onClose();
           changeAllRead(v.id);
         }

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/package.json

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