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

Reviewed-on: #49

src/components/GlobalLoading1.vue

@@ -1,18 +1,19 @@
 <template>
-    <div class="content-loading-overlay" v-if="isLoading">
+    <div>
+        <div class="content-loading-overlay" v-show="isLoading">
             <div class="loading-content">
                 <div ref="animationContainer" class="animation-container"></div>
             </div>
         </div>
-    <div v-else style="height: 100%;">
+        <div  v-show="!isLoading">
             <slot></slot>
         </div>
+    </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',
@@ -26,41 +27,42 @@ export default {
   },
   watch: {
     isLoading(newVal) {
-            if (newVal) {
       this.$nextTick(() => {
+        if (newVal) {
           this.playAnimation()
-                })
         } else {
           this.stopAnimation()
         }
+      })
     }
   },
-    mounted() {
-        if (this.isLoading) {
-            this.playAnimation()
-        }
-    },
-    beforeDestroy() {
-        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 // 你的JSON动画路径
+        animationData: defaultAnimation
       })
-            if (this.anim) {
-                this.anim.play()
-            }
     },
     stopAnimation() {
       if (this.anim) {
         this.anim.stop()
       }
     }
+  },
+  beforeDestroy() {
+    if (this.anim) {
+      this.anim.destroy() // 组件销毁时彻底清理
+    }
   }
 }
 </script>

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() {

src/components/GuipRadio.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form-item
   :class="[{'column':column},'form-item']"
-    :label="label" :prop="prop" :rules="rules">
+  :label="label" :prop="prop" :rules="rules" :required="required">
     <el-radio-group
       v-model="selectedValue"
       v-bind="$attrs"
@@ -14,11 +14,7 @@
         :disabled="option.disabled"
       >
       <!-- 默认展示和选中显示 不同文案 -->
-          {{ selectedValue === option.value ? option.selectedLabel : option.label }}
+        {{( selectedValue === option.value ) ? (option.selectedLabel ? option.selectedLabel : option.label) :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>
@@ -30,6 +26,10 @@
   props: {
     // 是否是纵向排列
     column:{
+      type:String,
+      default:''
+    },
+    required:{
       type:Boolean,
       default:false
     },

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,

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: '北京烤鸭'
             }],