From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 23 七月 2023 10:32:40 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/pc/components/login/normal-login/options.jsx | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/pc/components/login/normal-login/options.jsx b/src/pc/components/login/normal-login/options.jsx index 054fd0a..634d7bf 100644 --- a/src/pc/components/login/normal-login/options.jsx +++ b/src/pc/components/login/normal-login/options.jsx @@ -70,15 +70,24 @@ // precision: 0, // required: false // }, - { - type: 'styleInput', - field: 'height', - label: '楂樺害', - initval: wrap.height || '', - tooltip: '缁勪欢鍗犵敤鐨勬渶灏忛珮搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�', - required: false, - options: ['px', 'vh', 'vw', '%'] - }, + // { + // type: 'styleInput', + // field: 'height', + // label: '鏈�灏忛珮搴�', + // initval: wrap.height || '', + // tooltip: '缁勪欢鍗犵敤鐨勬渶灏忛珮搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�', + // required: false, + // options: ['px', 'vh', 'vw', '%'] + // }, + // { + // type: 'styleInput', + // field: 'maxWidth', + // label: '鏈�澶у搴�', + // initval: wrap.maxWidth || '', + // tooltip: '缁勪欢鍗犵敤鐨勬渶澶у搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�', + // required: false, + // options: ['px', 'vh', 'vw', '%'] + // }, { type: 'radio', field: 'topTip', -- Gitblit v1.8.0