From 1bf4583525077aa41e639bf091a8b9a55e0a73f9 Mon Sep 17 00:00:00 2001 From: ival <610568032@qq.com> Date: Tue, 6 Apr 2021 10:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iscs_new/core/form/props.js | 9 +++++++++ src/iscs_new/utils/mobile.js | 12 ------------ src/views/test/index.vue | 8 ++++---- 3 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 src/iscs_new/core/form/props.js delete mode 100644 src/iscs_new/utils/mobile.js diff --git a/src/iscs_new/core/form/props.js b/src/iscs_new/core/form/props.js new file mode 100644 index 000000000..24cabc844 --- /dev/null +++ b/src/iscs_new/core/form/props.js @@ -0,0 +1,9 @@ +export default { + String: 'String', + Number: 'Number', + Select: 'Select', + Boolean: 'Boolean', + Color: 'Color', + Point: 'Point', + Points: 'Points' +} diff --git a/src/iscs_new/utils/mobile.js b/src/iscs_new/utils/mobile.js deleted file mode 100644 index b2528d6ad..000000000 --- a/src/iscs_new/utils/mobile.js +++ /dev/null @@ -1,12 +0,0 @@ -export function isMobile() { - var sUserAgent= navigator.userAgent.toLowerCase(); - var bIsIpad= sUserAgent.match(/ipad/i) == 'ipad'; - var bIsIphoneOs= sUserAgent.match(/iphone os/i) == 'iphone os'; - var bIsMidp= sUserAgent.match(/midp/i) == 'midp'; - var bIsUc7= sUserAgent.match(/rv:1.2.3.4/i) == 'rv:1.2.3.4'; - var bIsUc= sUserAgent.match(/ucweb/i) == 'ucweb'; - var bIsAndroid= sUserAgent.match(/android/i) == 'android'; - var bIsCE= sUserAgent.match(/windows ce/i) == 'windows ce'; - var bIsWM= sUserAgent.match(/windows mobile/i) == 'windows mobile'; - return (bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM); -} diff --git a/src/views/test/index.vue b/src/views/test/index.vue index 136457c67..c5bf5ddb4 100644 --- a/src/views/test/index.vue +++ b/src/views/test/index.vue @@ -319,10 +319,10 @@ export default { { status: 's2', code: '101', type: 'Device' } ]); setTimeout(e => { - this.$iscs.update([ - { status: 's0', code: '100', type: 'Device' }, - { status: 's0', code: '101', type: 'Device' }, - ]) + // this.$iscs.update([ + // { status: 's0', code: '100', type: 'Device' }, + // { status: 's0', code: '101', type: 'Device' }, + // ]) }, 15000) }, // 键盘快捷键事件