@zgfe/modules-settings 1.0.1-a.8 → 1.0.1-a.9

package/dist/esm/constants/icons/iconfont.css

@@ -1465,3 +1465,10 @@
   content: "\e6b7";
 }
 
+.qingchu:before {
+  /* content: "\e759"; */
+
+  content: "\e674";
+  
+}
+

package/dist/esm/modules/appSettings/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 declare const PersonalSetting: React.FC<{
     settingsCallback: (type: string) => void;
-    showVirtualApp: boolean;
 }>;
 export default PersonalSetting;

package/dist/esm/modules/appSettings/index.js

@@ -9,8 +9,7 @@ import { BizGlobalDataContext } from '@zgfe/business-lib';
 import SettingTabs from "../../components/settingTabs";
 import AppVirtualSource from "./virtualSource";
 var PersonalSetting = function PersonalSetting(props) {
-  var settingsCallback = props.settingsCallback,
-    showVirtualApp = props.showVirtualApp;
+  var settingsCallback = props.settingsCallback;
   // const [currentTab, setCurrentTab] = useState('1');
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
@@ -31,7 +30,7 @@ var PersonalSetting = function PersonalSetting(props) {
     key: '3',
     label: '配置数据源',
     content: /*#__PURE__*/React.createElement(AppVirtualSource, null),
-    hidden: !showVirtualApp
+    hidden: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appType) !== 'virtual'
   }, {
     key: '4',
     label: 'Secret Key',

package/dist/esm/modules/companySetting/edit/userGroup.js

@@ -59,7 +59,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     CEPData = _useState12[0],
     setCEPData = _useState12[1];
-  var _useState13 = useState('io'),
+  var _useState13 = useState(serviceType === 2 ? 'cep' : 'io'),
     _useState14 = _slicedToArray(_useState13, 2),
     currentTab = _useState14[0],
     setCurrentTab = _useState14[1];
@@ -158,7 +158,7 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
       return;
     }
     setBtnLoading(true);
-    var authConfig = refAuthConfig.current.getFormData();
+    var authConfig = serviceType !== 2 ? refAuthConfig.current.getFormData() : {};
     var userIdArr = user.map(function (item) {
       return item.id;
     });

package/dist/esm/modules/systemSetting/notice/edit/index.js

@@ -13,6 +13,13 @@ var ItemEdit = function ItemEdit(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var editSetting = props.editSetting,
+    editCancel = props.editCancel,
+    onSubmit = props.onSubmit;
+  var _useState = useState(editSetting.config),
+    _useState2 = _slicedToArray(_useState, 2),
+    initialValues = _useState2[0],
+    setInitialValues = _useState2[1];
   var settingsOptionsMap = new Map().set('email', {
     config: [{
       name: 'host',
@@ -63,17 +70,10 @@ var ItemEdit = function ItemEdit(props) {
       required: false
     }]
   });
-  var editSetting = props.editSetting,
-    editCancel = props.editCancel,
-    onSubmit = props.onSubmit;
-  var _useState = useState(editSetting.config),
-    _useState2 = _slicedToArray(_useState, 2),
-    initialValues = _useState2[0],
-    setInitialValues = _useState2[1];
 
   // 确认
-  var onFinish = function onFinish(values) {
-    onSubmit(values);
+  var onFinish = function onFinish() {
+    onSubmit(form.getFieldsValue());
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "item-edit-title"
@@ -102,16 +102,24 @@ var ItemEdit = function ItemEdit(props) {
       placeholder: config.placeholder,
       type: config.type === 'password' ? 'password' : 'text'
     })));
-  }))), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement(Col, {
+    span: 24,
     className: "operation-container"
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    htmlType: "submit"
-  }, "\u786E\u8BA4"), /*#__PURE__*/React.createElement(Button, {
-    htmlType: "submit",
-    onClick: function onClick() {
-      return editCancel();
-    }
-  }, "\u53D6\u6D88")));
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    shouldUpdate: true
+  }, function () {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      htmlType: "submit",
+      disabled: !!form.getFieldsError().filter(function (_ref) {
+        var errors = _ref.errors;
+        return errors.length;
+      }).length || JSON.stringify(initialValues) === JSON.stringify(form.getFieldsValue())
+    }, "\u786E\u8BA4"), /*#__PURE__*/React.createElement(Button, {
+      onClick: function onClick() {
+        return editCancel();
+      }
+    }, "\u53D6\u6D88"));
+  })))));
 };
 export default ItemEdit;

package/dist/esm/modules/systemSetting/notice/index.d.ts

@@ -1,3 +1,9 @@
 import React from 'react';
+import { ISystemSettingItem } from './edit';
+export interface IConfigItem {
+    name: string;
+    type: string;
+    config: ISystemSettingItem;
+}
 declare const Notice: React.FC;
 export default Notice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.0.1-a.8",
+  "version": "1.0.1-a.9",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -50,7 +50,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "31363d1290e14408ae32cd7ea4d35f37c1aeb5ca",
+  "gitHead": "46b6d784fa0b2a7e6789f520cc8ce1763e568218",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }