Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

package.json

@@ -12,7 +12,7 @@
     "api": "god-ytt",
     "scripts:build": "node scripts/run",
     "scripts:build-yxc": "node scripts/run http://yxc-web-demo.shushangyun.com/api",
-    "start:dev": "umi dev ",
+    "start:dev": "cross-env NODE_OPTIONS=--max_old_space_size=4096 umi dev",
     "start:analyze": "ANALYZE=1 umi dev",
     "clean": "rimraf node_modules",
     "start": "yarn api && yarn scripts:build && cross-env NODE_OPTIONS=--max_old_space_size=4096 umi dev",

src/components/PopConfirmControl/index.tsx

+import { Popconfirm, PopconfirmProps } from 'antd'
+import React from 'react'
+
+export interface PopConfirmControlProps extends Partial<PopconfirmProps> {
+  visible?: boolean
+}
+const PopConfirmControl: React.FC<PopConfirmControlProps> = (props) => {
+  const { visible = true, children, ...restProps } = props
+  return <Popconfirm
+    title="确定要执行这个操作?"
+    okText="是"
+    cancelText="否"
+    { ...restProps }
+  >
+    { children }
+  </Popconfirm>
+}
+
+export default PopConfirmControl

src/hooks/useControlTable.ts

+import { useCallback } from "react"
+
+interface ControlTableOptions {
+  update?: any,
+  remove?: any,
+  preview?: any,
+  changeStatus?: any,
+}
+
+const emptyFn = () => {}
+
+const useControlTable = (options: ControlTableOptions) => {
+  const { update = emptyFn, remove = emptyFn, preview = emptyFn, changeStatus = emptyFn } = options
+
+  const handleUpdate = useCallback(() => {
+
+  }, [])
+
+  const handleRemove = useCallback(() => {
+
+  }, [])
+
+  const handlePreview = useCallback(() => {
+
+  }, [])
+
+  const handleChangeStatus = useCallback(() => {
+
+  }, [])
+
+  return {
+    handleUpdate,
+    handleRemove,
+    handlePreview,
+    handleChangeStatus
+  }
+}

src/layouts/BasicLayout.tsx

@@ -152,7 +152,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
         minWidth: '1280px',
       }
     : {}
-
+  console.log(currentRouter)
   return currentRouter.noLayout ? props.children : (
     <ProLayout
       pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
@@ -179,6 +179,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
         menuData={menuData}
         pathname={location.pathname}
         collapseState={collapsed}
+        currentRouter={currentRouter}
         changeOpenKeys={(keys: string[]) => setOpenKeys(keys)}
       />}
       footerRender={() => defaultFooterDom}

src/layouts/components/MenuSlider.tsx

@@ -20,6 +20,7 @@ export interface MenuSliderProps {
   currentSelectKey: string[];
   openKeys: string[];
   changeOpenKeys: Function;
+  currentRouter: any;
 }
 
 const MenuSlider: React.FC<MenuSliderProps> = (props) => {

src/layouts/components/OuterSide.tsx

@@ -13,12 +13,13 @@ const { Sider } = Layout
 export interface OuterSiderProps {
   menuData: Array<any>;
   pathname: string | undefined;
-  UserStore?: any
+  currentRouter: any,
+  UserStore?: any,
 }
 
 
 const OuterSider: React.FC<OuterSiderProps> = observer((props) => {
-  const { menuData, pathname = "/" } = props
+  const { menuData, pathname = "/", currentRouter } = props
   const authRouters = getRouters()
   let defaultSelectedKeys = ""
 
@@ -33,14 +34,19 @@ const OuterSider: React.FC<OuterSiderProps> = observer((props) => {
   const getSubMenu = () => {
     const subHeadMenus: Array<any> = []
     menuData.forEach(item => {
-      if (pathname.indexOf(item.key) > -1) {
-        defaultSelectedKeys = item.key
+      // 为适配pass菜单自由组合变更， 使用code进行高亮显示
+      const code = currentRouter.relationParentCode
+      console.log(code, item.relationParentCode)
+      if (code && code === item.relationParentCode) {
+        defaultSelectedKeys = item.relationParentCode
       }
       !item.hideInMenu && isAuthPath(item.path) && subHeadMenus.push({
         path: item.path,
         title: item.name,
         icon: item.icon,
-        key: item.key
+        key: item.key,
+        // 新增code属性 用于辨别子菜单是否属于该菜单下的属性
+        relationParentCode: item.relationParentCode,
       })
     })
     return subHeadMenus
@@ -60,7 +66,7 @@ const OuterSider: React.FC<OuterSiderProps> = observer((props) => {
       <ul className={styles.menuBox}>
         {
           siderMenu.map(item => (
-            !item.hideInMenu && <li key={item.key} className={defaultSelectedKeys === item.key ? styles.currentItem : ''}>
+            !item.hideInMenu && <li key={item.key} className={defaultSelectedKeys === item.relationParentCode ? styles.currentItem : ''}>
               <Link to={item.path}>
                 <CustomIcon type={item.icon} style={{width: 20, height: 20}}/>
                 <label>{item.title}</label>

src/module/channelProductModule/index.ts

-import { GetProductChannelCommodityGetCommodityUnitPriceResponse } from '@/services';
+import { GetProductChannelCommodityGetCommodityUnitPriceResponse } from '@/services/ProductV2Api';
 
 export interface IRole {
   key: string;

src/pages/authConfig/userSystem/index.tsx

@@ -9,13 +9,13 @@ import {
   EyeOutlined
 } from '@ant-design/icons';
 import {StandardTable} from 'god'
-import {ColumnType} from 'antd/lib/table/interface'
 import { IButtonFilter, IFormFilter } from 'god/dist/src/standard-table/TableController';
 import { PublicApi } from '@/services/api';
 import EyePreview from '@/components/EyePreview';
 import StatusSwitch from '@/components/StatusSwitch';
 import { STATUS_ENUM } from '@/constants';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import useSysetemTable from './useSystemTable';
 
 // 模拟请求
 const fetchData = async (params) => {
@@ -24,108 +24,18 @@ const fetchData = async (params) => {
 }
 
 const UserSystem: React.FC<{}> = () => {
-  const ref = useRef<any>({})
-
-  const addItem = () => {
-    history.push('/memberCenter/systemSetting/authConfig/userSystem/add')
-  }
-  const deleteItem = (record) => {
-    // 删除该项
-    PublicApi.postMemberUserDelete({
-      userId: record.userId
-    }).then(() => {
-      ref.current.reload()
-    })
-  }
-
-  const updateItem = (record) => {
-    history.push(`/memberCenter/systemSetting/authConfig/userSystem/edit?id=${record.userId}&preview=0`)
-  }
-
-  const handleStatus = (record) => {
-    PublicApi.postMemberUserUpdatestatus({
-      userId: record.userId,
-      status: record.status === 1 ? 0 : 1
-    }).then(res => {
-      ref.current.reload()
-    })
-  }
-  const columns: ColumnType<any>[] = [
-    {
-      title: '账号',
-      dataIndex: 'account',
-      align: 'center',
-      key: 'account',
-      className: 'commonPickColor',
-      render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/userSystem/detail?id=${record.userId}&preview=1`}>{text}</EyePreview>
-    },
-    {
-      title: '用户姓名',
-      dataIndex: 'name',
-      align: 'center',
-      key: 'name',
-    },
-    {
-      title: '所属机构',
-      dataIndex: 'orgName',
-      align: 'center',
-      key: 'orgName'
-    },
-    {
-      title: '绑定手机号码',
-      align: 'center',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '所属角色',
-      align: 'center',
-      dataIndex: 'roleName',
-      key: 'roleName',
-    },
-    {
-      title: '最后登录时间',
-      align: 'center',
-      dataIndex: 'lastLoginTime',
-      key: 'lastLoginTime',
-    },
-    {
-      title: '状态',
-      align: 'center',
-      dataIndex: 'status',
-      key: 'status',
-      render: (text: any, record:any) => <StatusSwitch handleConfirm={() => handleStatus(record)} record={record}/>
-    },
-    {
-      title: '操作',
-      dataIndex: 'option',
-      align: 'center',
-      render: (text:any, record:any) => {
-        return (
-          <>
-            {
-              record.status === 0 && <Popconfirm
-                title="确定要执行这个操作?"
-                onConfirm={() => deleteItem(record)}
-                okText="是"
-                cancelText="否"
-              >
-                <Button type='link'>删除</Button>
-              </Popconfirm>
-            }
-            <Button type='link' onClick={()=>updateItem(record)}>修改</Button>
-          </>
-        )
-      }
-    }
-  ];
+  const {
+    dataRef,
+    tableRef,
+    addItem
+  } = useSysetemTable()
 
   return (
     <PageHeaderWrapper>
       <Card className="common-wrapper">
       <StandardTable
-        columns={columns}
-        currentRef={ref}
+        columns={dataRef.current.columns}
+        currentRef={tableRef.current}
         fetchTableData={(params:any) => fetchData(params)}
         formilyLayouts={{
           justify: 'space-between'
@@ -143,7 +53,7 @@ const UserSystem: React.FC<{}> = () => {
           ctx: {
             effects: ($) => {
               $('onFieldInputChange', 'status').subscribe(() => {
-                ref.current.reload()
+                tableRef.current.reload()
               })
             },
             schema: {

src/pages/authConfig/userSystem/useSystemTable.tsx

+import React, { useRef } from 'react'
+import EyePreview from "@/components/EyePreview";
+import StatusSwitch from '@/components/StatusSwitch';
+import { Button } from 'antd';
+import PopConfirmControl from '@/components/PopConfirmControl';
+import { PublicApi } from '@/services/api';
+import { history } from 'umi'
+
+const useSysetemTable = () => {
+  const tableRef = useRef<any>({})
+
+  const dataRef = useRef<any>({
+    columns: [
+      {
+        title: '账号',
+        dataIndex: 'account',
+        align: 'center',
+        key: 'account',
+        className: 'commonPickColor',
+        render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/authConfig/userSystem/detail?id=${record.userId}&preview=1`}>{text}</EyePreview>
+      },
+      {
+        title: '用户姓名',
+        dataIndex: 'name',
+        align: 'center',
+        key: 'name',
+      },
+      {
+        title: '所属机构',
+        dataIndex: 'orgName',
+        align: 'center',
+        key: 'orgName'
+      },
+      {
+        title: '绑定手机号码',
+        align: 'center',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '所属角色',
+        align: 'center',
+        dataIndex: 'roleName',
+        key: 'roleName',
+      },
+      {
+        title: '最后登录时间',
+        align: 'center',
+        dataIndex: 'lastLoginTime',
+        key: 'lastLoginTime',
+      },
+      {
+        title: '状态',
+        align: 'center',
+        dataIndex: 'status',
+        key: 'status',
+        render: (text: any, record:any) => <StatusSwitch handleConfirm={() => handleStatus(record)} record={record}/>
+      },
+      {
+        title: '操作',
+        dataIndex: 'option',
+        align: 'center',
+        render: (text:any, record:any) => {
+          return (
+            <>
+              <PopConfirmControl
+                onConfirm={() => deleteItem(record)}
+                visible={record.status === 0}
+              >
+                <Button type='link'>删除</Button>
+              </PopConfirmControl>
+
+              <Button type='link' onClick={()=>updateItem(record)}>修改</Button>
+            </>
+          )
+        }
+      }
+    ]
+  })
+
+  const addItem = () => {
+    history.push('/memberCenter/systemSetting/authConfig/userSystem/add')
+  }
+
+  const deleteItem = (record) => {
+    // 删除该项
+    PublicApi.postMemberUserDelete({
+      userId: record.userId
+    }).then(() => {
+      tableRef.current.reload()
+    })
+  }
+
+  const updateItem = (record) => {
+    history.push(`/memberCenter/systemSetting/authConfig/userSystem/edit?id=${record.userId}&preview=0`)
+  }
+
+  const handleStatus = (record) => {
+    PublicApi.postMemberUserUpdatestatus({
+      userId: record.userId,
+      status: record.status === 1 ? 0 : 1
+    }).then(res => {
+      tableRef.current.reload()
+    })
+  }
+
+  return {
+    tableRef,
+    dataRef,
+    addItem,
+  }
+}
+
+export default useSysetemTable

src/pages/user/index.less

@@ -14,6 +14,7 @@
 
   .loginWrap {
     padding: 141px 0 102px;
+    min-height: 560px;
   }
 
   .readyLogin {

src/store/channelProduct/index.ts

 import {action, computed, observable, runInAction} from 'mobx'
-import { IChannelProductModule, IRole, IChannel } from '@/module/channelProductModule';
+import { IChannelProductModule } from '@/module/channelProductModule';
 
+export interface IRole {
+  key: string;
+  value: number;
+  children: string;
+}
+
+export interface IChannel {
+  name: string;
+  memberId?: number;
+}
 /**
  * 渠道直采商品
  */

src/store/product/index.ts

 import {action, computed, observable, runInAction} from 'mobx'
-import { IProductModule, IProductSelectAttribute, IBasicFormParam, IPriceAttributeParam, IOtherParam, IDecsParams, IPage } from '@/module/productModule'; // mobx要用到的数据类型
+import { IProductModule, IProductSelectAttribute, IBasicFormParam, IPriceAttributeParam, IOtherParam } from '@/module/productModule'; // mobx要用到的数据类型
+
+export interface IPage {
+  current: number;
+  pageSize: number;
+}
+
+export interface IDecsParams {
+  id?: number;
+  video: string[];
+  image: string[]	;
+  word: string[];
+}
 
 class ProductStore implements IProductModule {
   @observable public attributeLists: any[] = [];