Merge branch 'master' of github.com:gcpaas/DataRoom

1 year ago · de88c49737
parent b63a663a5f c617aac061
commit de88c49737
14 changed files with 30 additions and 20 deletions
--- a/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ChartTab/setting.vue
@ -80,6 +80,8 @@
          <el-input-number
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
+            :min="0"
+            :step="100"
            placeholder="请输入字体权重"
          />
        </el-form-item>
--- a/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
+++ b/data-room-ui/packages/BasicComponents/CurrentTime/setting.vue
@ -63,6 +63,8 @@
          <el-input-number
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
+            :min="0"
+            :step="100"
            placeholder="请输入字体权重"
          />
        </el-form-item>
--- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
+++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
@ -57,7 +57,7 @@
                v-model="config.customize.fontWeight"
                class="bs-el-input-number"
                :min="0"
-                :step="1"
+                :step="100"
              />
            </el-form-item>
            <el-form-item label="字体颜色">
--- a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue
+++ b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue
@ -17,7 +17,7 @@
        >
          <SettingTitle>标题</SettingTitle>
          <div class="lc-field-body">
-            <el-form-item label="边框名称">
+            <el-form-item label="标题">
              <el-input
                v-model="config.title"
                clearable
--- a/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
+++ b/data-room-ui/packages/BasicComponents/LinkChart/setting.vue
@ -121,6 +121,8 @@
          <el-input-number
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
+            :min="0"
+            :step="100"
            placeholder="请输入标题字体权重"
          />
        </el-form-item>
--- a/data-room-ui/packages/BasicComponents/Marquee/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Marquee/setting.vue
@ -70,6 +70,8 @@
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
            placeholder="请输入标题字体权重"
+            :min="0"
+            :step="100"
          />
        </el-form-item>
        <!-- 走马灯走向 -->
--- a/data-room-ui/packages/BasicComponents/Numbers/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/setting.vue
@ -72,6 +72,8 @@
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
            placeholder="请输入数字权重"
+            :min="0"
+            :step="100"
          />
        </el-form-item>
        <el-form-item
@ -176,13 +178,6 @@ export default {
    }
  },
  watch: {
-    // 标题发生变化时需要及时更新表达式中的数据集库的字段名
-    'config.title': {
-      handler (val, oldVal) {
-        this.updateDataset({ code: this.config.code, title: val, data: [], oldTitle: oldVal, isChangeTitle: true })
-        this.updateComputedDatas({ code: this.config.code, title: val, data: [], oldTitle: oldVal, isChangeTitle: true })
-      }
-    }
  },
  mounted () {},
  methods: {
--- a/data-room-ui/packages/BasicComponents/Texts/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue
@ -72,6 +72,8 @@
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
            placeholder="请输入文字权重"
+            :min="0"
+            :step="100"
          />
        </el-form-item>
        <el-form-item
@ -173,13 +175,6 @@ export default {
    }
  },
  watch: {
-    // 标题发生变化时需要及时更新表达式中的数据集库的字段名
-    'config.title': {
-      handler (val, oldVal) {
-        this.updateDataset({ code: this.config.code, title: val, data: [], oldTitle: oldVal, isChangeTitle: true })
-        this.updateComputedDatas({ code: this.config.code, title: val, data: [], oldTitle: oldVal, isChangeTitle: true })
-      }
-    }
  },
  mounted () {},
  methods: {
--- a/data-room-ui/packages/BasicComponents/ThemeSelect/setting.vue
+++ b/data-room-ui/packages/BasicComponents/ThemeSelect/setting.vue
@ -66,6 +66,8 @@
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
            placeholder="请输入标题字体权重"
+            :min="0"
+            :step="100"
          />
        </el-form-item>
        <TextGradient v-model="config.customize.color" />
--- a/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
+++ b/data-room-ui/packages/BasicComponents/TimeCountDown/setting.vue
@ -62,6 +62,8 @@
          <el-input-number
            v-model="config.customize.fontWeight"
            class="bs-el-input-number"
+            :min="0"
+            :step="100"
            placeholder="请输入字体权重"
          />
        </el-form-item>
--- a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
+++ b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
@ -16,7 +16,7 @@
      >
        <SettingTitle>标题</SettingTitle>
        <el-form-item
-          label="边框名称"
+          label="标题"
          class="lc-field-body"
        >
          <el-input
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/ExpressionDialog.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ExpressionDialog.vue
@ -136,7 +136,7 @@ export default {
            return {
              label: field,
              code: item,
-              value: `dataset.${item}[0].${field}`,
+              value: `dataset['${item}'][0].${field}`,
              disabled: item.includes(this.config.code)
            }
          })
@ -145,7 +145,7 @@ export default {
        list.push({
          label: item.split('_')[0],
          code: item,
-          value: `dataset.${item}`,
+          value: `dataset['${item}']`,
          disabled: item.includes(this.config.code),
          children
        })
@ -154,7 +154,7 @@ export default {
        list.push({
          label: item.split('_')[0],
          code: item,
-          value: `computedDatas.${item}`,
+          value: `computedDatas['${item}']`,
          disabled: item.includes(this.config.code)
        })
      }
--- a/data-room-ui/packages/js/mixins/commonMixins.js
+++ b/data-room-ui/packages/js/mixins/commonMixins.js
@ -25,6 +25,13 @@ export default {
        this.getDataByExpression(this.config)
      }
    },
+    // 标题发生变化时需要及时更新表达式中的数据集库的字段名
+    'config.title': {
+      handler (val, oldVal) {
+        this.updateDataset({ code: this.config.code, title: val, data: [], oldTitle: oldVal, isChangeTitle: true })
+        this.updateComputedDatas({ code: this.config.code, title: val, data: [], oldTitle: oldVal, isChangeTitle: true })
+      }
+    },
    currentDataset: { // 关联的数据发生变化
      handler (val, old) {
        if (val && Object.keys(val).length && JSON.stringify(val) !== JSON.stringify(old)) {
--- a/data-room-ui/packages/js/store/actions.js
+++ b/data-room-ui/packages/js/store/actions.js
@ -162,6 +162,7 @@ export function handleResData (data) {
 function compatibility (config, originalConfig) {
  const newConfig = config
  newConfig.version = originalConfig?.version || '2023071001'
+  newConfig.optionHandler = originalConfig.optionHandler || ''
  newConfig.dataSource = objCompare(newConfig?.dataSource, originalConfig?.dataSource)
  newConfig.customize = objCompare(newConfig?.customize, originalConfig?.customize)
  newConfig.option = { ...objCompare(newConfig.option, originalConfig?.option), displayOption: originalConfig?.option?.displayOption }