Merge branch 'develop'

king

2024-05-21 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8

 src/views/menudesign/index.jsx

@@ -888,10 +888,21 @@
  
            Api.fileuploadbase64(param).then(result => {
              if (result.status) {
                let url = result.Images
                let baseurl = ''
    
                if (window.GLOB.cloudServiceApi) {
                  baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
                } else {
                  baseurl = window.GLOB.baseurl
                }

                url = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url

                Api.getCloudConfig({
                  func: 's_PrintTemplateMSub',
                  ID: config.uuid,
                  Images: Utils.getcloudurl(result.Images),
                  Images: url,
                  Remark: '',
                  temp_type: 'billprint',
                }).then(response => {
@@ -1160,6 +1171,7 @@
  updateLogConfig = (config) => {
    config.fstMenuId = this.state.config.fstMenuId || config.fstMenuId || ''
    config.parentId = this.state.config.parentId || config.parentId || ''
    config.open_edition = this.state.config.open_edition || ''
    
    this.setState({
      config: null