Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

env.js

@@ -117,4 +117,27 @@ module.exports = {
       forcePasv: true
     })
   },
+  v2Preview: {
+    SITE_ID: '1',
+    BACK_GATEWAY: 'http://10.0.1.220:8100',
+    USE_ROUTE_CONFIG: true,
+    SOCKET_URL: 'ws://10.0.1.220:8100',
+    ssh: JSON.stringify({
+      user: "root",
+      // Password optional, prompted if none given
+      password: "Shushangyun520",
+      host: "10.0.1.220",
+      port: 22,
+      localRoot: path.resolve('./dist/'),
+      remoteRoot: "/home/www/lingxi/lingxi-business-system/dist/",
+      // include: ["*", "**/*"],      // this would upload everything except dot files
+      include: ["*"],
+      // e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
+      // exclude: ["dist/**/*.map", "node_modules/**", "node_modules/**/.*", ".git/**"],
+      // delete ALL existing files at destination before uploading, if true
+      deleteRemote: true,
+      // Passive mode is forced (EPSV command is not sent)
+      forcePasv: true
+    })
+  },
 }

package.json

@@ -7,6 +7,7 @@
     "upload:10": "cross-env local=10 taskName=upload yarn scripts:build",
     "upload:25": "cross-env local=25 taskName=upload yarn scripts:build",
     "upload:v2": "cross-env local=v2 taskName=upload yarn scripts:build",
+    "upload:v2Preview": "cross-env local=v2Preview taskName=upload yarn scripts:build",
     "upload:study": "cross-env local=study taskName=upload yarn scripts:build",
     "api": "god-ytt",
     "start:analyze": "ANALYZE=1 umi dev",
@@ -23,6 +24,7 @@
     "build:all": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn build",
     "build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 SOCKET_URL=ws://10.0.0.10:9400 yarn build",
     "build:v2": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.17:8100 SOCKET_URL=ws://10.0.0.17:9400 yarn build",
+    "build:v2Preview": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.220:8100 SOCKET_URL=ws://10.0.1.220:9400 yarn build",
     "build:25": "cross-env SITE_ID=352 BACK_GATEWAY=http://10.0.0.25:8100 SOCKET_URL=ws://10.0.0.25:9400 yarn build",
     "build:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 SOCKET_URL=ws://10.0.1.207:9400 yarn build",
     "postinstall": "umi generate tmp",

src/components/NiceForm/index.tsx

-import React from 'react';
+import React, { useEffect } from 'react';
 import SchemaForm, {
   IAntdSchemaFormProps, createVirtualBox, registerVirtualBox, Schema, SchemaField, FormButtonGroup, Reset, createControllerBox, registerValidationRules,
 } from '@formily/antd';
@@ -28,6 +28,7 @@ import DateRangePickerUnix from './components/DateRangePickerUnix';
 import SmilingFace from './components/SmilingFace';
 import AntUpload from './components/AntUpload';
 import './index.less'
+import { currentStateType, getCurrentState } from './utils/keepAlive';
 
 export interface NiceFormProps extends IAntdSchemaFormProps {}
 
@@ -104,6 +105,14 @@ const NiceForm: React.FC<NiceFormProps> = props => {
 
   const defineComponents = Object.assign(componentExport, components);
 
+  useEffect(() => {
+    let paginationInfo: currentStateType = getCurrentState();
+    // @ts-ignore
+    reset.actions.setFormState(
+      state => (state.values = paginationInfo.queryParams),
+    );
+  }, [])
+
   return (
     <SchemaForm colon={false} components={defineComponents} {...reset}>
       {children}

src/components/NiceForm/utils/keepAlive.ts

+import { get, set, remove } from './session';
+
+const STATE_KEY = 'currentState';
+
+export interface currentStateType {
+  pathname: string;
+  current: number;
+  pageSize: number;
+  queryParams: any;
+}
+
+/**
+ * 保存表格状态
+ * @param current
+ * @param pageSize
+ */
+export const saveCurrentState = (
+  current: number,
+  pageSize: number,
+  queryParams?: any,
+) => {
+  let currentPage = get(STATE_KEY);
+  set(
+    STATE_KEY,
+    Object.assign(currentPage ? currentPage : {}, {
+      pathname: window.location.pathname,
+      current,
+      pageSize,
+      queryParams,
+    }),
+  );
+};
+
+/**
+ * 获取表格状态数据
+ */
+export const getCurrentState = () => {
+  return get(STATE_KEY);
+};
+
+/**
+ * 清除表格状态数据
+ */
+export const clearCurrentState = () => {
+  return remove(STATE_KEY);
+};

src/components/NiceForm/utils/session.ts

+export const get = key => {
+  let result;
+  result = sessionStorage.getItem(key);
+  if (result) {
+    if (isJSON(result)) {
+      result = JSON.parse(result);
+    }
+    return result;
+  }
+
+  return undefined;
+};
+
+export const set = (key, value) => {
+  if (typeof value === 'object') {
+    value = JSON.stringify(value);
+  }
+  sessionStorage.setItem(key, value);
+};
+
+export const remove = key => {
+  sessionStorage.removeItem(key);
+};
+
+const isJSON = str => {
+  if (typeof str === 'string') {
+    try {
+      var obj = JSON.parse(str);
+      if (typeof obj === 'object' && obj) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (e) {
+      return false;
+    }
+  }
+};

src/layouts/RightContent.tsx

@@ -70,7 +70,7 @@ const RightContent: React.FC<{}> = (props) => {
   const webSocketInit = useCallback(() => {
     console.log(ws.current)
     if (SOCKET_URL && /ws\:\/\//.test(SOCKET_URL) && (!ws.current || ws.current.readyState === 3) && userInfo) {
-      const url = `${SOCKET_URL}/report/websocket?memberId=${userInfo.memberId}&roleId=${userInfo.MemberManageRoleId}&token=${userInfo.token}&source=${99}`
+      const url = `${SOCKET_URL}/report/websocket?memberId=${userInfo.memberId}&roleId=${userInfo.memberId}&token=${userInfo.token}&source=${99}`
       ws.current = new WebSocket(url);
       ws.current.onopen = (e) => {
         console.log(e)

src/pages/authConfig/memberSystem/index.tsx

@@ -27,7 +27,7 @@ const MemberSystem: React.FC<{}> = () => {
   const deleteItem = async (record) => {
     // 删除该项
     await PublicApi.postMemberManageRoleDelete({
-      MemberManageRoleId: record.id
+      memberRoleId: record.id
     })
     ref.current.reload()
   }

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -71,7 +71,7 @@ const MemberDetail: React.FC<{}> = () => {
   const fetchRoleMenuDetail = async (id) => {
     // 10秒缓存
     const res = await PublicApi.getMemberManageRoleGet({
-      MemberManageRoleId: id
+      memberRoleId: id
     }, { useCache: true, ttl: 10 * 1000 })
     return res
   }
@@ -108,7 +108,7 @@ const MemberDetail: React.FC<{}> = () => {
       if (pageStatus === PageStatus.EDIT) {
         await PublicApi.postMemberManageRoleUpdate({
           ...values,
-          MemberManageRoleId: id,
+          memberRoleId: id,
           menuIds
         })
       } else {

src/pages/authConfig/userSystem/schema/index.ts

@@ -156,7 +156,7 @@ export const UserDetailSchema:ISchema = {
           type: 'string',
           visible: false
         },
-        MemberManageRoleIds: {
+        memberRoleIds: {
           type: 'array:string',
           "x-component": 'tableTagList',
           "x-component-props": {

src/pages/authConfig/userSystem/userDetail.tsx

@@ -55,7 +55,7 @@ const AddUser: React.FC<{}> = () => {
       }).then(async res => {
         const { data } = res
         fetchOriginTreeData().then(({data: dataSource}) => {
-          setFormData({...data, orgName: getParentTreeTitles(dataSource, data.orgId), MemberManageRoleIds: data.memberRoleIds.map((v,i) => {
+          setFormData({...data, orgName: getParentTreeTitles(dataSource, data.orgId), memberRoleIds: data.memberRoleIds.map((v,i) => {
             return {
               id: v,
               roleName: data.memberRoleNames[i]
@@ -67,7 +67,7 @@ const AddUser: React.FC<{}> = () => {
   }, [])
 
   const onFinish = async (values:any) => {
-    values.MemberManageRoleIds = values.MemberManageRoleIds.map(v => v.id)
+    values.memberRoleIds = values.memberRoleIds.map(v => v.id)
     values.password = encryptedByAES(values.password)
     const omitValue = omit(values, ['orgName'])
     const params = id ? {
@@ -83,7 +83,7 @@ const AddUser: React.FC<{}> = () => {
   // 角色确认弹窗
   const roleConfirm = () => {
     setRoleVisible(false)
-    userActions.setFieldValue('MemberManageRoleIds', roleSelectCtl.selectRow)
+    userActions.setFieldValue('memberRoleIds', roleSelectCtl.selectRow)
   }
   const handleSelectCancel = () => {
     setRoleVisible(false)
@@ -91,7 +91,7 @@ const AddUser: React.FC<{}> = () => {
 
   const handleRoleBtn = () => {
     setRoleVisible(true)
-    const selectRoles = userActions.getFieldValue('MemberManageRoleIds')
+    const selectRoles = userActions.getFieldValue('memberRoleIds')
     roleSelectCtl.setSelectRow(selectRoles)
     roleSelectCtl.setSelectedRowKeys(selectRoles.map(v => v.id))
   }

src/pages/capitalAccount/accountLists/index.tsx

@@ -125,7 +125,7 @@ const AccountLists: React.FC<{}> = () => {
 
       return {
         memberType: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
-        MemberManageRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
+        memberRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
         memberLevel: levels.map(item => ({ label: item.levelTag, value: item.level })),
       }
     }
@@ -169,7 +169,7 @@ const AccountLists: React.FC<{}> = () => {
                   FORM_FILTER_PATH,
                 );
                 useAsyncInitSelect(
-                  ['memberType', 'MemberManageRoleId', 'memberLevel'],
+                  ['memberType', 'memberRoleId', 'memberLevel'],
                   fetchSelectOptions,
                 );
               }}

src/pages/capitalAccount/accountLists/schema/index.ts

@@ -48,7 +48,7 @@ export const searchSchema: ISchema = {
                 }
               }
             },
-            MemberManageRoleId: {
+            memberRoleId: {
               type: 'string',
               enum: [],
               "x-component-props": {

src/pages/capitalAccount/checkWithdraw/checkDetails.tsx

@@ -43,7 +43,7 @@ const CheckDetail: React.FC<{}> = () => {
     if(code === 1000) {
       let bankRes: any = await PublicApi.getSettleAccountsGetMemberAccountConfig({
         memberId: data.memberId,
-        roleId: data.MemberManageRoleId,
+        roleId: data.memberRoleId,
       })
       setBankDetail(bankRes.data)
     }

src/pages/capitalAccount/paymentWithdraw/paymentDetails.tsx

@@ -50,7 +50,7 @@ const PaymentDetail: React.FC<{}> = () => {
     if(code === 1000) {
       let bankRes: any = await PublicApi.getSettleAccountsGetMemberAccountConfig({
         memberId: data.memberId,
-        roleId: data.MemberManageRoleId,
+        roleId: data.memberRoleId,
       })
       setBankDetail(bankRes.data)
     }

src/pages/orderSystem/orderDetail/components/orderProductTable/index.tsx

@@ -300,7 +300,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
     return await Promise.all(asyncData.filter(v => v.memberPrice === undefined).map(async v =>  {
       const {code, data} = await PublicApi.getMemberManageUpperCreditParamGet({
         parentMemberId: v.memberId,
-        parentMemberManageRoleId: v.MemberManageRoleId
+        parentMemberRoleId: v.memberRoleId
       }, {ttl: 60 * 1000, useCache: true})
       return code === 1000 ? { value: (data.parameter * 100) + '%', id: v.id } : { value: '', id: 0 }
     }

src/pages/orderSystem/orderDetail/effects/index.ts

@@ -23,7 +23,7 @@ const asyncPadDataForProduct = async (ctx: ISchemaFormActions | ISchemaFormAsync
   const asyncPriceRequests: any[] = await Promise.all(productData.filter(v => v.memberPrice === undefined).map(async v =>  {
       const {code, data} = await PublicApi.getMemberManageUpperCreditParamGet({
         parentMemberId: v.memberId,
-        parentMemberManageRoleId: v.MemberManageRoleId
+        parentMemberRoleId: v.memberRoleId
       }, {ttl: 60 * 1000, useCache: true})
       return code === 1000 ? { value: (data.parameter * 100) + '%', id: v.id } : { value: '', id: 0 }
     }

src/pages/returnManage/components/RefundModal/Balance/index.tsx

@@ -47,7 +47,7 @@ const Balance: React.FC<BalanceProps> = ({
     setLoading(true);
     PublicApi.getPayAssetAccountGetChildUserBalance({
       childMemberId: `${purchaserId}`,
-      childMemberManageRoleId: `${purchaserRoleId}`,
+      childMemberRoleId: `${purchaserRoleId}`,
     }).then(res => {
       if (res.code === 1000) {
         setBalance(res.data);

src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx

@@ -34,7 +34,7 @@ export interface RuleSettingProps {
 const RuleSetting:React.FC<RuleSettingProps> = (props) => {
   const { addSchemaAction, schema, formSubmit, onFieldChange = () => {} } = props
   const [visibleChannelRroduct, setVisibleChannelRroduct] = useState(false)
-  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({customKey: 'MemberManageRoleId'})
+  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({customKey: 'memberRoleId'})
   const [initValue, setInitialValue] = useState({})
   const [membersLength, setMembersLength] = useState(0)
 
@@ -47,19 +47,19 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
   const fetchMembersList = async (params) => {
     const res = await PublicApi.getMemberManageAllProviderPage(params)
     const { code, data } = res
-    let _data = data.data.map(item => ({ ...item, MemberManageRoleId: item.memberId + '_' + item.roleId }))
+    let _data = data.data.map(item => ({ ...item, memberRoleId: item.memberId + '_' + item.roleId }))
     return { totalCount: data.totalCount, data: _data }
   }
 
   // table删除商品
   const handleDeleteTable = (id) => {
     const value = addSchemaAction.getFieldValue('memberIds')
-    addSchemaAction.setFieldValue('memberIds', findItemAndDelete(value, id, 'MemberManageRoleId'))
+    addSchemaAction.setFieldValue('memberIds', findItemAndDelete(value, id, 'memberRoleId'))
   }
 
   const handleAddMemberBtn = () => {
     const checkBoxs = addSchemaAction.getFieldValue('memberIds')
-    memberRowCtl.setSelectedRowKeys(checkBoxs.map(v => v.MemberManageRoleId))
+    memberRowCtl.setSelectedRowKeys(checkBoxs.map(v => v.memberRoleId))
     memberRowCtl.setSelectRow(checkBoxs)
     setVisibleChannelRroduct(true)
   }
@@ -98,7 +98,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
     {
       dataIndex: 'ctl',
       title: '操作',
-      render: (_, record) => <Button type='link' onClick={() => handleDeleteTable(record.MemberManageRoleId)}>删除</Button>
+      render: (_, record) => <Button type='link' onClick={() => handleDeleteTable(record.memberRoleId)}>删除</Button>
     }
   ]
 
@@ -120,9 +120,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
 
   const columnsSetProduct: any[] = [
     {
-      dataIndex: 'MemberManageRoleId',
+      dataIndex: 'memberRoleId',
       title: 'MRID',
-      key: 'MemberManageRoleId',
+      key: 'memberRoleId',
       className: 'commonHide'
     },
     {
@@ -258,7 +258,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
   const getBindingMembers = async ({id = '1', current = '1', pageSize = '10'}) => {
     const res = await PublicApi.getOrderTradingRulesBackgroundMember({id, current, pageSize})
     const { code, data } = res
-    let _data = data.data.map(item => ({ ...item, MemberManageRoleId: item.memberId + '_' + item.roleId }))
+    let _data = data.data.map(item => ({ ...item, memberRoleId: item.memberId + '_' + item.roleId }))
     return { totalCount: data.totalCount, data: _data }
   }
 
@@ -325,7 +325,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
           }
         }
         tableProps={{
-          rowKey: 'MemberManageRoleId'
+          rowKey: 'memberRoleId'
         }}
       />
 

src/pages/ruleSettingManage/transactionRules/schema/index.tsx

@@ -105,7 +105,7 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
                   type: 'array:number',
                   "x-component": 'MultTable',
                   "x-component-props": {
-                    rowKey: 'MemberManageRoleId',
+                    rowKey: 'memberRoleId',
                     columns: "{{tableColumns}}",
                     prefix: "{{tableAddButton}}"
                   }

yarn.lock

@@ -9659,10 +9659,10 @@ lines-and-columns@^1.1.6:
   resolved "http://10.0.0.19:4873/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-lingxi-design-ui@^1.1.19:
-  version "1.1.19"
-  resolved "http://10.0.0.19:4873/lingxi-design-ui/-/lingxi-design-ui-1.1.19.tgz#6e360011d9c4a8cd246127fd52b8d3032f39b226"
-  integrity sha512-IYTiAB1zR3EPI7iC9kYV+BI3MQaiI3eSppNKRD01K12MTyrtwaXSsDS/tSWvkLkEX3RCg87HsPAomuj8nvwDKQ==
+lingxi-design-ui@^1.1.23:
+  version "1.1.23"
+  resolved "http://10.0.0.19:4873/lingxi-design-ui/-/lingxi-design-ui-1.1.23.tgz#519adb25e6f45766aec97534255f4197413567d0"
+  integrity sha512-Y/ko6Qy8torCJSUy+BCmQjEU2JdhxOK4/VxA08xhYg7Ix83BdwGYG1x7EZyF38IwYL2oYplM0Bc9oiW9ZoyYtg==
   dependencies:
     "@ant-design/icons" "^4.2.1"
     "@ant-design/react-slick" "~0.26.1"
@@ -9673,7 +9673,18 @@ lingxi-design-ui@^1.1.19:
     react-slick "^0.26.1"
     rgbaster "^2.1.1"
 
-lingxi-design@^1.0.12, lingxi-design@^1.0.6:
+lingxi-design@^1.0.14:
+  version "1.0.14"
+  resolved "http://10.0.0.19:4873/lingxi-design/-/lingxi-design-1.0.14.tgz#cb0780d4d70616ae574511a91e7c3f79017d4ea6"
+  integrity sha512-3ETODse8c13caqRyR0lXUsB2Jv5uwssCjGwOml270HHOyF0vmqN7/pOCnkSjewE0MsOyT6CzwFOAHJuidH45ug==
+  dependencies:
+    "@ant-design/icons" "^4.2.1"
+    lingxi-editor-core "^1.0.7"
+    lodash "^4.17.15"
+    react "^16.13.1"
+    react-dom "^16.13.1"
+
+lingxi-design@^1.0.6:
   version "1.0.12"
   resolved "http://10.0.0.19:4873/lingxi-design/-/lingxi-design-1.0.12.tgz#e9a58e4330c603219b21145991942155f93d1f32"
   integrity sha512-r5elokQwzDj/KhZhjUKXZreXXII/y796ILhnpAx1yJ5dDRxh0cOgveT911Tw5VJBVIddog8lGSWlEdurmgG39Q==