简柏林 / thingskit-scada · Commits

Commit 08a27d90fe7681ce08c591c9e6b611a203281b1a

Authored by ww
1 parent d2915ed7

fix: fix upload mask can not close

Inline Side-by-side
Showing 1 changed file with 42 additions and 38 deletions
@@ -5920,26 +5920,26 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -5920,26 +5920,26 @@ DataFormatPanel.prototype.addDataFont = function (container) {
5920 const content = ` 5920 const content = `
5921 <tr class="layui-form" lay-filter="${rowFormFilter}"> 5921 <tr class="layui-form" lay-filter="${rowFormFilter}">
5922 <td> 5922 <td>
5923 - <div class="layui-form-item">  
5924 - <input class="layui-input ${enumActionEl.MIN_FILTER}" autocomplete="off" type="number" name="${enumConst.MIN}" lay-filter="${enumConst.MIN}" lay-verType="tips" lay-verify="required" />  
5925 - </div> 5923 + <div class="layui-form-item">
  5924 + <input class="layui-input ${enumActionEl.MIN_FILTER}" autocomplete="off" type="number" name="${enumConst.MIN}" lay-filter="${enumConst.MIN}" lay-verType="tips" lay-verify="required" />
  5925 + </div>
5926 </td> 5926 </td>
5927 <td> 5927 <td>
5928 - <div class="layui-form-item">  
5929 - <input class="layui-input ${enumActionEl.MAX_FILTER}"" autocomplete="off" type="number" name="${enumConst.MAX}" lay-filter="${enumConst.MAX}" lay-verType="tips" lay-verify="required" />  
5930 - </div> 5928 + <div class="layui-form-item">
  5929 + <input class="layui-input ${enumActionEl.MAX_FILTER}"" autocomplete="off" type="number" name="${enumConst.MAX}" lay-filter="${enumConst.MAX}" lay-verType="tips" lay-verify="required" />
  5930 + </div>
5931 </td> 5931 </td>
5932 <td> 5932 <td>
5933 - <div class="${enumActionEl.SET_IMG_EL}">  
5934 - <input name="${enumConst.IMAGE_GALLERY_CATEGORY}" type="text" style="display: none">  
5935 - <input name="${enumConst.IMAGE_GALLERY_IMAGE_PATH}" type="text" style="display: none">  
5936 - <input name="${enumConst.IMAGE_ORIGIN}" type="text" style="display: none">  
5937 - <div class="${enumActionEl.PREVIEW_IMG_CONTAINER}">  
5938 - <img src="" alt="">  
5939 - <div class="${enumActionEl.DEL_PREVIEW_IMG}">x</div>  
5940 - <div class="add__button">+</div>  
5941 - </div>  
5942 - </div> 5933 + <div class="${enumActionEl.SET_IMG_EL}">
  5934 + <input name="${enumConst.IMAGE_GALLERY_CATEGORY}" type="text" style="display: none">
  5935 + <input name="${enumConst.IMAGE_GALLERY_IMAGE_PATH}" type="text" style="display: none">
  5936 + <input name="${enumConst.IMAGE_ORIGIN}" type="text" style="display: none">
  5937 + <div class="${enumActionEl.PREVIEW_IMG_CONTAINER}">
  5938 + <img src="" alt="">
  5939 + <div class="${enumActionEl.DEL_PREVIEW_IMG}">x</div>
  5940 + <div class="add__button">+</div>
  5941 + </div>
  5942 + </div>
5943 </td> 5943 </td>
5944 <!-- <td>--> 5944 <!-- <td>-->
5945 <!-- <div style="display: flex">--> 5945 <!-- <div style="display: flex">-->
@@ -7417,17 +7417,16 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -7417,17 +7417,16 @@ DataFormatPanel.prototype.addDataFont = function (container) {
7417 */ 7417 */
7418 function createLocalFileContainer() { 7418 function createLocalFileContainer() {
7419 return ` 7419 return `
7420 - <div id="${enumActionEl.UPLOAD_LOCAL_FILE_EL}" class="layui-upload">  
7421 - <div class="preview__img">  
7422 - <img src="" class="layui-upload-img" id="${enumActionEl.IMAGE_PREVIEW_EL}">  
7423 - <div class="var_image__add-icon">+</div>  
7424 - <div class="var-image__del-icon">x</div>  
7425 - </div>  
7426 - <div class="layui-upload-list"></div>  
7427 - </div>  
7428 - <div id="${enumActionEl.IMAGE_UPLOAD_STATE_EL}"></div>  
7429 - <div style="margin-top: 30px;">图片格式支持png、jpg(jpeg)、gif, 大小不能超过5M</div>  
7430 - ` 7420 + <div id="${enumActionEl.UPLOAD_LOCAL_FILE_EL}" class="layui-upload">
  7421 + <div class="preview__img">
  7422 + <img src="" class="layui-upload-img" id="${enumActionEl.IMAGE_PREVIEW_EL}">
  7423 + <div class="var_image__add-icon">+</div>
  7424 + <div class="var-image__del-icon">x</div>
  7425 + </div>
  7426 + <div class="layui-upload-list"></div>
  7427 + </div>
  7428 + <div style="margin-top: 10px;" id="${enumActionEl.IMAGE_UPLOAD_STATE_EL}"></div>
  7429 + <div style="margin-top: 10px;">图片格式支持png、jpg(jpeg)、gif, 大小不能超过5M</div>`
7431 } 7430 }
7432 7431
7433 /** 7432 /**
@@ -7437,15 +7436,14 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -7437,15 +7436,14 @@ DataFormatPanel.prototype.addDataFont = function (container) {
7437 const category = sidebarInstance.getAllVariableImageLib() 7436 const category = sidebarInstance.getAllVariableImageLib()
7438 const defaultShow = category[0] || { lib: [] } 7437 const defaultShow = category[0] || { lib: [] }
7439 return ` 7438 return `
7440 - <div class="var-image__container--gallery">  
7441 - <div id="${enumActionEl.VAR_IMG_CONTAINER_SIDEBAR}">  
7442 - ${category.reduce((prev, next) => prev + `<div class="${enumActionEl.VAR_IMG_CATEGORY}" ${enumConst.IMAGE_GALLERY_CATEGORY}="${next.key}">${next.label}</div>`, '')}  
7443 - </div>  
7444 - <div id="${enumActionEl.VAR_IMG_CONTAINER_CONTENT}">  
7445 - ${defaultShow.lib.reduce((prev, next) => prev + `<div class="${enumActionEl.VAR_IMG_ITEM}" title="${next.name}"><img src="${next.staticPath}" alt=""></div>`, '')}  
7446 - </div>  
7447 - </div>  
7448 - ` 7439 + <div class="var-image__container--gallery">
  7440 + <div id="${enumActionEl.VAR_IMG_CONTAINER_SIDEBAR}">
  7441 + ${category.reduce((prev, next) => prev + `<div class="${enumActionEl.VAR_IMG_CATEGORY}" ${enumConst.IMAGE_GALLERY_CATEGORY}="${next.key}">${next.label}</div>`, '')}
  7442 + </div>
  7443 + <div id="${enumActionEl.VAR_IMG_CONTAINER_CONTENT}">
  7444 + ${defaultShow.lib.reduce((prev, next) => prev + `<div class="${enumActionEl.VAR_IMG_ITEM}" title="${next.name}"><img src="${next.staticPath}" alt=""></div>`, '')}
  7445 + </div>
  7446 + </div>`
7449 } 7447 }
7450 7448
7451 /** 7449 /**
@@ -7464,14 +7462,20 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -7464,14 +7462,20 @@ DataFormatPanel.prototype.addDataFont = function (container) {
7464 url: '/yt/oss/upload', 7462 url: '/yt/oss/upload',
7465 method: 'post', 7463 method: 'post',
7466 choose(obj) { 7464 choose(obj) {
  7465 + console.log('enter choose')
7467 obj.preview(async function (index, file, result) { 7466 obj.preview(async function (index, file, result) {
7468 const formData = new FormData() 7467 const formData = new FormData()
7469 formData.set('file', file) 7468 formData.set('file', file)
  7469 + $(`#${enumActionEl.IMAGE_UPLOAD_STATE_EL}`).html('上传中...')
7470 const [err, res] = await to(ConfigurationNodeApi.uploadImg(formData)) 7470 const [err, res] = await to(ConfigurationNodeApi.uploadImg(formData))
7471 if (!err) { 7471 if (!err) {
7472 $(`#${enumActionEl.IMAGE_PREVIEW_EL}`).attr('src', result) 7472 $(`#${enumActionEl.IMAGE_PREVIEW_EL}`).attr('src', result)
7473 const { fileStaticUri = '' } = res 7473 const { fileStaticUri = '' } = res
7474 imageState[enumConst.IMAGE_GALLERY_IMAGE_PATH] = fileStaticUri 7474 imageState[enumConst.IMAGE_GALLERY_IMAGE_PATH] = fileStaticUri
  7475 + $(`#${enumActionEl.IMAGE_UPLOAD_STATE_EL}`).html('上传成功').css({ color: '#5fb878' })
  7476 + } else {
  7477 + console.log(err)
  7478 + $(`#${enumActionEl.IMAGE_UPLOAD_STATE_EL}`).html('上传失败').css({ color: 'red' })
7475 } 7479 }
7476 }); 7480 });
7477 }, 7481 },
@@ -7545,9 +7549,9 @@ DataFormatPanel.prototype.addDataFont = function (container) { @@ -7545,9 +7549,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
7545 imageState = {} 7549 imageState = {}
7546 layer.close(index) 7550 layer.close(index)
7547 }, 7551 },
7548 - zIndex: layer.zIndex, 7552 + // zIndex: layer.zIndex,
7549 async success(layero, index) { 7553 async success(layero, index) {
7550 - layer.setTop(layero); 7554 + // layer.setTop(layero);
7551 $(layero).addClass('layui-form').find('.layui-layer-btn0').attr({ 7555 $(layero).addClass('layui-form').find('.layui-layer-btn0').attr({
7552 'lay-submit': '', 7556 'lay-submit': '',
7553 'lay-filter': enumActionEl.IMAGE_LAYER_FILTER, 7557 'lay-filter': enumActionEl.IMAGE_LAYER_FILTER,