Merge branch 'dev/v4.9.87_yf' of qmx/jy into feature/v4.9.91

src/web/staticres/dataExport/js/conditions_order.js

@@ -639,6 +639,10 @@ $('.new-box .new-confirm').click(function () {
   // console.log(editIndex, text, appendArr, excludeArr, 'editIndex');
 
   var keyTemArr = window[arr] || []
+  if(!Array.isArray(keyTemArr)) {
+    window[arr] = []
+    keyTemArr = window[arr]
+  }
   if (type === 'edit') {
     // 如果是修改操作
     keyAllArr[editIndex].name = text