Unverified Commit 2b174353 authored by 向偲彪's avatar 向偲彪 Committed by GitHub
Browse files

Supplemental licenses and repair resources cannot be renamed (#2340) 

* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom

* Change normalize.scss import method and animation.scss license modification

* Resource tree code merge

* Modify ans-ui version and timing management style

* Supplemental licenses and repair resources cannot be renamed
parent 2114c8d9

dolphinscheduler-dist/release-docs/LICENSE

+2 −0
Original line number Diff line number Diff line
@@ -518,6 +518,8 @@ MIT licenses 
    js-cookie 2.2.1: https://github.com/js-cookie/js-cookie MIT

    jsplumb 2.8.6: https://github.com/jsplumb/jsplumb MIT and GPLv2

    lodash 4.17.11: https://github.com/lodash/lodash MIT

    normalize.css 8.0.1: https://github.com/necolas/normalize.css MIT

    vue-treeselect 0.4.0: https://github.com/riophae/vue-treeselect MIT

    vue	2.5.17:	https://github.com/vuejs/vue	MIT

    vue-router 2.7.0: https://github.com/vuejs/vue-router MIT

    vuex 3.0.0: https://github.com/vuejs/vuex MIT

dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-normalize

0 → 100644
+8 −0
Original line number Diff line number Diff line 
The MIT License (MIT)

Copyright © Nicolas Gallagher and Jonathan Neal



Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 No newline at end of file

dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-vue-treeselect

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Copyright (c) 2017-present Riophae Lee



Permission is hereby granted, free of charge, to any person obtaining

a copy of this software and associated documentation files (the

"Software"), to deal in the Software without restriction, including

without limitation the rights to use, copy, modify, merge, publish,

distribute, sublicense, and/or sell copies of the Software, and to

permit persons to whom the Software is furnished to do so, subject to

the following conditions:



The above copyright notice and this permission notice shall be

included in all copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 No newline at end of file

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue

+1 −2
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ 
  import { bytesToSize } from '@/module/util/util'

  import { downloadFile } from '@/module/download'

  import localStore from '@/module/util/localStorage'



  export default {

    name: 'file-manage-list',

    data () {

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue

+3 −4
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ 
<script>

  import i18n from '@/module/i18n'

  import store from '@/conf/home/store'

  import localStore from '@/module/util/localStorage'

  import mPopup from '@/module/components/popup/popup'

  import mListBoxF from '@/module/components/listBoxF/listBoxF'



  export default {

    name: 'resource-file-rename',

    data () {
@@ -71,7 +71,7 @@ 
            })

          }else{

            return this.store.dispatch('resource/resourceVerifyName', {

              name: this.name,

              fullName: localStore.getItem('currentDir')+'/'+this.name,

              type: 'FILE'

            })

          }
@@ -100,7 +100,6 @@ 
          } else {

            resolve()

          }



        })

      }

    },