Merge branch 'master' into bms

king

2021-10-27 bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f

 src/templates/sharecomponent/treesettingcomponent/settingform/datasource/index.jsx

@@ -33,7 +33,7 @@
    if (usefulFields) {
      try {
        usefulFields = JSON.parse(usefulFields)
      } catch {
      } catch (e) {
        usefulFields = []
      }
    } else {