Merge remote-tracking branch 'origin/master'

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/CtrlModel.java

@@ -12,6 +12,8 @@ import net.ibizsys.model.control.IPSControl;
 import net.ibizsys.model.control.IPSControlContainer;
 import net.ibizsys.model.control.dashboard.IPSDBContainerPortletPart;
 import net.ibizsys.model.control.dashboard.IPSDBPortletPart;
+import net.ibizsys.model.control.grid.IPSDEGrid;
+import net.ibizsys.model.control.grid.IPSDEGridColumn;
 import net.ibizsys.model.control.toolbar.IPSDETBUIActionItem;
 import net.ibizsys.model.control.toolbar.IPSDEToolbar;
 import net.ibizsys.model.view.IPSUIAction;
@@ -217,6 +219,38 @@ public class CtrlModel extends BaseModel{
         }
     }
 
+    //  表格是否需要空白列
+    public Boolean isNeedEmptyColumn() {
+        if (getControl().getControlType() != null && "GRID".equals(getControl().getControlType())) {
+            Boolean flag = true;
+            for (IPSDEGridColumn column : ((IPSDEGrid)getControl()).getPSDEGridColumns()) {
+                //  自适应列
+                if (
+                    column.getWidthUnit() != null
+                    && "STAR".equals(column.getWidthUnit())
+                    && column.getColumnType() != null
+                    && !"GROUPGRIDCOLUMN".equals(column.getColumnType())
+                ) {
+                    flag = false;
+                    break;
+                }
+            }
+            return flag;
+        }
+        return false;
+    }
+
+    //  获取表格列总宽度
+    public Integer getTotalColumnWidth() {
+        Integer width = 10;
+        if (getControl().getControlType() != null && "GRID".equals(getControl().getControlType())) {
+            for (IPSDEGridColumn column : ((IPSDEGrid)getControl()).getPSDEGridColumns()) {
+                width += column.getWidth();
+            }
+        }
+        return width;
+    }
+
     //  忽略发布
     public Boolean ignore() {
         IPSControl control = getControl();

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/common/derules.hbs

+{
+{{#if item.condOp}}
+  "condOp": "{{item.condOp}}",
+{{/if}}
+  "notMode": {{item.notMode}},
+  "condType": "{{item.condType}}",
+  "ruleInfo": "{{item.ruleInfo}}",
+	"keyCond": {{item.keyCond}},
+{{#eq item.condType 'SIMPLE'}}
+	"paramType": "{{item.paramType}}",
+	"paramValue": "{{item.paramValue}}",
+{{/eq}}
+{{#if (or (eq item.condType 'VALUERANGE2') (eq item.condType 'STRINGLENGTH'))}}
+	"includeMinValue": {{item.includeMinValue}},
+	"minValue": "{{item.minValue}}",
+	"includeMaxValue": {{item.includeMaxValue}},
+	"maxValue": "{{item.maxValue}}",
+{{/if}}
+{{#eq item.condType 'REGEX'}}
+	"regExCode": {{item.regExCode}},
+{{/eq}}
+{{#if (and (eq item.condType 'SYSVALUERULE') item.psSysValueRule)}}
+	{{#with item.psSysValueRule as | sysRule |}}
+	"sysValueRule": {
+		"ruleType": "{{sysRule.ruleType}}",
+		"regExCode": "{{sysRule.regExCode}}",
+		"ruleInfo": "{{sysRule.ruleInfo}}",
+		"scriptCode": `{{sysRule.scriptCode}}`
+	}
+	{{/with}}
+{{/if}}
+  {{#if item.psDEFVRConditions}}
+  "conditions": [
+	{{#each item.psDEFVRConditions as | condition |}}
+    {{> @macro/front-end/common/derules.hbs item=condition}}
+		{{#unless @last}},{{/unless}}
+  {{/each}}
+  ]
+  {{/if}}
+}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/auto-complete.hbs

 <AppAutoComplete
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :data="state.data"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
@@ -51,7 +55,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/checkbox-list.hbs

 <AppCheckboxList
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :data="state.data"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
@@ -25,7 +29,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 /> 

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/checkbox.hbs

 <AppCheckbox
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -11,7 +15,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 /> 

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/code.hbs

 <AppCode
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -11,7 +15,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
   :context="state.context"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/data-picker-view.hbs

 <AppDataPickerView
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :data="state.data"
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
@@ -29,7 +33,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/data-picker.hbs

 <AppDataPicker
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :data="state.data"
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
@@ -52,7 +56,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/date-picker.hbs

 <AppDatePicker
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#if item.psEditor.placeHolder}}
   placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
@@ -50,7 +54,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/dropdown-list.hbs

 <AppDropdownList
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#if item.psEditor.psAppCodeList}}
   codeListTag="{{item.psEditor.psAppCodeList.codeListTag}}"
   codeListType="{{item.psEditor.psAppCodeList.codeListType}}"
@@ -33,7 +37,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   :data="record"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/input-ip.hbs

 <AppInputIp
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -11,7 +15,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 /> 

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/input.hbs

 <AppInput
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -44,7 +48,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/list-box.hbs

 <AppListBox
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :data="state.data"
   :server="state.controlService"
   :deMajorField="state.appDeMajorFieldName"
@@ -41,7 +45,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/radio-group.hbs

 <AppRadioGroup
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :data="state.data"
 {{#if item.psEditor.psAppCodeList}}
   codeListTag="{{item.psEditor.psAppCodeList.codeListTag}}"
@@ -25,7 +29,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/rating.hbs

 <AppRating
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -17,7 +21,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/raw.hbs

 <AppRaw
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :date="state.data"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
@@ -20,7 +24,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/rich-text.hbs

 <AppRichText
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -23,7 +27,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   :data="record"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/slider.hbs

 <AppSlider
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
   :date="state.data"
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
@@ -21,7 +25,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/span.hbs

 <AppSpan
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -33,7 +37,7 @@
   :value="state.data.{{item.psEditor.name}}"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
 {{/eq}}
   :context="state.context"
   :viewParams="state.viewParams"/>

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/stepper.hbs

 <AppStepper
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -23,7 +27,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/switch.hbs

 <AppSwitch
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
@@ -14,7 +18,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/upload.hbs

 <AppUpload
+{{#if (and (eq ctrlType 'grid') dataItemName)}}
+  name="{{dataItemName}}"
+{{else}}
   name="{{item.codeName}}"
+{{/if}}
 {{#if item.psEditor.editorParams.method}}
   method="{{item.psEditor.editorParams.method}}"
 {{/if}}
@@ -34,7 +38,7 @@
   @editorEvent="onEditorEvent"
 {{/if}}
 {{#eq ctrlType 'grid'}}
-  :value="record.{{item.psEditor.name}}"
+  :value="record.{{#if dataItemName}}{{dataItemName}}{{else}}{{item.psEditor.name}}{{/if}}"
   @editorEvent="onEditorEvent($event,index)"
 {{/eq}}
 />

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}}",
@@ -18,7 +18,7 @@
   {{#eq item.columnType 'GROUPGRIDCOLUMN'}}
   children: [
     {{#each item.psDEGridColumns as | column |}}
-      {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNMODEL" item=column}}
+    {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNMODEL" item=column}}
     {{/each}}
   ],
   {{else}}

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

 {{#*inline "COLUMNTEXT"}}
   {{#if (and item.psAppCodeList (eq item.cLConvertMode 'FRONT'))}}
     <AppCodelist
+      name="{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}"
       codeListTag="{{item.psAppCodeList.codeListTag}}"
       :context="state.context"
       :data="record"
@@ -20,7 +21,7 @@
   {{else}}
     {{#if item.valueFormat}}
     <AppSpan
-      name="{{lowerCase item.codeName}}"
+      name="{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}"
       :value="text"
       {{#if item.psAppDEField}}
       :dataType="{{item.psAppDEField.stdDataType}}"
@@ -40,19 +41,19 @@
   {{/each}}
 {{else}}
   {{#unless (or item.hideDefault item.hiddenDataItem)}}
-<div v-if="Object.is(column.dataIndex, '{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}')" class="table-cell {{#if item.cellPSSysCss}} {{item.cellPSSysCss.cssName}}{{/if}}">
+<div v-if="Object.is(column.dataIndex, '{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}')" class="table-cell{{#if item.cellPSSysCss}} {{item.cellPSSysCss.cssName}}{{/if}}">
   {{#if (eq item.columnType 'DEFGRIDCOLUMN')}}
     {{#if item.enableRowEdit}}
   <div v-if="state.rowEditState" class="editor-cell">
     <AppFormItem
-      name="{{item.codeName}}"
-      :error="state.gridEditState.{{item.codeName}}?.[index]?.message"
+      name="{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}"
+      :error="state.gridEditState.{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}?.[index]?.message"
       :rules="state.rules.{{item.codeName}}"
       :showLabel="false"
     >
     {{#each ctrl.psDEGridEditItems as | editColumn | }}
     {{#if (eq editColumn.codeName item.codeName)}}
-    {{> @macro/front-end/editors/include-editor.hbs type=editColumn.psEditor.editorType item=editColumn ctrlType="grid"}}
+    {{> @macro/front-end/editors/include-editor.hbs type=editColumn.psEditor.editorType item=editColumn dataItemName=item.dataItemName ctrlType="grid"}}
     {{/if}}
     {{/each}}
     </AppFormItem>
@@ -80,8 +81,8 @@
   {{else if (eq item.columnType 'UAGRIDCOLUMN')}}
   <AppToolbar
     mode="link"
-    name="{{lowerCase item.codeName}}"
-    :actionModel="record.{{lowerCase item.codeName}}"
+    name="{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}"
+    :actionModel="record.{{#if item.dataItemName}}{{lowerCase item.dataItemName}}{{else}}{{item.codeName}}{{/if}}"
     @onToolbarEvent="onActionColEvent($event, record)"/>
   {{/if}}
 </div>

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

@@ -58,4 +58,18 @@ export interface GridControlState extends MDControlState {
    */
   updateDefaultItems: IParam[];
 
+  /**
+   * @description 表格列总宽度
+   * @type {number}
+   * @memberof GridControlState
+   */
+  totalColumnWidth: number;
+
+  /**
+   * @description 选择列宽度（默认50，存在聚合列时为100）
+   * @type {number}
+   * @memberof GridControlState
+   */
+  selectColumnWidth: number;
+
 }

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

 import { DataTypes, dateFormat, deepCopy, GridControlState, IActionParam, IParam, isExistAndNotEmpty, MDControl } from "@core";
 import { createUUID } from "qx-util";
 import schema, { ErrorList, FieldErrorList } from 'async-validator';
+import { Ref } from "vue";
 /**
  * @description 表格部件
  * @export
@@ -30,12 +31,12 @@ export class GridControl extends MDControl {
      * @memberof GridControl
      */
     public useCustom() {
-        const { controlName, selectFirstDefault, rowEditState, rowActiveMode, isSingleSelect } = this.state;
+        const { selectFirstDefault, rowEditState, selectColumnWidth, isSingleSelect, totalColumnWidth } = this.state;
         // 滚动条配置
         const useScrollOption = computed(() => {
             return {
                 scrollToFirstRowOnChange: true,
-                x: '100%',
+                x: totalColumnWidth || '150%',
                 y: '100%',
             }
         });
@@ -100,6 +101,11 @@ export class GridControl extends MDControl {
                 }
             };
         }
+        // 展开行
+        const useExpandedRowKeys: Ref<Array<string>> = ref([]);
+        const onExpandedRowsChange = (expandedRows: string[]) => {
+            useExpandedRowKeys.value = expandedRows;
+        }
         // 表格选择功能配置
         const useRowSelectionOption = computed(() => {
             if (selectFirstDefault) {
@@ -107,10 +113,20 @@ export class GridControl extends MDControl {
             }
             return {
                 type: isSingleSelect ? 'radio' : 'checkbox',
-                columnWidth: 32,
+                columnWidth: selectColumnWidth,
                 selectedRowKeys: this.state.selectedRowKeys,
-                checkStrictly: this.props.multiple ? false : true,
-                onChange: (_selectedRowKeys: string[], selectedRows: IParam[]) => {
+                checkStrictly: false,
+                onSelect: (record: IParam, selected: boolean, selectedRows: IParam[], $event: any) => {
+                    if (selected) {
+                        const { appDeKeyFieldName } = this.state;
+                        const selectedRowKey: string = record[appDeKeyFieldName] || record.srfkey;
+                        const index: number = useExpandedRowKeys.value.findIndex((key: string) => Object.is(key, selectedRowKey))
+                        if (Object.is(index,-1) && record.children && record.children.length > 0) {
+                            useExpandedRowKeys.value.push(selectedRowKey);
+                        }
+                    }
+                },
+                onChange: (_selectedRowKeys: string[], selectedRows: any[]) => {
                     this.state.selectedRowKeys = _selectedRowKeys;
                     const selection: IParam[] = [];
                     selectedRows.forEach((select: IParam) => {
@@ -142,9 +158,11 @@ export class GridControl extends MDControl {
             useRowKey,
             useRowClassName,
             useCustomRow,
+            useExpandedRowKeys,
             useRowSelectionOption,
             onResizeColumn,
-            onGridChange
+            onGridChange,
+            onExpandedRowsChange
         }
     }
 
@@ -171,7 +189,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 +536,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/core/utils/ui/index.ts

@@ -2,4 +2,5 @@ export { RouteUtil } from './route-util';
 export { UIUtil } from './ui-util';
 export { UIActionUtil } from './uiaction-util';
 export { ViewUtil } from './view-util';
-export { DataTypes } from './data-types';
\ No newline at end of file
+export { DataTypes } from './data-types';
+export { Verify } from './verify';
\ No newline at end of file

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/style/widgets/app-grid.scss

@@ -15,4 +15,14 @@
     &:first-child {
         padding-left: 0;   
     }
+}
+.app-grid {
+    .header-cell {
+        display: flex;
+    }
+    .not-data {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
 }
\ No newline at end of file

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

-import { ControlVOBase, IParam, GridService } from '@core';
+import { ControlVOBase, IParam, GridService, isEmpty, Verify } from '@core';
 import { {{pascalCase ctrl.psAppDataEntity.codeName}}Service } from '@api/{{spinalCase ctrl.psAppDataEntity.codeName}}/{{spinalCase ctrl.psAppDataEntity.codeName}}-service';
 
 export class ControlVO extends ControlVOBase {
@@ -22,6 +22,8 @@ export class ControlVO extends ControlVOBase {
 export const ctrlState = {
   controlCodeName: '{{ctrl.codeName}}',
   controlName: '{{ctrl.name}}',
+  totalColumnWidth: {{ctrl.totalColumnWidth}},
+  selectColumnWidth: {{#if (neq ctrl.aggMode 'NONE')}}100{{else}}50{{/if}},
   appEntityCodeName: '{{ctrl.appEntity.codeName}}',
   appDeCodeName:'{{ctrl.appEntity.codeName}}',
   appDeKeyFieldName: '{{#if ctrl.appEntity.keyPSAppDEField}}{{ctrl.appEntity.keyPSAppDEField.codeName}}{{/if}}',
@@ -114,8 +116,27 @@ export const ctrlState = {
     },
     {{/if}}
     {{/if}}
+    {{!-- 适配表格操作列浮动 --}}
     {{#each ctrl.psDEGridColumns as | column |}}
+      {{#unless (eq column.columnType 'UAGRIDCOLUMN')}}
     {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNMODEL" item=column}}
+      {{/unless}}
+    {{/each}}
+    {{#if ctrl.needEmptyColumn}}
+    {
+      title: "",
+      columnType: "EMPTYCOLUMN",
+      dataIndex: "autowidthcolumn",
+      align: "center",
+      resizable: true,
+      ellipsis: true,
+      aggMode: "NONE",
+    },
+    {{/if}}
+    {{#each ctrl.psDEGridColumns as | column |}}
+      {{#if (eq column.columnType 'UAGRIDCOLUMN')}}
+    {{> @macro/front-end/widgets/grid-detail/include-grid.hbs type="COLUMNMODEL" item=column}}
+      {{/if}}
     {{/each}}
   ],
   // 是否单选
@@ -160,16 +181,39 @@ export const ctrlState = {
   {{/if}}
   rules:{
     {{#each ctrl.psDEGridEditItemVRs as | ruleItem |}}
+    {{ruleItem.psDEGridEditItemName}}: [
       {{#if (eq ruleItem.valueRuleType 'SYSVALUERULE')}}
-      {{ruleItem.psDEGridEditItemName}}: [
-        {
-            trigger: ['change', 'blur'],
-            {{#eq ruleItem.psSysValueRule.ruleType 'REG'}}
-            pattern: /{{ruleItem.psSysValueRule.regExCode}}/,
-            {{/eq}}
-            message:'{{ruleItem.psSysValueRule.ruleInfo}}'
-      }],
+      {
+        trigger: ['change', 'blur'],
+        {{#eq ruleItem.psSysValueRule.ruleType 'REG'}}
+        pattern: /{{ruleItem.psSysValueRule.regExCode}}/,
+        {{/eq}}
+        message:'{{ruleItem.psSysValueRule.ruleInfo}}'
+      },
+      {{else if (eq ruleItem.valueRuleType 'DEFVALUERULE')}}
+        {{#each ctrl.psDEGridEditItems as | editItem |}}
+          {{#eq editItem.codeName ruleItem.psDEGridEditItemName}}
+      {
+        validator: (rule: any, value: any, callback: any, source: any) => {
+          if (!source || isEmpty(source['{{#if editItem.valueItemName}}{{editItem.valueItemName}}{{else}}{{ruleItem.psDEGridEditItemName}}{{/if}}'])) {
+            return true;
+          }
+          const { isPast, infoMessage } = Verify.verifyDeRules(
+            '{{#if editItem.valueItemName}}{{editItem.valueItemName}}{{else}}{{ruleItem.psDEGridEditItemName}}{{/if}}',
+            source,
+            {{> @macro/front-end/common/derules.hbs item=ruleItem.psDEFValueRule.getPSDEFVRGroupCondition}}
+          );
+          if (!isPast) {
+            callback(new Error(infoMessage || '{{ruleItem.psDEFValueRule.ruleInfo}}'));
+          }
+          return true;
+        },
+        trigger: ['change', 'blur']
+      }
+          {{/eq}}
+        {{/each}}
       {{/if}}
+    ],
     {{/each}}
   }
 };
\ No newline at end of file

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

@@ -40,7 +40,7 @@ const emit = defineEmits<CtrlEmit>();
 
 // 安装功能模块，提供状态和能力
 const { name, state, useCustom, onEditorEvent, onToolbarEvent, onActionColEvent, newRow, remove, save, load, refresh, getData } = new GridControl(ctrlState, props, emit).moduleInstall();
-const { useScrollOption, useRowKey, useRowClassName, useCustomRow, useRowSelectionOption, onResizeColumn, onGridChange } = useCustom;
+const { useScrollOption, useRowKey, useRowClassName, useCustomRow, useRowSelectionOption, onResizeColumn, onGridChange, useExpandedRowKeys, onExpandedRowsChange } = useCustom;
 {{#if ctrl.batchToolBarItems}}
 const renderBatchToolbar = (total: number, range: IParam[]) => {
   return (
@@ -73,6 +73,7 @@ defineExpose({ name, state, newRow, remove, save, load, refresh, getData });
         :sortDirections="['ascend', 'descend']"
         :data-source="state.items"
         :row-selection="useRowSelectionOption"
+        :expandedRowKeys="useExpandedRowKeys"
         :columns="state.columnsModel"
         {{#if ctrl.batchToolBarItems}}
         :pagination="Object.assign(state.mdCtrlPaging.pagination, {
@@ -86,6 +87,7 @@ defineExpose({ name, state, newRow, remove, save, load, refresh, getData });
         :customRow="useCustomRow"
         :rowClassName="useRowClassName"
         @change="onGridChange"
+        @expandedRowsChange="onExpandedRowsChange"
         @resizeColumn="onResizeColumn"
       >
         <template #emptyText>