From dbdb4aa83f82e0b8fc797d36cb8d5dc01e39e6b6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 四月 2021 23:54:37 +0800
Subject: [PATCH] 2021-04-22

---
 src/menu/components/share/usercomponent/index.jsx |    1 +
 src/pc/modulesource/index.jsx                     |    1 +
 src/templates/modalconfig/dragelement/index.jsx   |    2 +-
 src/views/pcdesign/index.jsx                      |    1 +
 src/tabviews/zshare/fileupload/index.jsx          |    1 +
 src/components/editor/index.jsx                   |    1 +
 src/views/mobdesign/index.jsx                     |    1 +
 src/mob/modulesource/index.jsx                    |    1 +
 src/menu/popview/index.jsx                        |    1 +
 src/views/menudesign/index.jsx                    |    2 ++
 src/menu/modulesource/index.jsx                   |    1 +
 11 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/components/editor/index.jsx b/src/components/editor/index.jsx
index a94d12e..da053ae 100644
--- a/src/components/editor/index.jsx
+++ b/src/components/editor/index.jsx
@@ -92,6 +92,7 @@
     form.append('fileExt', params.file.fileType)
     form.append('shardingCnt', _param.chunks)
     form.append('shardingNo', _param.chunk)
+    // form.append('LoginUID', sessionStorage.getItem('LoginUID') || '')
 
     Api.getLargeFileUpload(form).then(res => {
       if (res.status) {
diff --git a/src/menu/components/share/usercomponent/index.jsx b/src/menu/components/share/usercomponent/index.jsx
index 30caa31..e10fa99 100644
--- a/src/menu/components/share/usercomponent/index.jsx
+++ b/src/menu/components/share/usercomponent/index.jsx
@@ -163,6 +163,7 @@
                 func: 's_custom_components_adduptdel',
                 c_id: config.uuid,
                 images: Utils.getcloudurl(result.Images),
+                typename: sessionStorage.getItem('appType') || '',
                 c_name: res.name,
                 long_param: window.btoa(window.encodeURIComponent(JSON.stringify(template))),
                 del_type: ''
diff --git a/src/menu/modulesource/index.jsx b/src/menu/modulesource/index.jsx
index 03f268a..2233f75 100644
--- a/src/menu/modulesource/index.jsx
+++ b/src/menu/modulesource/index.jsx
@@ -55,6 +55,7 @@
             c_id: item.uuid,
             images: '',
             c_name: item.title,
+            typename: sessionStorage.getItem('appType') || '',
             long_param: '',
             del_type: 'Y'
           }).then(result => {
diff --git a/src/menu/popview/index.jsx b/src/menu/popview/index.jsx
index 59da6e1..0abb17e 100644
--- a/src/menu/popview/index.jsx
+++ b/src/menu/popview/index.jsx
@@ -84,6 +84,7 @@
   updateCustomComponent = () => {
     Api.getSystemConfig({
       func: 's_get_custom_components',
+      typename: sessionStorage.getItem('appType'),
       typecharone: ''
     }).then(res => {
       let coms = []
diff --git a/src/mob/modulesource/index.jsx b/src/mob/modulesource/index.jsx
index f4705bf..f84cdd7 100644
--- a/src/mob/modulesource/index.jsx
+++ b/src/mob/modulesource/index.jsx
@@ -53,6 +53,7 @@
             c_id: item.uuid,
             images: '',
             c_name: item.title,
+            typename: sessionStorage.getItem('appType') || '',
             long_param: '',
             del_type: 'Y'
           }).then(result => {
diff --git a/src/pc/modulesource/index.jsx b/src/pc/modulesource/index.jsx
index f4705bf..f84cdd7 100644
--- a/src/pc/modulesource/index.jsx
+++ b/src/pc/modulesource/index.jsx
@@ -53,6 +53,7 @@
             c_id: item.uuid,
             images: '',
             c_name: item.title,
+            typename: sessionStorage.getItem('appType') || '',
             long_param: '',
             del_type: 'Y'
           }).then(result => {
diff --git a/src/tabviews/zshare/fileupload/index.jsx b/src/tabviews/zshare/fileupload/index.jsx
index df0cf6f..615bc83 100644
--- a/src/tabviews/zshare/fileupload/index.jsx
+++ b/src/tabviews/zshare/fileupload/index.jsx
@@ -97,6 +97,7 @@
     form.append('fileExt', params.file.fileType)
     form.append('shardingCnt', param.chunks)
     form.append('shardingNo', param.chunk)
+    // form.append('LoginUID', sessionStorage.getItem('LoginUID') || '')
 
     Api.getLargeFileUpload(form).then(res => {
       if (res.status) {
diff --git a/src/templates/modalconfig/dragelement/index.jsx b/src/templates/modalconfig/dragelement/index.jsx
index 478da3c..d09acc7 100644
--- a/src/templates/modalconfig/dragelement/index.jsx
+++ b/src/templates/modalconfig/dragelement/index.jsx
@@ -107,7 +107,7 @@
   return (
     <div ref={drop} className={'ant-row modal-fields-row ' + (setting.align || 'left_right')} >
       {cards.map(card => {
-        return <Col key={card.uuid} span={card.span || 24}>
+        return <Col key={card.uuid} span={card.type === 'split' ? 24 : (card.span || 24)}>
           <Card
             id={card.uuid}
             card={card}
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index fcbad2a..b01efb6 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -44,6 +44,7 @@
 
 sessionStorage.setItem('isEditState', 'true')
 sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
+sessionStorage.setItem('appType', '')          // 搴旂敤绫诲瀷
 document.body.className = ''
 window.GLOB.UserComponentMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夌粍浠�
 window.GLOB.urlFields = []               // url鍙橀噺
@@ -152,6 +153,7 @@
   updateCustomComponent = () => {
     Api.getSystemConfig({
       func: 's_get_custom_components',
+      typename: '',
       typecharone: ''
     }).then(res => {
       let coms = []
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index de87735..0000387 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -308,6 +308,7 @@
   updateCustomComponent = () => {
     Api.getSystemConfig({
       func: 's_get_custom_components',
+      typename: 'mob',
       typecharone: ''
     }).then(res => {
       let coms = []
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index befd0f7..5a249a6 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -324,6 +324,7 @@
   updateCustomComponent = () => {
     Api.getSystemConfig({
       func: 's_get_custom_components',
+      typename: 'pc',
       typecharone: ''
     }).then(res => {
       let coms = []

--
Gitblit v1.8.0