* update

Resolving Conflicts
laogong5i0-2 · Aug 19, 2019 · eae549d · eae549d
1 parent 32484f6
commit eae549d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 44 deletions.
diff --git a/lugia.config.js b/lugia.config.js
@@ -1,7 +1,7 @@
 export default {
   disableCSSModules: true,
   cssModulesWithAffix: true,
-  publicPath: 'https://lugia.oss-cn-beijing.aliyuncs.com/',
+  publicPath: '/',
   extraBabelIncludes: [/decamelize/],
   extraBabelPlugins: [
     [

diff --git a/src/edit-table/edittable.js b/src/edit-table/edittable.js
@@ -112,11 +112,7 @@ class Element extends React.Component<PropsType, StateType> {
               return (
                 <Tr>
                   <Td>{item.name}</Td>
-<<<<<<< HEAD
                   <Td width={160}>{item.desc}</Td>
-=======
-                  <Td>{item.desc}</Td>
->>>>>>> lugia/master
                   <Td>{getPropsType(item.type,propsType) || 'Function'}</Td>
                   <Td>{item.args ? getEventPropsElement(getEventProps(item.args)) : getDefaultValue(item.defaultValue)}</Td>
                 </Tr>

diff --git a/src/menu/component/menulist.js b/src/menu/component/menulist.js
@@ -91,10 +91,6 @@ export default class MenuList extends React.Component<any, any> {
   static getDerivedStateFromProps(defProps: DefProps, stateProps: StateProps) {
     const path = window.location.hash;
     const pathFilter = path.match(/[^#]+/g)[0].match(/[^/]+/g);
-<<<<<<< HEAD
-=======
-    console.log("pathFilter", pathFilter);
->>>>>>> lugia/master
     const pathType = pathFilter[0] === "design" ? "designConfig" : "menuConfig";
     const defaultUrl = Router[pathType][0].children
       ? Router[pathType][0].children[0].value

diff --git a/src/mobile/logs/index.js b/src/mobile/logs/index.js
@@ -14,10 +14,7 @@ const OutContainer = styled.div`
   width:100%;
   height:100%;
   padding: 0 20px;
-<<<<<<< HEAD
   position: ${props => props.overflow?'fixed':''}
-=======
->>>>>>> lugia/master
  
 `;
 
@@ -211,12 +208,8 @@ export default class UpdateLog extends React.Component<any, any> {
     this.state={
       fetchApi:defaultFetchApi,
       current: navMenuData.data[0].children[0].value,
-<<<<<<< HEAD
       drawerVisible:false,
       overflow:false
-=======
-      drawerVisible:false
->>>>>>> lugia/master
     }
   }
   componentDidMount () {
@@ -237,19 +230,11 @@ export default class UpdateLog extends React.Component<any, any> {
 
 
   render () {
-<<<<<<< HEAD
     const {releases=[],name,description,overflow} = this.state;
     return (
       <OutContainer  overflow={overflow}>
         <HeaderNav />
         <Asides data={navMenuData.data} ignoreGo onSelect={this.onSelect} setOverflow={(res) => this.setOverflow(res)} />
-=======
-    const {releases=[],name,description} = this.state;
-    return (
-      <OutContainer>
-        <HeaderNav />
-        <Asides data={navMenuData.data} ignoreGo onSelect={this.onSelect}/>
->>>>>>> lugia/master
         <Container>
           <Title>{name}</Title>
           <Text> {description} </Text>
@@ -293,14 +278,11 @@ export default class UpdateLog extends React.Component<any, any> {
     });
     this.getReleasesData(fetchApi);
   };
-<<<<<<< HEAD
   setOverflow = (res) => {
     this.setState({
       overflow:res
     });
   };
-=======
->>>>>>> lugia/master
 
   async getReleasesData(fetchApi){
     const result = await fetch(fetchApi+'/releases',

diff --git a/src/mobile/menu/index.js b/src/mobile/menu/index.js
@@ -36,38 +36,24 @@ export default (props) => {
   const {setOverflow, ignoreGo, onSelect} = props;
   const [drawerVisible, updateDrawerVisible] = useState(false);
   const [overflow, updateOverflowState] = useState(false);
-<<<<<<< HEAD
 
   const onClick = (e) => {
     updateDrawerVisible(!drawerVisible);
     updateOverflowState(!overflow);
     setOverflow && setOverflow(!overflow);
   };
 
-=======
-  setOverflow && setOverflow(overflow);
-  const onClick = (e) => {
-    updateDrawerVisible(!drawerVisible);
-    updateOverflowState(!overflow);
-  };
-
-
->>>>>>> lugia/master
   const {data} = props;
   return (
     <React.Fragment>
           <MenuIcon onClick={onClick}><Icon iconClass={'lugia-icon-financial_more'}/> </MenuIcon>
           <Theme config={view}>
             <Drawer placement={'left'} onClose={onClick} closable visible={drawerVisible} ref={node => (this.drawer = node)} >
               {
-<<<<<<< HEAD
                 drawerVisible?<Asides data={data} width={250} padding={{top:0,left:0,right:0,bottom:0}} isMobile={true} ignoreGo={ignoreGo} onSelect={(target) => {
                   onClick();
                   onSelect && onSelect(target) ;
                 }}/>:''
-=======
-                drawerVisible?<Asides data={data} width={250} padding={{top:0,left:0,right:0,bottom:0}} isMobile={true} ignoreGo={ignoreGo} onSelect={onSelect}/>:''
->>>>>>> lugia/master
               }
 
             </Drawer>

diff --git a/src/mobile/widgets/index.js b/src/mobile/widgets/index.js
@@ -15,10 +15,7 @@ const InnerContainer = styled.div`
   width:100%;
   padding:0 20px ;
   text-align: center;
-<<<<<<< HEAD
   overflow-x: hidden;
-=======
->>>>>>> lugia/master
 `;