Explorar o código

feat:二次确认/自动获焦/fix:tagsbug

ananzhusen hai 7 meses
pai
achega
55d406fafc

+ 23 - 0
src/services/defaults.ts

@@ -3978,6 +3978,15 @@ context.meta2d.translate(
           // activeTextColor: '#000000FF',
           // activeTextColor: '#000000FF',
           textLeft: 10,
           textLeft: 10,
           interaction: true,
           interaction: true,
+          props: {
+            custom: [
+              {
+                key: 'autofocus',
+                label: '自动获得焦点',
+                type: 'bool',
+              },
+            ]
+          }
         },
         },
       },
       },
       {
       {
@@ -3999,6 +4008,15 @@ context.meta2d.translate(
           color: '#424B61',
           color: '#424B61',
           textColor: '#FFFFFFE6',
           textColor: '#FFFFFFE6',
           interaction: true,
           interaction: true,
+          props: {
+            custom: [
+              {
+                key: 'autofocus',
+                label: '自动获得焦点',
+                type: 'bool',
+              },
+            ]
+          },
           // color: '#D9D9D9FF',
           // color: '#D9D9D9FF',
           // textColor: '#000000FF',
           // textColor: '#000000FF',
           // hoverTextColor: '#000000FF',
           // hoverTextColor: '#000000FF',
@@ -4172,6 +4190,11 @@ context.meta2d.translate(
                 label: $t('下拉悬停颜色'),
                 label: $t('下拉悬停颜色'),
                 type: 'color',
                 type: 'color',
               },
               },
+              {
+                key: 'autofocus',
+                label: '自动获得焦点',
+                type: 'bool',
+              },
             ]
             ]
           }
           }
         },
         },

+ 8 - 0
src/views/components/PenEvents.vue

@@ -35,6 +35,14 @@
           </template>
           </template>
 
 
           <Conditions :data="props.pen.events[i]" />
           <Conditions :data="props.pen.events[i]" />
+          <div class="form-item mt-16">
+            <label>二次确认</label>
+            <t-switch class="mt-8 ml-8" v-if="['click','dblclick'].includes(item.name)" v-model="item.confirm" />
+          </div>
+          <div v-if="item.confirm" class="form-item mt-8 mb-16">
+            <label>确认文本</label>
+            <t-input  v-model="item.confirmTitle" />
+          </div>
           <Actions :data="props.pen.events[i]" />
           <Actions :data="props.pen.events[i]" />
         </t-collapse-panel>
         </t-collapse-panel>
       </t-collapse>
       </t-collapse>

+ 1 - 1
src/views/components/PensProps.vue

@@ -831,7 +831,7 @@ onBeforeMount(() => {
     data.tags = [];
     data.tags = [];
   }
   }
   let tags = selections.pens[0].tags;
   let tags = selections.pens[0].tags;
-  if(tags.length){
+  if(tags?.length){
     tags.forEach((tag: string) => {
     tags.forEach((tag: string) => {
       let common = selections.pens.every((item: Pen) => {
       let common = selections.pens.every((item: Pen) => {
         return item.tags.includes(tag);
         return item.tags.includes(tag);