@zgfe/modules-settings 1.2.12 → 1.2.13-alpha.1

package/es/global.d.ts

@@ -1,4 +1,4 @@
-interface Window {
-  __POWERED_BY_QIANKUN__?: any;
-  __INJECTED_PUBLIC_PATH_BY_QIANKUN__?: any;
-}
+interface Window {
+  __POWERED_BY_QIANKUN__?: any;
+  __INJECTED_PUBLIC_PATH_BY_QIANKUN__?: any;
+}

package/es/modules/appSettings/dataAccessFilter/index.less

@@ -1,5 +1,5 @@
-.explain {
-  margin-left: 12px;
-  color: #b2b2b2;
-  font-size: 12px;
-}
+.explain {
+  margin-left: 12px;
+  color: #b2b2b2;
+  font-size: 12px;
+}

package/es/modules/appSettings/member/index.less

@@ -1,18 +1,18 @@
-.seting-modal-box {
-  .ant-modal-header {
-    padding: 24px 24px 8px 24px !important;
-    font-size: 24px;
-  }
-  .ant-modal-body {
-    height: 60vh;
-    padding: 0px 24px !important;
-  }
-  .ant-modal-footer {
-    display: none;
-  }
-  .ant-modal-close-x {
-    margin: 10px 10px 0 0;
-    color: #242541;
-    font-size: 20px;
-  }
-}
+.seting-modal-box {
+  .ant-modal-header {
+    padding: 24px 24px 8px 24px !important;
+    font-size: 24px;
+  }
+  .ant-modal-body {
+    height: 60vh;
+    padding: 0px 24px !important;
+  }
+  .ant-modal-footer {
+    display: none;
+  }
+  .ant-modal-close-x {
+    margin: 10px 10px 0 0;
+    color: #242541;
+    font-size: 20px;
+  }
+}

package/es/modules/appSettings/virtualSource/styles/index.less

@@ -1,28 +1,28 @@
-@import url(./table.less);
-
-.app-setting-virtual-source {
-  height: 100%;
-  min-height: 120px;
-  padding: 20px;
-  overflow: auto;
-
-  .source-app-list {
-    width: 100%;
-    height: auto;
-
-    .source-app-name {
-      display: inline-block;
-      width: 354px;
-      margin-left: 10px;
-
-      .source-app-events-num {
-        display: inline-block;
-        // margin-left: 10px;
-
-        .empty-data {
-          line-height: 47px;
-        }
-      }
-    }
-  }
-}
+@import url(./table.less);
+
+.app-setting-virtual-source {
+  height: 100%;
+  min-height: 120px;
+  padding: 20px;
+  overflow: auto;
+
+  .source-app-list {
+    width: 100%;
+    height: auto;
+
+    .source-app-name {
+      display: inline-block;
+      width: 354px;
+      margin-left: 10px;
+
+      .source-app-events-num {
+        display: inline-block;
+        // margin-left: 10px;
+
+        .empty-data {
+          line-height: 47px;
+        }
+      }
+    }
+  }
+}

package/es/modules/appSettings/virtualSource/styles/table.less

@@ -1,51 +1,51 @@
-.virtual-app-table-box {
-  display: flex;
-  flex-direction: column;
-  // width: 100%;
-  font-size: 14px;
-  border: 1px solid #dadada;
-
-  .table-title {
-    display: flex;
-    flex-shrink: 0;
-    // padding: 0 20px;
-    box-sizing: border-box;
-    height: 32px;
-    color: #565656;
-    font-size: 0;
-    line-height: 32px;
-    background: #e6e6e6;
-
-    > div,
-    > span {
-      display: inline-block;
-      //   margin-left: 10px;
-      font-size: 14px;
-
-      .table-body {
-        min-height: 47px;
-        padding: 0 20px;
-
-        .empty-data {
-          text-align: center;
-
-          > div,
-          > span {
-            border-bottom: 1px solid #eeeeee;
-
-            > div,
-            > span {
-              display: inline-block;
-              margin-left: 10px;
-              font-size: 14px;
-
-              &:last-child {
-                border: none;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
+.virtual-app-table-box {
+  display: flex;
+  flex-direction: column;
+  // width: 100%;
+  font-size: 14px;
+  border: 1px solid #dadada;
+
+  .table-title {
+    display: flex;
+    flex-shrink: 0;
+    // padding: 0 20px;
+    box-sizing: border-box;
+    height: 32px;
+    color: #565656;
+    font-size: 0;
+    line-height: 32px;
+    background: #e6e6e6;
+
+    > div,
+    > span {
+      display: inline-block;
+      //   margin-left: 10px;
+      font-size: 14px;
+
+      .table-body {
+        min-height: 47px;
+        padding: 0 20px;
+
+        .empty-data {
+          text-align: center;
+
+          > div,
+          > span {
+            border-bottom: 1px solid #eeeeee;
+
+            > div,
+            > span {
+              display: inline-block;
+              margin-left: 10px;
+              font-size: 14px;
+
+              &:last-child {
+                border: none;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -8,7 +8,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import './index.less';
 import util from './../../../utils/util';
-import { Button, Form, Input, Radio, notification } from 'antd';
+import { Button, Form, Input, Radio, notification, Switch } from 'antd';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
 import { BizTable, BizDialog, BizGlobalDataContext, ajax, IconFont } from '@zgfe/business-lib';
@@ -72,6 +72,7 @@ var appList = function appList(props) {
     setCepAppList = _useState12[1];
   var formRef = useRef();
   useEffect(function () {
+    console.log(companyRealAppList, 'companyRealAppList');
     if (system === 'CEP') {
       request(api.setting.queryAppList, {
         method: 'post'
@@ -82,6 +83,45 @@ var appList = function appList(props) {
       });
     }
   }, []);
+  // 处理开关状态变更
+  var handleSwitchChange = function handleSwitchChange(checked, record) {
+    var data = {
+      appKey: record.appKey,
+      appId: record.id,
+      isOpen: checked ? 1 : 0,
+      appName: record.appName
+    };
+    request(api.setting.updateAppName, {
+      method: 'post',
+      params: data
+    }).then(function () {
+      notification.success({
+        message: '状态更新成功'
+      });
+      var cloneAuthConfig = util.clone(authConfig);
+      if (!(cloneAuthConfig.dataAuth.length === 1 && cloneAuthConfig.dataAuth[0].appId === 0)) {
+        var index = cloneAuthConfig.dataAuth.findIndex(function (item) {
+          return item.appId === delAppId;
+        });
+        cloneAuthConfig.dataAuth.splice(index, 1);
+      }
+      var formData = {
+        userId: id,
+        authConfig: JSON.stringify(cloneAuthConfig),
+        groupIds: findGroups().join(',')
+      };
+      var hasAuthApplistByDel = companyRealAppList.filter(function (item) {
+        return item.id !== delAppId;
+      });
+      var appId = hasAuthApplistByDel.length ? hasAuthApplistByDel[0].id : 0;
+      // 通知数据刷新
+      delAppCallback(formData, appId);
+    }).catch(function (err) {
+      notification.error({
+        message: '状态更新失败'
+      });
+    });
+  };
   // #todo isAdmin 需要添加
   var columns = [{
     title: '应用名称',
@@ -114,6 +154,21 @@ var appList = function appList(props) {
       // const data = res[1];
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, "appId: ", data.id), /*#__PURE__*/React.createElement("p", null, "appKey: ", data.appKey), showAppAlias(data) ? /*#__PURE__*/React.createElement("p", null, "\u6240\u5C5E\u4EA7\u54C1\uFF1A", data.appAlias) : null);
     }
+  }, {
+    title: '开关',
+    dataIndex: 'isOpen',
+    // render: (data: AppListItem) => (
+    render: function render(_, data) {
+      return /*#__PURE__*/React.createElement(Switch, {
+        checked: data.isOpen,
+        // onChange={handleSwitchChange(data)}
+        onChange: function onChange(checked) {
+          return handleSwitchChange(checked, data);
+        },
+        checkedChildren: "\u5F00\u542F",
+        unCheckedChildren: "\u5173\u95ED"
+      });
+    }
   }, {
     title: '操作',
     render: function render(data) {
@@ -162,6 +217,7 @@ var appList = function appList(props) {
     }
   };
   var showDelPanel = function showDelPanel(data) {
+    console.log(data, 'data');
     if (isAdmin && !checkAppAuth(data.id)) {
       notification.error({
         message: '删除失败，无权限'
@@ -287,7 +343,8 @@ var appList = function appList(props) {
       data: {
         appName: appNameVal,
         companyId: companyId,
-        appVersion: (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldValue('appVersion')
+        appVersion: (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldValue('appVersion'),
+        isOpen: 1
       }
     }).then(function (res) {
       if (!res) return;

package/es/modules/companySetting/appList/index.less

@@ -1,100 +1,100 @@
-@import './../../../constants/icons/iconfont.css';
-.app-list {
-  height: 100%;
-  padding: 0;
-  overflow: auto;
-  .applist-head {
-    .c-button {
-      margin-right: 20px;
-    }
-  }
-  .app-list-content {
-    margin-top: 20px;
-  }
-  .platform-icons {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    width: 100%;
-    span {
-      margin-right: 10px;
-      color: #cfcfcf;
-      font-size: 16px;
-    }
-  }
-  .app-list-content {
-    .c-grid-cell,
-    .c-grid-header-cell {
-      text-align: left !important;
-      border: none;
-      border-bottom: 1px solid #d1d1d1;
-    }
-    .c-grid-cell {
-      text-align: left !important;
-    }
-    .c-grid-body .c-grid-row:nth-child(2n) {
-      background: #fff !important;
-    }
-    .app-name {
-      cursor: pointer;
-      &:hover {
-        color: #00a0ea;
-      }
-    }
-    .operating {
-      span {
-        color: #00a0ea;
-        cursor: pointer;
-      }
-      span.icon-delete {
-        margin-left: 10px;
-        color: #cfcfcf;
-        &:hover {
-          color: #00a0ea;
-        }
-      }
-    }
-  }
-  .dialog-content {
-    color: #858585;
-    .c-input {
-      margin-bottom: 20px;
-      color: #000;
-    }
-  }
-  .app-version .ant-radio-wrapper {
-    margin-right: 48px !important;
-  }
-  &-version-warning {
-    display: flex;
-    gap: 10px;
-    align-items: center;
-    height: 32px;
-    padding: 0 16px;
-    color: #021429;
-    background-color: #e6f7ff;
-    border: 1px solid #91d5ff;
-    border-radius: 2px;
-    .bsicon {
-      color: #1890ff;
-      font-size: 14px;
-    }
-  }
-  &-create-app .ant-modal-header {
-    padding-bottom: 0 !important;
-  }
-
-  &-form-item.ant-form-item {
-    margin-bottom: 16px !important;
-  }
-  &-desc {
-    li {
-      padding-left: 4px;
-      color: #9aa1a9;
-      &::before {
-        margin-right: 8px;
-        content: '•';
-      }
-    }
-  }
-}
+@import './../../../constants/icons/iconfont.css';
+.app-list {
+  height: 100%;
+  padding: 0;
+  overflow: auto;
+  .applist-head {
+    .c-button {
+      margin-right: 20px;
+    }
+  }
+  .app-list-content {
+    margin-top: 20px;
+  }
+  .platform-icons {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    width: 100%;
+    span {
+      margin-right: 10px;
+      color: #cfcfcf;
+      font-size: 16px;
+    }
+  }
+  .app-list-content {
+    .c-grid-cell,
+    .c-grid-header-cell {
+      text-align: left !important;
+      border: none;
+      border-bottom: 1px solid #d1d1d1;
+    }
+    .c-grid-cell {
+      text-align: left !important;
+    }
+    .c-grid-body .c-grid-row:nth-child(2n) {
+      background: #fff !important;
+    }
+    .app-name {
+      cursor: pointer;
+      &:hover {
+        color: #00a0ea;
+      }
+    }
+    .operating {
+      span {
+        color: #00a0ea;
+        cursor: pointer;
+      }
+      span.icon-delete {
+        margin-left: 10px;
+        color: #cfcfcf;
+        &:hover {
+          color: #00a0ea;
+        }
+      }
+    }
+  }
+  .dialog-content {
+    color: #858585;
+    .c-input {
+      margin-bottom: 20px;
+      color: #000;
+    }
+  }
+  .app-version .ant-radio-wrapper {
+    margin-right: 48px !important;
+  }
+  &-version-warning {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    height: 32px;
+    padding: 0 16px;
+    color: #021429;
+    background-color: #e6f7ff;
+    border: 1px solid #91d5ff;
+    border-radius: 2px;
+    .bsicon {
+      color: #1890ff;
+      font-size: 14px;
+    }
+  }
+  &-create-app .ant-modal-header {
+    padding-bottom: 0 !important;
+  }
+
+  &-form-item.ant-form-item {
+    margin-bottom: 16px !important;
+  }
+  &-desc {
+    li {
+      padding-left: 4px;
+      color: #9aa1a9;
+      &::before {
+        margin-right: 8px;
+        content: '•';
+      }
+    }
+  }
+}

package/es/modules/companySetting/cost/index.less

@@ -1,31 +1,31 @@
-@import './../../../constants/icons/iconfont.css';
-.company-setting-cost {
-  min-height: 400px;
-  max-height: 100%;
-  padding: 0;
-  overflow: auto;
-  h5 {
-    font-weight: normal;
-    font-size: 14px;
-  }
-  table {
-    width: 100%;
-    margin: 15px 0 40px 0;
-    border-collapse: collapse;
-    thead {
-      color: #636363;
-      font-weight: bold;
-      font-size: 14px;
-      background: #fbfbfb;
-    }
-    td,
-    th {
-      padding: 10px 15px;
-      text-align: center;
-      border: 1px solid #cecece;
-    }
-    td {
-      height: 50px;
-    }
-  }
-}
+@import './../../../constants/icons/iconfont.css';
+.company-setting-cost {
+  min-height: 400px;
+  max-height: 100%;
+  padding: 0;
+  overflow: auto;
+  h5 {
+    font-weight: normal;
+    font-size: 14px;
+  }
+  table {
+    width: 100%;
+    margin: 15px 0 40px 0;
+    border-collapse: collapse;
+    thead {
+      color: #636363;
+      font-weight: bold;
+      font-size: 14px;
+      background: #fbfbfb;
+    }
+    td,
+    th {
+      padding: 10px 15px;
+      text-align: center;
+      border: 1px solid #cecece;
+    }
+    td {
+      height: 50px;
+    }
+  }
+}

package/es/modules/companySetting/edit/styles/authConfig.less

@@ -1,3 +1,3 @@
-.company-setting-auth-config {
-  margin: 0 20px;
-}
+.company-setting-auth-config {
+  margin: 0 20px;
+}

package/es/modules/companySetting/edit/styles/authGroup.less

@@ -1,10 +1,10 @@
-.company-auth-group {
-  position: relative;
-  .company-auth-group-top {
-    height: 36px;
-    margin-top: 20px;
-    padding: 0 20px;
-    line-height: 36px;
-    background-color: #f3f8fa;
-  }
-}
+.company-auth-group {
+  position: relative;
+  .company-auth-group-top {
+    height: 36px;
+    margin-top: 20px;
+    padding: 0 20px;
+    line-height: 36px;
+    background-color: #f3f8fa;
+  }
+}