Commit 684cd77a authored by 向偲彪's avatar 向偲彪 Committed by qiaozhanwei
Browse files

Fixed space and icon display issues before and after the input box (#1798) 

* merge dev branch front-end code

* fix udfs assignment

* Fix task instance page jump

* fix udfs assignment and task instance page jump #1789

* Fixed space and icon display issues before and after the input box

* add license

* add license
parent 5ec2e010

dolphinscheduler-ui/.editorconfig

+17 −2
Original line number Diff line number Diff line 
# editorconfig.org

# author: axin

/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

 

root = true



[*]

dolphinscheduler-ui/.env

+17 −1
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

# back end interface address

API_BASE = http://192.168.xx.xx:12345

API_BASE = http://192.xx.xx.xx:12345



# If IP access is required for local development, remove the "#"

#DEV_HOST = 192.168.xx.xx
 
 No newline at end of file

dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
          font-size: 72px;

        }

        >.state {

          >i {

          >em {

            font-size: 50px;

          }

          .success {

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue

+2 −2
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ 
        </x-select>

      </div>

      <div class="list">

        <x-input v-model="searchParams.host" @on-enterkey="_ckQuery" style="width: 140px;" size="small" :placeholder="$t('host')"></x-input>

        <x-input v-model.trim="searchParams.host" @on-enterkey="_ckQuery" style="width: 140px;" size="small" :placeholder="$t('host')"></x-input>

      </div>

      <div class="list">

        <x-input v-model="searchParams.searchVal" @on-enterkey="_ckQuery" style="width: 200px;" size="small" :placeholder="$t('name')"></x-input>

        <x-input v-model.trim="searchParams.searchVal" @on-enterkey="_ckQuery" style="width: 200px;" size="small" :placeholder="$t('name')"></x-input>

      </div>

    </template>

  </m-conditions>