From 1f5f5721e556ce1ede1be293313d7af88ef60677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 一月 2023 18:35:50 +0800
Subject: [PATCH] 2023-01-10

---
 src/mob/components/navbar/normal-navbar/options.jsx        |   40 ++++++++++++++++++++
 src/tabviews/custom/components/share/normalTable/index.jsx |    6 ++
 src/tabviews/zshare/topSearch/index.jsx                    |   11 +++++
 src/views/login/index.jsx                                  |    6 +-
 4 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/mob/components/navbar/normal-navbar/options.jsx b/src/mob/components/navbar/normal-navbar/options.jsx
index 1b4f32e..d8eadc8 100644
--- a/src/mob/components/navbar/normal-navbar/options.jsx
+++ b/src/mob/components/navbar/normal-navbar/options.jsx
@@ -41,6 +41,46 @@
     },
     {
       type: 'radio',
+      field: 'switch',
+      label: '鍒囨崲鏂瑰紡',
+      initval: wrap.switch || 'default',
+      tooltip: '榛樿鏃跺湪H5涓細鍒囨崲椤甸潰锛孉PP涓細鍒囨崲鏍囩椤碉紝浣跨敤鏍囩椤垫椂浼氬己鍒朵娇鐢ㄦ爣绛惧垏鎹€��',
+      required: false,
+      options: [
+        {value: 'default', label: '榛樿'},
+        {value: 'tab', label: '鏍囩椤�'},
+      ],
+      controlFields: [
+        {field: 'position', values: ['tab']},
+        {field: 'selectStyle', values: ['tab']},
+      ]
+    },
+    {
+      type: 'radio',
+      field: 'position',
+      label: '鑿滃崟浣嶇疆',
+      initval: wrap.position || 'bottom',
+      required: false,
+      options: [
+        {value: 'bottom', label: '搴曢儴'},
+        {value: 'left', label: '宸︿晶'},
+        {value: 'right', label: '鍙充晶'},
+      ]
+    },
+    {
+      type: 'radio',
+      field: 'selectStyle',
+      label: '鑿滃崟鏍峰紡',
+      initval: wrap.selectStyle || 'default',
+      tooltip: '鍏蜂綋鏍峰紡璇峰湪绯荤粺杩愯鐜鏌ョ湅銆�',
+      required: false,
+      options: [
+        {value: 'default', label: '榛樿'},
+        {value: 'class1', label: '鏍峰紡浜�'},
+      ]
+    },
+    {
+      type: 'radio',
       field: 'permission',
       label: '鏉冮檺楠岃瘉',
       initval: wrap.permission || 'false',
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 9efe403..5c7df59 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -979,6 +979,10 @@
     }
 
     let height = setting.height || false
+    let loading = this.props.loading
+    if (setting.mask === 'hidden') {
+      loading = false
+    }
 
     return (
       <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''}`} id={tableId}>
@@ -992,7 +996,7 @@
           rowSelection={rowSelection}
           columns={this.state.columns}
           dataSource={_data}
-          loading={this.props.loading}
+          loading={loading}
           scroll={{ x: '100%', y: height }}
           onRow={(record, index) => {
             return {
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 0b4ad56..9c98c03 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -4,6 +4,7 @@
 import { Form, Row, Col, Button, notification, Modal, Drawer } from 'antd'
 import { CloseOutlined, DownOutlined } from '@ant-design/icons'
 import moment from 'moment'
+import md5 from 'md5'
 
 import Api from '@/api'
 import options from '@/store/options.js'
@@ -37,6 +38,7 @@
   }
 
   record = {}
+  sign = ''
 
   UNSAFE_componentWillMount () {
     const { config, searchlist, setting } = this.props
@@ -636,6 +638,15 @@
           }
         }
 
+        let sign = md5(JSON.stringify(searches))
+
+        if (sign === this.sign) return
+
+        this.sign = sign
+        setTimeout(() => {
+          this.sign = ''
+        }, 2000)
+        
         this.props.refreshdata(searches)
       })
     })
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index fada920..9b220fc 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -129,9 +129,9 @@
           visible = true
         } else if (level === 'letter_num' && /^([^0-9]*|[^a-zA-Z]*)$/.test(param.password)) {
           visible = true
-        } else if ((level === 'char_num' || level === 'char_num_90') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
+        } else if ((level === 'char_num' || level === 'char_num_90' || level === 'char_num_90_sms') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
           visible = true
-        } else if (level === 'char_num_90' && res.modifydate) {
+        } else if ((level === 'char_num_90' || level === 'char_num_90_sms') && res.modifydate) {
           let s = (new Date().getTime() - new Date(res.modifydate).getTime()) / (1000 * 24 * 60 * 60)
           if (!isNaN(s) && s > 90) {
             visible = true
@@ -608,7 +608,7 @@
 
             let level = res.pwd_level || ''
 
-            if (level && !['letter_num', 'char_num', 'char_num_90'].includes(level)) {
+            if (level && !['letter_num', 'char_num', 'char_num_90', 'char_num_90_sms'].includes(level)) {
               level = ''
             }
 

--
Gitblit v1.8.0