Commit 81308ec2 authored by 向偲彪's avatar 向偲彪 Committed by lgcareer
Browse files

Fix data echo, style and popup cannot be closed (#1801) 

* 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

* Fix data echo, style and popup cannot be closed
parent c7f32e81

dolphinscheduler-ui/.editorconfig

+15 −16
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.

 */

 # 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

+16 −17
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.

 */

 # 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.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
 
#DEV_HOST = xx.xx.xx.xx
 
 No newline at end of file

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ 
            type: this.taskType,

            id: this.id,

            name: this.name,

            params: this.params,

            description: this.description,

            runFlag: this.runFlag,

            dependence: this.dependence,

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

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
    created () {

    },

    mounted () {

      this.$modal.destroy()

      // Cycle acquisition status

      this.setIntervalP = setInterval(() => {

        this._debounceGET('false')

dolphinscheduler-ui/src/sass/common/index.scss

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ 
    font-weight: 400;

  }

}

.ans-radio {

  .ans-radio-inner {

    border: 1px solid #B3B3B3;

  }

}



.ans-poptip {

  min-width: 158px;