Merge branch 'master' into positec

king

2023-11-05 e01d39d4a2c3137fdce5f18f9589a34df13b7963

 src/components/header/index.jsx

@@ -328,6 +328,7 @@
                  trdItem.type = PageParam.Template || 'CommonTable'
                  trdItem.OpenType = PageParam.OpenType || 'newtab'
                  trdItem.hidden = PageParam.hidden || 'false'
                  trdItem.menuColor = PageParam.menuColor || ''

                  if (trdItem.type === 'NewPage') {
                    trdItem.OpenType = 'newpage'
@@ -706,7 +707,7 @@
                            <div className="title" onClick={e => e.stopPropagation()}>{cell.MenuName}</div>
                            <div className="menu-detail">
                              {cell.children && cell.children.map(m => (
                                <div key={m.MenuID} title={m.MenuName} onClick={() => {this.changeVerMenu(m)}}>
                                <div key={m.MenuID} title={m.MenuName} style={m.menuColor ? {color: m.menuColor} : null} onClick={() => {this.changeVerMenu(m)}}>
                                  {m.MenuName}
                                </div>
                              ))}