@baosight/erm 1.0.69 → 1.0.71

package/lib/index.common.js

@@ -39911,7 +39911,7 @@ const __exports__ = /*#__PURE__*/(0,exportHelper/* default */.Z)(script, [['rend
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermList/ermList.vue?vue&type=script&lang=ts&setup=true
 
 
-const ermListvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-1766224b"), n = n(), _popScopeId(), n);
+const ermListvue_type_script_lang_ts_setup_true_withScopeId = n => (_pushScopeId("data-v-d7a7a5cc"), n = n(), _popScopeId(), n);
 const ermListvue_type_script_lang_ts_setup_true_hoisted_1 = {
   key: 0,
   class: "mainTitle"
@@ -40214,6 +40214,13 @@ const _hoisted_13 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart
         console.log('ret', retTable);
         var item_config = retTable["TSI00GRIDCOLUMN"].data;
         const tsi00gridview = retTable["TSI00GRIDVIEW"].data;
+        var displayWidth = tsi00gridview[0].DISPLAY_WIDTH;
+        if (displayWidth === -1) {
+          displayWidth = 1;
+        }
+        if (props.controlsInRow !== 1) {
+          displayWidth = props.controlsInRow;
+        }
         for (let i = 0; i < item_config.length; i++) {
           const item = item_config[i];
           //字体颜色处理
@@ -40272,11 +40279,11 @@ const _hoisted_13 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart
           if (item.COL_WIDTH < 1) {
             item.COL_WIDTH = 1;
           } else {
-            if (item.COL_WIDTH > props.controlsInRow) {
-              item.COL_WIDTH = props.controlsInRow;
+            if (item.COL_WIDTH > displayWidth) {
+              item.COL_WIDTH = displayWidth;
             }
           }
-          item.TOTAL_WIDTH = 24 / props.controlsInRow * item.COL_WIDTH;
+          item.TOTAL_WIDTH = 24 / displayWidth * item.COL_WIDTH;
         }
         ;
         //隐藏字段处理
@@ -40803,10 +40810,10 @@ const _hoisted_13 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart
 }));
 ;// CONCATENATED MODULE: ./packages/ermList/ermList.vue?vue&type=script&lang=ts&setup=true
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermList/ermList.vue?vue&type=style&index=0&id=1766224b&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./packages/ermList/ermList.vue?vue&type=style&index=0&id=d7a7a5cc&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/ermList/ermList.vue?vue&type=style&index=0&id=1766224b&lang=scss&scoped=true
+;// CONCATENATED MODULE: ./packages/ermList/ermList.vue?vue&type=style&index=0&id=d7a7a5cc&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ermList/ermList.vue
 
@@ -40815,7 +40822,7 @@ const _hoisted_13 = ["src", "onClick", "onMousedown", "onMouseup", "onTouchstart
 ;
 
 
-const ermList_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermListvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-1766224b"]])
+const ermList_exports_ = /*#__PURE__*/(0,exportHelper/* default */.Z)(ermListvue_type_script_lang_ts_setup_true, [['__scopeId',"data-v-d7a7a5cc"]])
 
 /* harmony default export */ const ermList = (ermList_exports_);
 ;// CONCATENATED MODULE: ./packages/utils/utils.ts