update：更新表格

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/grid-detail/grid-column-model.hbs

@@ -5,11 +5,11 @@
   {{#if item.align}}
   align: "{{lowerCase item.align}}",
   {{/if}}
-    {{#if (eq item.widthUnit 'PX')}}
+  {{#if (eq item.widthUnit 'PX')}}
   width: {{item.width}},
-    {{else}}
+  {{else if (gt item.width 1)}}
   minWidth: {{item.width}},
-    {{/if}}
+  {{/if}}
   resizable: true,
   {{#if (and item.enableLinkView item.linkPSAppView)}}
   linkView: "{{item.linkPSAppView.codeName}}",

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/grid-control/grid-control.ts

@@ -171,7 +171,7 @@ export class GridControl extends MDControl {
      * @param {string} tag
      * @memberof GridControl
      */
-    public handleGridItemValueChange(rowIndex: number, tag: string, data: any) {
+    private handleGridItemValueChange(rowIndex: number, tag: string, data: any) {
         const { items } = toRefs(this.state);
         if (items.value[rowIndex][tag] !== data) {
             items.value[rowIndex][tag] = data;
@@ -518,7 +518,7 @@ export class GridControl extends MDControl {
      * @protected
      * @memberof MDControl
      */
-     protected async codeListGroupData() {
+    protected async codeListGroupData() {
         const { groupField, groupCodeList } = this.state.mdCtrlGroup;
         const { items, context, viewParams, columnsModel } = toRefs(this.state);
         if (!groupCodeList || !isExistAndNotEmpty(groupCodeList.codeListTag)) {

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/md-control/md-control.ts

@@ -65,8 +65,12 @@ export class MDControl extends MainControl {
         let tempViewParams = deepCopy(viewParams ? viewParams : {});
         const { noSort, minorSortDir, minorSortPSDEF } = mdCtrlSort;
         let { enablePagingBar, current, pageSize } = mdCtrlPaging;
-        if (!noSort && minorSortDir && minorSortPSDEF) {
-          Object.assign(tempViewParams, { sort: `${minorSortPSDEF},${minorSortDir}` });
+        if (!noSort) {
+          if (arg && arg.sort) {
+            Object.assign(tempViewParams, { sort: arg.sort });
+          } else if (minorSortDir && minorSortPSDEF) {
+            Object.assign(tempViewParams, { sort: `${minorSortPSDEF},${minorSortDir}` });
+          }
         }
         if (enablePagingBar) {
           Object.assign(tempViewParams, { page: current - 1, size: pageSize });

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/base/index.scss

@@ -10,8 +10,8 @@ body{
 // 滚动条样式
 ::-webkit-scrollbar {
   background: transparent;
-  width: 4px;
-  height: 4px;
+  width: 6px;
+  height: 6px;
 }
 
 ::-webkit-scrollbar-thumb {

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid-state.ts.hbs

@@ -161,14 +161,14 @@ export const ctrlState = {
   rules:{
     {{#each ctrl.psDEGridEditItemVRs as | ruleItem |}}
       {{#if (eq ruleItem.valueRuleType 'SYSVALUERULE')}}
-      {{ruleItem.psDEGridEditItemName}}: [
-        {
-            trigger: ['change', 'blur'],
-            {{#eq ruleItem.psSysValueRule.ruleType 'REG'}}
-            pattern: /{{ruleItem.psSysValueRule.regExCode}}/,
-            {{/eq}}
-            message:'{{ruleItem.psSysValueRule.ruleInfo}}'
-      }],
+    {{ruleItem.psDEGridEditItemName}}: [
+      {
+        trigger: ['change', 'blur'],
+        {{#eq ruleItem.psSysValueRule.ruleType 'REG'}}
+        pattern: /{{ruleItem.psSysValueRule.regExCode}}/,
+        {{/eq}}
+        message:'{{ruleItem.psSysValueRule.ruleInfo}}'
+    }],
       {{/if}}
     {{/each}}
   }