fix(pivot): apply new pivot planning to table widget and widget form

fix(pivot): apply new pivot planning to table widget and widget form #6382