@zgfe/modules-settings 1.2.9 → 1.2.10-scenes1.0.1

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

@@ -8,10 +8,11 @@ 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, notification } from 'antd';
+import { Button, Form, Input, Radio, notification } from 'antd';
 import request from './../../../utils/ajax';
 import api from './../../../constants/api';
-import { BizTable, BizDialog, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
+import { BizTable, BizDialog, BizGlobalDataContext, ajax, IconFont } from '@zgfe/business-lib';
+import { AppVersion } from '../../../types';
 var reworkAppName = function reworkAppName(name) {
   return name.length > 15 ? "".concat(name.substring(0, 15), "...") : name;
 };
@@ -262,6 +263,7 @@ var appList = function appList(props) {
     });
   };
   var onCreateConfirm = function onCreateConfirm() {
+    var _formRef$current2;
     if (inDemoMode()) {
       return;
     }
@@ -283,7 +285,8 @@ var appList = function appList(props) {
       method: 'post',
       data: {
         appName: appNameVal,
-        companyId: companyId
+        companyId: companyId,
+        appVersion: (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldValue('appVersion')
       }
     }).then(function (res) {
       if (!res) return;
@@ -319,9 +322,9 @@ var appList = function appList(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current2;
+      var _formRef$current3;
       setCreatedAppPanel(true);
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('appNameVal', '');
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('appNameVal', '');
     }
   }, "\u65B0\u5EFA\u5E94\u7528")), /*#__PURE__*/React.createElement(BizDialog, {
     title: "\u65B0\u5EFA\u5E94\u7528",
@@ -339,14 +342,27 @@ var appList = function appList(props) {
     className: "dialog-content"
   }, /*#__PURE__*/React.createElement(Form, {
     initialValues: {
-      appNameVal: ''
+      appNameVal: '',
+      appVersion: AppVersion.common
     },
     ref: formRef,
     onValuesChange: function onValuesChange() {
-      var _formRef$current3;
-      setAppNameVal((_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldValue('appNameVal'));
+      var _formRef$current4;
+      setAppNameVal((_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldValue('appNameVal'));
     }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+  }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement("div", {
+    className: "app-list-version-warning"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "tishi1"
+  }), "\u7248\u672C\u9009\u62E9\u540E\u65E0\u6CD5\u66F4\u6539\uFF0C\u8BF7\u8C28\u614E\u9009\u62E9")), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "appVersion"
+  }, /*#__PURE__*/React.createElement(Radio.Group, {
+    className: "app-version"
+  }, /*#__PURE__*/React.createElement(Radio, {
+    value: AppVersion.common
+  }, "\u901A\u7528\u7248\u672C"), /*#__PURE__*/React.createElement(Radio, {
+    value: AppVersion.bank
+  }, "\u57CE\u5546\u884C\u573A\u666F\u7248\u672C"))), /*#__PURE__*/React.createElement(Form.Item, {
     name: 'appNameVal'
   }, /*#__PURE__*/React.createElement(Input, {
     type: 'text',

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

@@ -62,4 +62,21 @@
       color: #000;
     }
   }
+  .app-version .ant-radio-wrapper {
+    margin-right: 48px !important;
+  }
+  &-version-warning {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    padding: 9px 16px;
+    color: #021429;
+    background-color: #e6f7ff;
+    border: 1px solid #91d5ff;
+    border-radius: 2px;
+    .bsicon {
+      color: #1890ff;
+      font-size: 14px;
+    }
+  }
 }

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

@@ -501,8 +501,7 @@ var User = function User(props) {
     dataSource: showMembers,
     columns: columns,
     total: showMembers.length,
-    rowKey: "id",
-    pageSize: showMembers.length / 10
+    rowKey: "id"
   }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
     style: {
       top: !showMembers.length ? -14 : -64

package/es/modules/companySetting/userGroup/authConfigDetail.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import './style/authConfigDetail.less';
 import { AppListItem, Config, LeftMenusItem } from '../../../types';
+import { UserInfo } from '@zgfe/business-lib/es/context';
 declare const authConfigDetail: React.FC<{
     name?: string;
     authConfig: Config;
@@ -9,6 +10,6 @@ declare const authConfigDetail: React.FC<{
     id?: number;
     groupId?: number;
     type: number;
-    serviceType: number;
+    serviceType: UserInfo['serviceType'];
 }>;
 export default authConfigDetail;

package/es/types/app.d.ts

@@ -1,4 +1,3 @@
-import { GlobalContextProps } from '@zgfe/business-lib/es/context';
 import { InterfaceApiResult } from '@zgfe/business-lib/es/utils/type';
 import { AppListItem, Config, LeftMenusItem } from './companySetting';
 export interface IResError {
@@ -119,22 +118,16 @@ export interface IConfigData {
     app_id: number;
     event_id: string[];
 }
-export interface IGlobalContext extends GlobalContextProps {
-    currentUser: {
-        id: number;
-        username: string;
-        email: string;
-        companyId: number;
-        companyName: string;
-        serviceType: number;
-        secret: string;
-        emailNote: string;
-        telphone: string;
-    };
-    envs: {
-        [propsName: string]: any;
-    };
-}
 export interface IEditVirtualSourceRes<T> extends InterfaceApiResult<T> {
     code: string;
 }
+export declare enum AppVersion {
+    /**
+     * 通用版本: 1
+     */
+    common = 1,
+    /**
+     * 城商行版本: 2
+     */
+    bank = 2
+}

package/es/types/app.js

@@ -1 +1,11 @@
-export {};
+export var AppVersion;
+(function (AppVersion) {
+  /**
+   * 通用版本: 1
+   */
+  AppVersion[AppVersion["common"] = 1] = "common";
+  /**
+   * 城商行版本: 2
+   */
+  AppVersion[AppVersion["bank"] = 2] = "bank";
+})(AppVersion || (AppVersion = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.9",
+  "version": "1.2.10-scenes1.0.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.62",
+    "@zgfe/business-lib": "1.1.80-dyq.6",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "897bb946a51c1a1ba0c82afdba1d3c18da3b79c2",
+  "gitHead": "cf817780bb436812a5f0dd8c9d446beb28a792d6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }