Skip to content

C
CivWeb
Commit ac3078dd authored by 邓晓峰's avatar 邓晓峰
Browse files
Options

merge feat/map

parent c3c9997d
Pipeline #36886 passed with stages
        in 60 minutes 30 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 3 additions and 3 deletions
        src/layouts/BasicLayout1.js
        View file @ ac3078dd
        ...@@ -645,9 +645,9 @@ const BasicLayout = props => { ...@@ -645,9 +645,9 @@ const BasicLayout = props => {
        renderRoutes(props.route.routes) renderRoutes(props.route.routes)
        } }
        { {/* {
        !window.location.pathname.startsWith('/civbase/civweb4') && <CreateBaseMap options={{type: 'ArcgisMap'}}/> !window.location.pathname.startsWith('/civbase/civweb4') && <CreateBaseMap options={{type: 'ArcgisMap'}}/>
        } } */}
        <div id="micro-container" className="subapp-container"> <div id="micro-container" className="subapp-container">
        {/*<CreateBaseMap/>*/} {/*<CreateBaseMap/>*/}
        ......
        src/micro.js
        View file @ ac3078dd
        ...@@ -177,7 +177,7 @@ export const defaultApp = () => { ...@@ -177,7 +177,7 @@ export const defaultApp = () => {
        const config = createStoreage.get('globalConfig'); const config = createStoreage.get('globalConfig');
        if (config && config.token) { if (config && config.token) {
        const startWith = config.homepage ? config.homepage.split('/') : []; // const startWith = config.homepage ? config.homepage.split('/') : [];
        // console.log(findPathByLeafId(config.homepage, '', 'url')) // console.log(findPathByLeafId(config.homepage, '', 'url'))
        const basePath = const basePath =
        config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ? config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ?
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment