Merge branch 'master' into positec

king

2024-05-21 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5

 src/tabviews/zshare/actionList/index.jsx

@@ -19,7 +19,7 @@
const FuncZip = asyncComponent(() => import('./funczip'))
const EditLine = asyncComponent(() => import('./editLine'))
const ExportPdf = asyncComponent(() => import('./exportPdf'))
const ShareLink = asyncComponent(() => import('./shareLink'))
const FuncButton = asyncComponent(() => import('./funcbutton'))

class ActionList extends Component {
  static propTpyes = {
@@ -197,15 +197,6 @@
              btn={item}
            />
          )
        } else if (item.funcType === 'shareLink') {
          return (
            <ShareLink
              key={item.uuid}
              BID={BID}
              btn={item}
              selectedData={selectedData}
            />
          )
        } else if (item.funcType === 'addline' || item.funcType === 'delline') {
          return (
            <EditLine
@@ -216,6 +207,15 @@
            />
          )
        }
        } else {
          return (
            <FuncButton
              key={item.uuid}
              BID={BID}
              btn={item}
              selectedData={selectedData}
            />
          )
      }
      return null
    })