Merge pull request 'zq-slider-menu' (#49) from zq-slider-menu into master

Reviewed-on: #49
2 weeks ago · 35b0f8450c
5 changed files with 153 additions and 140 deletions
--- a/src/components/GlobalLoading1.vue
+++ b/src/components/GlobalLoading1.vue
@ -1,67 +1,69 @@
 <template>
-    <div class="content-loading-overlay" v-if="isLoading">
-        <div class="loading-content">
-            <div ref="animationContainer" class="animation-container"></div>
+    <div>
+        <div class="content-loading-overlay" v-show="isLoading">
+            <div class="loading-content">
+                <div ref="animationContainer" class="animation-container"></div>
+            </div>
+        </div>
+        <div  v-show="!isLoading">
+            <slot></slot>
        </div>
-    </div>
-    <div v-else style="height: 100%;">
-        <slot></slot>
    </div>
 </template>
-
 <script>
 import lottie from 'lottie-web'
 import { mapState } from 'vuex'
-import defaultAnimation from '@/assets/loadingAni.json' // 导入JSON文件
+import defaultAnimation from '@/assets/loadingAni.json'

 export default {
-    name: 'Loading',
-    data() {
-        return {
-            anim: null
-        }
-    },
-    computed: {
-        ...mapState(['isLoading', 'loadingText'])
-    },
-    watch: {
-        isLoading(newVal) {
-            if (newVal) {
-                this.$nextTick(()=>{
-                    this.playAnimation()
-                })
-            } else {
-                this.stopAnimation()
-            }
-        }
-    },
-    mounted() {
-        if (this.isLoading) {
-            this.playAnimation()
+  name: 'Loading',
+  data() {
+    return {
+      anim: null
+    }
+  },
+  computed: {
+    ...mapState(['isLoading', 'loadingText'])
+  },
+  watch: {
+    isLoading(newVal) {
+      this.$nextTick(() => {
+        if (newVal) {
+          this.playAnimation()
+        } else {
+          this.stopAnimation()
        }
+      })
+    }
+  },
+  methods: {
+    playAnimation() {
+      // 销毁旧实例（可选，根据需求）
+      if (this.anim) {
+        this.anim.destroy()
+        this.anim = null
+      }
+      
+      console.log('执行动画')
+      this.anim = lottie.loadAnimation({
+        container: this.$refs.animationContainer,
+        renderer: 'svg',
+        loop: true,
+        autoplay: true,
+        animationData: defaultAnimation
+      })
    },
-    beforeDestroy() {
-        this.stopAnimation()
-    },
-    methods: {
-        playAnimation() {
-            this.anim = lottie.loadAnimation({
-                container: this.$refs.animationContainer,
-                renderer: 'svg',
-                loop: true,
-                autoplay: true,
-                animationData: defaultAnimation // 你的JSON动画路径
-            })
-            if (this.anim) {
-                this.anim.play()
-            }
-        },
-        stopAnimation() {
-            if (this.anim) {
-                this.anim.stop()
-            }
-        }
+    stopAnimation() {
+      if (this.anim) {
+        this.anim.stop()
+      }
+    }
+  },
+  beforeDestroy() {
+    if (this.anim) {
+      this.anim.destroy() // 组件销毁时彻底清理
    }
+  }
 }
 </script>

--- a/src/components/GuipInput.vue
+++ b/src/components/GuipInput.vue
@ -1,5 +1,5 @@
 <template>
-  <el-form-item :style="{ height: height, ...styleObject }"
+  <el-form-item :style="{ ...styleObject }" :required="required"
    :class="[{ 'column': column }, { 'w510': addClass == 'w510' }, { 'w388': addClass == 'w388' }, 'form-item']" :label="label"
    :prop="prop" :rules="rules">
    <p v-if="desc" class="desc_right">{{ desc }}</p>
@ -36,7 +36,7 @@
 <script>
 export default {
  name: 'GuipInput',
-  props: ['value', 'styleObject', 'disabled', 'defaultValue', 'placeholder',
+  props: ['value', 'styleObject', 'disabled', 'defaultValue', 'placeholder','required',
    'maxlength', 'minLength', 'clear', 'width', 'height', 'showWordLimit',
    'label', 'type', 'prop', 'rules', 'column', 'addClass', 'desc', 'unit'],
  data() {
--- a/src/components/GuipRadio.vue
+++ b/src/components/GuipRadio.vue
@ -1,88 +1,88 @@
-   <template>
-    <el-form-item
-    :class="[{'column':column},'form-item']"
-    :label="label" :prop="prop" :rules="rules">
-      <el-radio-group
-        v-model="selectedValue"
-        v-bind="$attrs"
-        @change="handleChange"
+<template>
+  <el-form-item
+  :class="[{'column':column},'form-item']"
+  :label="label" :prop="prop" :rules="rules" :required="required">
+    <el-radio-group
+      v-model="selectedValue"
+      v-bind="$attrs"
+      @change="handleChange"
+    >
+      <el-radio
+        v-for="option in options"
+        :key="option.value"
+        :label="option.value"
+        :disabled="option.disabled"
      >
-        <el-radio
-          v-for="option in options"
-          :key="option.value"
-          :label="option.value"
-          :disabled="option.disabled"
-        >
-        <!-- 默认展示和选中显示 不同文案 -->
-          {{ selectedValue === option.value ? option.selectedLabel : option.label }}
-          <!-- 自定义 选中图标 -->
-          <!-- <template #label>
-            <span><img src="../assets/radio_checked.svg" alt="custom icon" style="width: 16px; height: 16px;"> {{ text }}</span>
-          </template> -->
-        </el-radio>
-      </el-radio-group>
-    </el-form-item>
-  </template>
+      <!-- 默认展示和选中显示 不同文案 -->
+        {{( selectedValue === option.value ) ? (option.selectedLabel ? option.selectedLabel : option.label) :option.label }}
+      </el-radio>
+    </el-radio-group>
+  </el-form-item>
+</template>

-  <script>
-  export default {
-    name: 'MyRadioGroup',
-    props: {
-      // 是否是纵向排列
-      column:{
-        type:Boolean,
-        default:false
-      },
-      // 选项列表，格式为 [{ label: '显示文本', value: '值', disabled: false }]
-      options: {
-        type: Array,
-        required: true,
-      },
-      // 当前选中的值，使用 v-model 绑定
-      value: {
-        type: [String, Number, Boolean],
-        default: '',
-      },
-      // 表单项的 label
-      label: {
-        type: String,
-        default: '',
-      },
-      // 表单项的 prop（用于表单校验）
-      prop: {
-        type: String,
-        default: '',
-      },
-      // 校验规则
-      rules: {
-        type: Array,
-        default: () => [],
-      },
+<script>
+export default {
+  name: 'MyRadioGroup',
+  props: {
+    // 是否是纵向排列
+    column:{
+      type:String,
+      default:''
    },
-    data() {
-      return {
-        selectedValue: this.value, // 内部维护的选中值
-      };
+    required:{
+      type:Boolean,
+      default:false
    },
-    watch: {
-      // 监听外部传入的 value 变化，更新内部 selectedValue
-      value(newVal) {
-        this.selectedValue = newVal;
-      },
+    // 选项列表，格式为 [{ label: '显示文本', value: '值', disabled: false }]
+    options: {
+      type: Array,
+      required: true,
    },
-    methods: {
-      // 选中值变化时触发
-      handleChange(value) {
-        this.$emit('input', value); // 更新 v-model
-        this.$emit('change', value); // 触发 change 事件
-      },
+    // 当前选中的值，使用 v-model 绑定
+    value: {
+      type: [String, Number, Boolean],
+      default: '',
    },
-  };
-  </script>
+    // 表单项的 label
+    label: {
+      type: String,
+      default: '',
+    },
+    // 表单项的 prop（用于表单校验）
+    prop: {
+      type: String,
+      default: '',
+    },
+    // 校验规则
+    rules: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      selectedValue: this.value, // 内部维护的选中值
+    };
+  },
+  watch: {
+    // 监听外部传入的 value 变化，更新内部 selectedValue
+    value(newVal) {
+      this.selectedValue = newVal;
+    },
+  },
+  methods: {
+    // 选中值变化时触发
+    handleChange(value) {
+      this.$emit('input', value); // 更新 v-model
+      this.$emit('change', value); // 触发 change 事件
+    },
+  },
+};
+</script>

-  <style scoped>
-  /* 自定义样式 */
-  .el-radio-group {
-    margin: 10px 0;
-  }
-  </style>
+<style scoped>
+/* 自定义样式 */
+.el-radio-group {
+  margin: 10px 0;
+}
+</style>
--- a/src/components/GuipSelect.vue
+++ b/src/components/GuipSelect.vue
@ -1,5 +1,5 @@
 <template>
-  <el-form-item :style="{ ...style, height: height, ...styleObject }"
+  <el-form-item :style="{ ...style, height: height, ...styleObject }" :required="required"
    :class="[{ 'column': column }, { 'w510': addClass == 'w510' }, { 'w388': addClass == 'w388' }, 'form-item']"
    :label="label" :prop="prop" :rules="rules">
    <p v-if="desc" class="desc_right">{{ desc }}</p>
@ -32,6 +32,7 @@ export default {
    },
    styleObject: Object,
    disabled: Boolean,
+    required: Boolean,
    defaultValue: [String, Number, Array],
    placeholder: String,
    width: String,
--- a/src/views/elementGroups.vue
+++ b/src/views/elementGroups.vue
@ -11,7 +11,7 @@
                </div>
                <div class="ele-item">
                    <label for="">下拉框：</label>
-                    <GuipSelect width="600px" v-model="form.card" label="卡片" prop="card" :options="options"
+                    <GuipSelect width="600px" v-model="form.card" label="卡片" :default-value="form.card" prop="card" :options="options"  valueKey="id1"  labelKey="id2"
                        defaultValue="选项1" />
                </div>
                <div>
@ -263,7 +263,7 @@

                <div style="width: 800px;height: 150px;">
                    <h3>表单上下布局 (宽度 510 388 用的最多 已有这2种宽度类名设置)</h3>
-                    <GuipInput ref="GuipInput" column="column" addClass="w510" label="age" desc="这是是右侧文案"
+                    <GuipInput ref="GuipInput" column="column" addClass="w510" required label="age" desc="这是是右侧文案"
                        v-model="form.age" prop="age" placeholder="这是自定义默认提示语" />
                </div>

@ -640,21 +640,31 @@ export default {
            options: [{
                value: '选项1',
                label1: '黄金hhhhhh',
+                id1:'1',
+                id2:'啊11哈哈',
                label: '黄金糕'
            }, {
                value: '选项2',
+                id1:'12',
+                id2:'啊22哈哈',
                label1: '双皮奶hhhhhhhhh',
                label: '双皮奶'
            }, {
                value: '选项3',
+                id1:'13',
+                id2:'啊33哈哈',
                label1: '蚵仔煎hhhhhhhhh',
                label: '蚵仔煎'
            }, {
                value: '选项4',
+                id1:'14',
+                id2:'啊444哈哈',
                label1: '双皮奶hhhhhhhhh',
                label: '龙须面'
            }, {
                value: '选项5',
+                id1:'155',
+                id2:'啊55哈哈',
                label1: '双皮奶hhhhhhhhh',
                label: '北京烤鸭'
            }],