修复日期组件、时间组件、富文本组件的Vue3兼容问题。

2025-09-17 19:53:02 +08:00 · 2022-01-15 01:26:51 +08:00
parent 15c20de9e5
commit 54e11ab3b7
21 changed files with 137 additions and 61 deletions
--- a/src/components/form-designer/setting-panel/property-editor/autoFullWidth-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/autoFullWidth-editor.vue
@ -0,0 +1,23 @@
+<template>
+  <el-form-item :label="i18nt('designer.setting.autoFullWidth')">
+    <el-checkbox v-model="optionModel.autoFullWidth"></el-checkbox>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "@/utils/i18n"
+
+  export default {
+    name: "autoFullWidth-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
--- a/src/components/form-designer/setting-panel/property-editor/field-color/color-defaultValue-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-color/color-defaultValue-editor.vue
@ -1,6 +1,8 @@
 <template>
-  <el-color-picker v-model="optionModel.defaultValue" @change="emitDefaultValueChange">
-  </el-color-picker>
+  <el-form-item :label="i18nt('designer.setting.defaultValue')">
+    <el-color-picker v-model="optionModel.defaultValue" @change="emitDefaultValueChange">
+    </el-color-picker>
+  </el-form-item>
 </template>

 <script>
--- a/src/components/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultValue-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultValue-editor.vue
@ -1,7 +1,9 @@
 <template>
-  <el-date-picker :type="optionModel.type" v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                  :format="optionModel.format" :value-format="optionModel.valueFormat" style="width: 100%">
-  </el-date-picker>
+  <el-form-item :label="i18nt('designer.setting.defaultValue')">
+    <el-date-picker :type="optionModel.type" v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
+                    :format="optionModel.format" :value-format="optionModel.valueFormat" style="width: 100%">
+    </el-date-picker>
+  </el-form-item>
 </template>

 <script>
--- a/src/components/form-designer/setting-panel/property-editor/field-date-range/date-range-format-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-date-range/date-range-format-editor.vue
@ -2,8 +2,8 @@
  <el-form-item :label="i18nt('designer.setting.format')">
    <el-select v-model="optionModel.format" filterable allow-create>
      <el-option label="YYYY-MM-DD" value="YYYY-MM-DD"></el-option>
-      <el-option label="yyyy/MM/dd" value="yyyy/MM/dd"></el-option>
-      <el-option label="yyyy年MM月dd日" value="yyyy年MM月dd日"></el-option>
+      <el-option label="YYYY/MM/DD" value="YYYY/MM/DD"></el-option>
+      <el-option label="YYYY年MM月DD日" value="YYYY年MM月DD日"></el-option>
      <el-option label="YYYY-MM-DD HH:mm:ss" value="YYYY-MM-DD HH:mm:ss"></el-option>
      <el-option label="YYYY-MM-DD hh:mm:ss" value="YYYY-MM-DD hh:mm:ss"></el-option>
    </el-select>
--- a/src/components/form-designer/setting-panel/property-editor/field-date/date-defaultValue-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-date/date-defaultValue-editor.vue
@ -1,7 +1,9 @@
 <template>
-  <el-date-picker :type="optionModel.type" v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                  :format="optionModel.format" :value-format="optionModel.valueFormat" style="width: 100%">
-  </el-date-picker>
+  <el-form-item :label="i18nt('designer.setting.defaultValue')">
+    <el-date-picker :type="optionModel.type" v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
+                    :format="optionModel.format" :value-format="optionModel.valueFormat" style="width: 100%">
+    </el-date-picker>
+  </el-form-item>
 </template>

 <script>
--- a/src/components/form-designer/setting-panel/property-editor/field-date/date-format-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-date/date-format-editor.vue
@ -2,8 +2,8 @@
  <el-form-item :label="i18nt('designer.setting.format')">
    <el-select v-model="optionModel.format" filterable allow-create>
      <el-option label="YYYY-MM-DD" value="YYYY-MM-DD"></el-option>
-      <el-option label="yyyy/MM/dd" value="yyyy/MM/dd"></el-option>
-      <el-option label="yyyy年MM月dd日" value="yyyy年MM月dd日"></el-option>
+      <el-option label="YYYY/MM/DD" value="YYYY/MM/DD"></el-option>
+      <el-option label="YYYY年MM月DD日" value="YYYY年MM月DD日"></el-option>
      <el-option label="YYYY-MM-DD HH:mm:ss" value="YYYY-MM-DD HH:mm:ss"></el-option>
      <el-option label="YYYY-MM-DD hh:mm:ss" value="YYYY-MM-DD hh:mm:ss"></el-option>
    </el-select>
--- a/src/components/form-designer/setting-panel/property-editor/field-rich-editor/rich-editor-contentHeight-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-rich-editor/rich-editor-contentHeight-editor.vue
@ -0,0 +1,25 @@
+<template>
+  <div>
+    <el-form-item :label="i18nt('designer.setting.contentHeight')">
+      <el-input type="text" v-model="optionModel.contentHeight"></el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "@/utils/i18n"
+
+  export default {
+    name: "rich-editor-contentHeight-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
--- a/src/components/form-designer/setting-panel/property-editor/field-time-range/time-range-defaultValue-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-time-range/time-range-defaultValue-editor.vue
@ -1,7 +1,9 @@
 <template>
-  <el-time-picker v-model="optionModel.defaultValue" is-range @change="emitDefaultValueChange"
-                  :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
-  </el-time-picker>
+  <el-form-item :label="i18nt('designer.setting.defaultValue')">
+    <el-time-picker v-model="optionModel.defaultValue" is-range @change="emitDefaultValueChange"
+                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
+    </el-time-picker>
+  </el-form-item>
 </template>

 <script>
--- a/src/components/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue
+++ b/src/components/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue
@ -1,7 +1,9 @@
 <template>
-  <el-time-picker v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                  :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
-  </el-time-picker>
+  <el-form-item :label="i18nt('designer.setting.defaultValue')">
+    <el-time-picker v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
+                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
+    </el-time-picker>
+  </el-form-item>
 </template>

 <script>
--- a/src/components/form-designer/setting-panel/propertyRegister.js
+++ b/src/components/form-designer/setting-panel/propertyRegister.js
@ -14,6 +14,7 @@ const COMMON_PROPERTIES = {
  'startPlaceholder'  :            'startPlaceholder-editor',
  'endPlaceholder'    :            'endPlaceholder-editor',
  'columnWidth'       :            'columnWidth-editor',
+  'autoFullWidth'     :            'autoFullWidth-editor',
  'size'              :            'size-editor',
  'showStops'         :            'showStops-editor',
  'displayStyle'      :            'displayStyle-editor',
@ -50,6 +51,7 @@ const COMMON_PROPERTIES = {
  'limit'             :            'limit-editor',
  'fileMaxSize'       :            'fileMaxSize-editor',
  'fileTypes'         :            'fileTypes-editor',
+  'contentHeight'     :            'contentHeight-editor',
  'customClass'       :            'customClass-editor',

  //容器