lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/package.json

@@ -13,13 +13,13 @@
   "dependencies": {
     "@floating-ui/dom": "^1.0.4",
     "@ibiz-template/command": "^0.0.1-beta.1",
-    "@ibiz-template/controller": "^0.0.1-beta.13",
-    "@ibiz-template/core": "^0.0.1-beta.13",
-    "@ibiz-template/model": "^0.0.1-beta.13",
-    "@ibiz-template/runtime": "^0.0.1-beta.13",
-    "@ibiz-template/service": "^0.0.1-beta.13",
-    "@ibiz-template/theme": "^0.0.1-beta.13",
-    "@ibiz-template/vue-util": "^0.0.1-beta.13",
+    "@ibiz-template/controller": "^0.0.1-beta.14",
+    "@ibiz-template/core": "^0.0.1-beta.14",
+    "@ibiz-template/model": "^0.0.1-beta.14",
+    "@ibiz-template/runtime": "^0.0.1-beta.14",
+    "@ibiz-template/service": "^0.0.1-beta.14",
+    "@ibiz-template/theme": "^0.0.1-beta.14",
+    "@ibiz-template/vue-util": "^0.0.1-beta.14",
     "@ibiz/dynamic-model-api": "^2.1.5",
     "dayjs": "^1.11.6",
     "lodash-es": "^4.17.21",
@@ -29,7 +29,7 @@
     "qx-util": "^0.4.4",
     "ramda": "^0.28.0",
     "view-design": "^4.7.0",
-    "vue": "^2.7.13",
+    "vue": "^2.7.14",
     "vue-router": "^3.6.5"
   },
   "devDependencies": {

app_Web/src/components/common/app-col/app-col.tsx

@@ -77,7 +77,7 @@ export const AppCol = defineComponent({
     return h(
       'i-col',
       {
-        class: [this.ns.b(), this.ns.m('grid')],
+        class: [this.ns.b(), this.ns.m('grid'), this.controller.extraClass],
         props: this.gridAttrs,
         style: this.cssVars,
       },

app_Web/src/components/editor/check-box-list/ibiz-checkbox/ibiz-checkbox.tsx

@@ -141,8 +141,14 @@ export const IBizCheckbox = defineComponent({
   },
   render() {
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode ? (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.readonly ? (
           this.valueText
         ) : (
           <i-checkbox-group
@@ -153,7 +159,7 @@ export const IBizCheckbox = defineComponent({
               <i-checkbox
                 key={index}
                 label={item.value}
-                readonly={this.controller.model.readOnly}
+                disabled={this.disabled}
               >
                 <span class={this.ns.e('text')}>{item.text}</span>
               </i-checkbox>

app_Web/src/components/editor/check-box-list/ibiz-grid-checkbox/ibiz-grid-checkbox.tsx

@@ -28,13 +28,15 @@ export const IBizGridCheckbox = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
         {h('IBizCheckbox', {
           props: {
             ...this.$props,
-            infoMode: this.disabled || this.isInfoMode,
+            readonly: this.readonly || this.isInfoMode,
+            disabled: this.disabled,
           },
           on: {
             change: this.onChange,

app_Web/src/components/editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.tsx

@@ -47,6 +47,7 @@ export const IBizGridPicker = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
@@ -54,7 +55,8 @@ export const IBizGridPicker = defineComponent({
           h(this.provider.formEditor, {
             props: {
               ...this.$props,
-              infoMode: this.disabled || this.isInfoMode,
+              readonly: this.readonly || this.isInfoMode,
+              disabled: this.disabled,
             },
             on: {
               change: this.onChange,

app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx

@@ -251,9 +251,15 @@ export const IBizMPicker = defineComponent({
   },
   render() {
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode && this.valueText}
-        {!this.infoMode && (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.readonly && this.valueText}
+        {!this.readonly && (
           <i-select
             value={this.curValue}
             filterable
@@ -275,7 +281,7 @@ export const IBizMPicker = defineComponent({
             })}
           </i-select>
         )}
-        {!this.infoMode && (
+        {!this.readonly && (
           <div class={this.ns.e('buns-position')}>
             <div class={this.ns.e('btns')}>
               {this.c.pickupView ? (

app_Web/src/components/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx

@@ -147,11 +147,16 @@ export const IBizPickerDropDown = defineComponent({
     };
   },
   render() {
-    if (this.infoMode) {
-      return <div class={this.ns.b()}>{this.value}</div>;
+    if (this.readonly) {
+      return (
+        <div class={(this.ns.b(), this.ns.m('readonly'))}>{this.value}</div>
+      );
     }
     return (
-      <div class={this.ns.b()}>
+      <div class={[this.ns.b(), this.disabled ? this.ns.m('disabled') : '']}>
+        {this.readonly ? (
+          this.value
+        ) : (
           <i-select
             value={this.refValue}
             filterable
@@ -173,6 +178,7 @@ export const IBizPickerDropDown = defineComponent({
               );
             })}
           </i-select>
+        )}
       </div>
     );
   },

app_Web/src/components/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx

@@ -49,8 +49,14 @@ export const IBizPickerLink = defineComponent({
   },
   render() {
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode ? (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.disabled ? (
           this.value
         ) : (
           <a on-click={this.openLinkView}>{this.curValue}</a>

app_Web/src/components/editor/data-picker/ibiz-picker/ibiz-picker.tsx

@@ -134,11 +134,13 @@ export const IBizPicker = defineComponent({
     };
   },
   render() {
-    if (this.infoMode) {
-      return <div class={this.ns.b()}>{this.value}</div>;
+    if (this.readonly) {
+      return (
+        <div class={(this.ns.b(), this.ns.m('readonly'))}>{this.value}</div>
+      );
     }
     return (
-      <div class={this.ns.b()}>
+      <div class={[this.ns.b(), this.disabled ? this.ns.m('disabled') : '']}>
         {this.c.noAC ? (
           <i-input
             value={this.curValue}

app_Web/src/components/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx

@@ -88,8 +88,14 @@ export const IBizDatePicker = defineComponent({
   },
   render() {
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode ? (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.readonly ? (
           this.formatValue
         ) : (
           <i-CalendarPicker
@@ -99,7 +105,6 @@ export const IBizDatePicker = defineComponent({
             format={this.format}
             placeholder={this.c!.placeHolder}
             value={this.value}
-            readonly={this.c!.model.readOnly}
             on-on-open-change={this.onOpenChange}
             on-on-change={this.handleChange}
             disabled={this.disabled}

app_Web/src/components/editor/date-picker/ibiz-grid-date-picker/ibiz-grid-date-picker.tsx

@@ -27,13 +27,15 @@ export const IBizGridDatePicker = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
         {h('IBizDatePicker', {
           props: {
             ...this.$props,
-            infoMode: this.disabled || this.isInfoMode,
+            readonly: this.readonly || this.isInfoMode,
+            disabled: this.disabled,
             autoFocus: true,
           },
           on: {

app_Web/src/components/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx

@@ -89,9 +89,10 @@ export const IBizDropdown = defineComponent({
     // 编辑态内容
     const editContent = this.hasChildren ? (
       <app-select-tree
-        class={this.ns.e('tree-select')}
+        class={[this.ns.e('tree-select')]}
         value={this.curValue}
         nodes-data={this.items}
+        disabled={this.disabled}
         multiple={this.c!.multiple}
       ></app-select-tree>
     ) : (
@@ -101,7 +102,7 @@ export const IBizDropdown = defineComponent({
         allow-clear
         transfer
         clearable
-        class={this.ns.e('select')}
+        class={[this.ns.e('select')]}
         multiple={this.c!.multiple}
         placeholder={this.c!.placeHolder}
         disabled={this.disabled}
@@ -113,8 +114,14 @@ export const IBizDropdown = defineComponent({
       </i-select>
     );
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode ? this.valueText : editContent}
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.readonly ? this.valueText : editContent}
       </div>
     );
   },

app_Web/src/components/editor/dropdown-list/ibiz-grid-dropdown/ibiz-grid-dropdown.tsx

@@ -27,13 +27,15 @@ export const IBizGridDropdown = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
         {h('IBizDropdown', {
           props: {
             ...this.$props,
-            infoMode: this.disabled || this.isInfoMode,
+            readonly: this.readonly || this.isInfoMode,
+            disabled: this.disabled,
             autoFocus: true,
           },
           on: {

app_Web/src/components/editor/grid-editor/grid-editor.tsx

 import { useNamespace } from '@ibiz-template/vue-util';
-import { defineComponent } from 'vue';
+import { computed, defineComponent } from 'vue';
 import '@ibiz-template/theme/style/components/widgets/grid/grid-editor.scss';
 
 export const GridEditor = defineComponent({
@@ -8,15 +8,21 @@ export const GridEditor = defineComponent({
     disabled: {
       type: Boolean,
     },
+    readonly: {
+      type: Boolean,
+    },
   },
-  setup() {
+  setup(props) {
     const ns = useNamespace('grid-editor');
-    return { ns };
+    const editable = computed(() => {
+      return !props.disabled && !props.readonly;
+    });
+    return { ns, editable };
   },
   render() {
     return (
       <div
-        class={[this.ns.b(), !this.disabled ? this.ns.m('editable') : '']}
+        class={[this.ns.b(), this.editable ? this.ns.m('editable') : '']}
         onDblclick={evt => evt.stopPropagation()}
         onClick={evt => evt.stopPropagation()}
       >

app_Web/src/components/editor/radio-button-list/ibiz-grid-radio/ibiz-grid-radio.tsx

@@ -27,13 +27,15 @@ export const IBizGridRadio = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
         {h('IBizRadio', {
           props: {
             ...this.$props,
-            infoMode: this.disabled || this.isInfoMode,
+            readonly: this.readonly || this.isInfoMode,
+            disabled: this.disabled,
           },
           on: {
             change: this.onChange,

app_Web/src/components/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx

@@ -42,8 +42,14 @@ export const IBizRadio = defineComponent({
   },
   render() {
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode ? (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.readonly ? (
           this.valueText
         ) : (
           <i-radio-group
@@ -52,11 +58,7 @@ export const IBizRadio = defineComponent({
             on-on-change={this.onSelectValueChange}
           >
             {this.items.map((_item, index: number) => (
-              <i-radio
-                key={index}
-                label={_item.value}
-                readonly={this.editorModel.readOnly}
-              >
+              <i-radio key={index} label={_item.value} disabled={this.disabled}>
                 <span class={this.ns.e('text')}>{_item.text}</span>
               </i-radio>
             ))}

app_Web/src/components/editor/span/ibiz-span/ibiz-span.tsx

@@ -82,6 +82,16 @@ export const IBizSpan = defineComponent({
     };
   },
   render() {
-    return <span class={this.ns.b()}>{this.codeListText || this.text}</span>;
+    return (
+      <span
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.codeListText || this.text}
+      </span>
+    );
   },
 });

app_Web/src/components/editor/text-box/ibiz-grid-input-number/ibiz-grid-input-number.tsx

@@ -27,13 +27,15 @@ export const IBizGridInputNumber = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
         {h('IBizInputNumber', {
           props: {
             ...this.$props,
-            infoMode: this.disabled || this.isInfoMode,
+            readonly: this.readonly || this.isInfoMode,
+            disabled: this.disabled,
             autoFocus: true,
           },
           on: {

app_Web/src/components/editor/text-box/ibiz-grid-input/ibiz-grid-input.tsx

@@ -27,13 +27,15 @@ export const IBizGridInput = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >
         {h('IBizInput', {
           props: {
             ...this.$props,
-            infoMode: this.disabled || this.isInfoMode,
+            readonly: this.readonly || this.isInfoMode,
+            disabled: this.disabled,
             autoFocus: true,
           },
           on: {

app_Web/src/components/editor/text-box/ibiz-input-number/ibiz-input-number.tsx

@@ -52,16 +52,22 @@ export const IBizInputNumber = defineComponent({
   },
   render() {
     return (
-      <div class={this.ns.b()}>
-        {this.infoMode ? (
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
+        {this.readonly ? (
           this.currentVal
         ) : (
           <i-input-number
             ref='inputRef'
             value={this.currentVal}
             placeholder={this.c.placeHolder}
-            readonly={this.c.model.readOnly}
             precision={this.c.model.precision}
+            disabled={this.disabled}
             on-on-change={this.handleChange}
           ></i-input-number>
         )}

app_Web/src/components/editor/text-box/ibiz-input/ibiz-input.tsx

@@ -107,19 +107,20 @@ export const IBizInput = defineComponent({
   render() {
     return (
       <div
-        class={`${this.ns.b()} ${this.ns.is(
-          'textarea',
-          Object.is(this.type, 'textarea'),
-        )}`}
+        class={[
+          this.ns.b(),
+          this.ns.is('textarea', Object.is(this.type, 'textarea')),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
       >
-        {this.infoMode ? (
+        {this.readonly ? (
           this.currentVal
         ) : (
           <i-input
             ref='inputRef'
             value={this.currentVal}
             placeholder={this.controller.placeHolder}
-            readonly={this.controller.model.readOnly}
             type={this.type}
             rows={this.rows}
             on-on-change={this.handleChange}

app_Web/src/components/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx

@@ -47,7 +47,13 @@ export const IBizFileUpload = defineComponent({
   },
   render(h) {
     return (
-      <div class={[this.ns.b(), this.disabled ? this.ns.m('disabled') : '']}>
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
         {h(
           'IUpload',
           {

app_Web/src/components/editor/upload/ibiz-grid-file-upload/ibiz-grid-file-upload.tsx

@@ -121,6 +121,7 @@ export const IBizGridFileUpload = defineComponent({
     return (
       <grid-editor
         disabled={this.disabled}
+        readonly={this.readonly}
         ref='componentRef'
         class={`${this.ns.b()}`}
       >

app_Web/src/components/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx

@@ -67,7 +67,13 @@ export const IBizImageUpload = defineComponent({
   render() {
     // 编辑态展示
     return (
-      <div class={[this.ns.b(), this.disabled ? this.ns.m('disabled') : '']}>
+      <div
+        class={[
+          this.ns.b(),
+          this.disabled ? this.ns.m('disabled') : '',
+          this.readonly ? this.ns.m('readonly') : '',
+        ]}
+      >
         <div class={this.ns.e('image-upload-list')}>
           {this.files.map(item => (
             <div key={item.id} class={this.ns.e('list-item')}>

app_Web/src/components/layout/view-base/view-base.tsx

-import { MDViewController, ViewController } from '@ibiz-template/controller';
+import { ViewController } from '@ibiz-template/controller';
 import { useNamespace } from '@ibiz-template/vue-util';
 import { defineComponent, PropType } from 'vue';
 import '@ibiz-template/theme/style/components/layout/view-base/view-base.scss';
@@ -74,37 +74,6 @@ export const ViewBase = defineComponent({
             }
             return null;
           },
-          quickSearch: () => {
-            const _c = c as MDViewController;
-            if (_c.complete && _c.model.source.enableQuickSearch) {
-              return (
-                <quick-search
-                  value={_c.query}
-                  viewMode={c.modal.mode}
-                  placeholder={_c.model.placeholder}
-                  on-update={(val: string) => {
-                    _c.query = val;
-                  }}
-                  on-search={() => _c.onSearch()}
-                ></quick-search>
-              );
-            }
-          },
-          searchForm: () => {
-            const _c = c as MDViewController;
-            if (_c.complete && _c.model.searchForm) {
-              return (
-                <search-form-control
-                  modelData={_c.model.searchForm}
-                  context={_c.context}
-                  params={_c.params}
-                  on-neuronInit={_c.nerve.onNeuronInit(
-                    _c.model.searchForm.source.name,
-                  )}
-                ></search-form-control>
-              );
-            }
-          },
           ...inheritSlots,
         }}
       />

app_Web/src/components/layout/view-layout/view-layout.tsx

@@ -73,12 +73,14 @@ export const ViewLayout = defineComponent({
             <div class={this.ns.b('header-exp')}></div>
           </div>
         ) : null}
+        {this.$scopedSlots.searchForm && this.$scopedSlots.searchForm({}) && (
           <div class={this.ns.b('top')}>
             <div class={this.ns.be('top', 'message')}></div>
             <div class={this.ns.be('top', 'search-form')}>
               {this.$scopedSlots.searchForm && this.$scopedSlots.searchForm({})}
             </div>
           </div>
+        )}
         <div class={this.ns.b('content')}>
           <div class={this.ns.be('content', 'left')}></div>
           <div class={this.ns.be('content', 'body')}>
@@ -86,9 +88,11 @@ export const ViewLayout = defineComponent({
           </div>
           <div class={this.ns.be('content', 'right')}></div>
         </div>
+        {this.$scopedSlots.footer && (
           <div class={this.ns.b('footer')}>
             {this.$scopedSlots.footer && this.$scopedSlots.footer({})}
           </div>
+        )}
       </div>
     );
   },

app_Web/src/components/views/edit-view3/edit-view3.tsx

-import { IModal } from '@ibiz-template/runtime';
+import { IModal, ViewMode } from '@ibiz-template/runtime';
 import { useEditView3Controller, useNamespace } from '@ibiz-template/vue-util';
 import { defineComponent, getCurrentInstance, PropType, ref } from 'vue';
+import '@ibiz-template/theme/style/components/views/edit-view3/edit-view3.scss';
 
 export const EditView3 = defineComponent({
   props: {
@@ -64,7 +65,7 @@ export const EditView3 = defineComponent({
                       props: {
                         context: drPage.context,
                         params: drPage.params,
-                        modal: this.modal,
+                        modal: { mode: ViewMode.EMBED },
                         modelPath: page.embedView.source.modelPath,
                         // 流程跟踪视图用
                         deName: this.c.model.appEntity.source.codeName,

app_Web/src/components/views/wf-dyna-edit-view3/wf-dyna-edit-view3.tsx

-import { IModal } from '@ibiz-template/runtime';
+import { IModal, ViewMode } from '@ibiz-template/runtime';
 import {
   useWFDynaEditView3Controller,
   useNamespace,
@@ -6,6 +6,7 @@ import {
 import { defineComponent, getCurrentInstance, PropType, ref } from 'vue';
 import { ViewType } from '@ibiz-template/model';
 import { WFLink } from '@ibiz-template/controller';
+import '@ibiz-template/theme/style/components/views/wf-dyna-edit-view3/wf-dyna-edit-view3.scss';
 
 export const WFDynaEditView3 = defineComponent({
   props: {
@@ -97,7 +98,7 @@ export const WFDynaEditView3 = defineComponent({
                       props: {
                         context: drPage.context,
                         params: drPage.params,
-                        modal: this.modal,
+                        modal: { mode: ViewMode.EMBED },
                         modelPath: page.embedView.source.modelPath,
                         // 流程跟踪视图用
                         deName: this.c.model.appEntity.source.codeName,

app_Web/src/components/widgets/form-control/form-item/form-item.tsx

@@ -40,6 +40,7 @@ export const FormItem = defineComponent({
             data: this.controller.data,
             controller: this.controller.editor,
             disabled: this.controller.disabled,
+            readonly: this.controller.editor!.readonly,
           },
           on: {
             change: this.onValueChange,

app_Web/src/components/widgets/form-control/form-page/form-page.tsx

@@ -18,9 +18,14 @@ export const FormPage = defineComponent({
     return { ns, tabName };
   },
   render() {
+    const { noTabHeader } = this.modelData.source;
     const defaultSlots: VNode[] = this.$slots.default || [];
-    if (defaultSlots.length === 1) {
-      return <div class={this.ns.b()}>{defaultSlots}</div>;
+    if (defaultSlots.length === 1 || noTabHeader) {
+      return (
+        <div class={(this.ns.b(), this.ns.m('no-tab-header'))}>
+          {defaultSlots}
+        </div>
+      );
     }
     return (
       <i-tabs class={[this.ns.b(), this.ns.b('tab')]} name={this.tabName}>

app_Web/src/components/widgets/grid-control/grid-field-column/grid-field-column.tsx

@@ -45,7 +45,13 @@ export const GridFieldColumn = defineComponent({
      */
     const onCellClick = (event: MouseEvent) => {
       if (props.controller.isLinkColumn) {
+        // 阻止触发行点击
+        event.stopPropagation();
         props.controller.openLinkView(props.row, event);
+      } else if (props.controller.hasAction) {
+        // 阻止触发行点击
+        event.stopPropagation();
+        props.controller.triggerAction(props.row, event);
       }
     };
 
@@ -72,7 +78,7 @@ export const GridFieldColumn = defineComponent({
     const value = this.row.data[c.model.codeName];
     return (
       <div
-        class={[this.ns.b(), c.isLinkColumn && this.ns.m('link-column')]}
+        class={[this.ns.b(), c.clickable && this.ns.m('clickable')]}
         style={this.alignStyle}
         onClick={this.onCellClick}
       >

app_Web/src/components/widgets/grid-control/grid-field-edit-column/grid-field-edit-column.tsx

@@ -51,10 +51,18 @@ export const GridFieldEditColumn = defineComponent({
       return ns.cssVarBlock({ 'justify-content': justContent });
     });
 
+    const isReadonly = computed(() => {
+      const codeName = editItemC.model.codeName;
+      return (
+        props.row.columnState[codeName]!.disabled || editItemC.editor!.readonly
+      );
+    });
+
     return {
       ns,
       alignStyle,
       editItemC,
+      isReadonly,
       rowDataChange,
       rowSave,
       onStopPropagation,
@@ -76,7 +84,9 @@ export const GridFieldEditColumn = defineComponent({
               value: this.row.data[codeName],
               data: this.row.data,
               controller: this.editItemC.editor,
-              disabled: this.row.columnState[codeName]!.disabled,
+              // 单元格行编辑下，单个出禁用无意义，所以禁用走的还是只读
+              disabled: false,
+              readonly: this.isReadonly,
               rowDataChange: this.rowDataChange.bind(this),
               rowSave: this.rowSave.bind(this),
             },

app_Web/yarn.lock

@@ -504,53 +504,53 @@
   dependencies:
     qx-util "^0.4.4"
 
-"@ibiz-template/controller@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.13.tgz#60a07746e6012aa543d532edbd10f486546daca9"
-  integrity sha512-BgZA8bI18PiZKvG7HK2egqEd/QmtukhV/1V0/BAi9SOvz7Wd2NQ3ewR197yTFF0F5exegxFfIJg4WKQSQqMoQg==
+"@ibiz-template/controller@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.14.tgz#255e631e8a7b2aae6428d71563d9e0ff4d70beef"
+  integrity sha512-7QvzBJfAjb5DNcAdlGU7r8JqVhVR3DIg9ZAlpUC5xZrpNqOfKrufOqmWBVvrQ1t3EMRNsIpaRFaL1zxdr6YIWA==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.13.tgz#9e5bab1cb7fdb79824406f9f54b9f294cf006d3d"
-  integrity sha512-mJTtEkjjV1MNiWPMv2wx8jvwwMkWCy06MQPoyVLRNp2xfdMF/V+NKscfb3YTJQYiR/pq9OB8dmMNPo91XydcBA==
+"@ibiz-template/core@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.14.tgz#38d6ab138b9b04c8ad0534e6026029fd7fe6c990"
+  integrity sha512-tHjHIZuOZ957PM5i2v/kBbBpBq7vgl/ar3EyhDcrQskDKmkEZ76aBgW9wzyu85u6+MFXpIj1zJLjW9jzpuO5ZQ==
   dependencies:
     axios "^1.1.3"
     loglevel "^1.8.0"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.13.tgz#dc2ecb81857882cc0a4ca2534b23c7d1a931b366"
-  integrity sha512-bBCSNhJqj5LZtcjP96ad4APt0CFtrQxHX+C9SuB2bdAUxTENI107p6/YpGmIFwKGp5cJjDHPkRR86XAeNfyLRw==
+"@ibiz-template/model@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.14.tgz#197038676efc784406bd9b3ea35a40026f4d23ee"
+  integrity sha512-L5OlkEP4xzSjfDjSIcO0vbxzIP/4UasObdOS5Sq2P9I2yyC3Ew+Llm8mXOpKOADBc1iK8Sh0BtEvD0HrpMlAEw==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.1.5"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.13.tgz#44740424f1d2f4e06025a4fef3525a3d84e1669d"
-  integrity sha512-e/Aq4TxVpp0jA/NkZX32xouFUqybSxuo6zpq8y7KUhhMv/wHthv0EwlMmv5EuSWRaeVp850nGyIJww8TGt85NQ==
+"@ibiz-template/runtime@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.14.tgz#3a11dbb69b2b57220cfbc901b5b208c69427abce"
+  integrity sha512-qifD9sDXlx6gbLGbJ7FueoM58REEUjkOEdHKQFI7EA38YdCvJxkaC96lbVcHF/85/F7/gjdhmtBeKBbq8t2QWA==
   dependencies:
     "@ibiz-template/command" "^0.0.1-beta.1"
 
-"@ibiz-template/service@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.13.tgz#d2f66e6794aa9d0110add3800f180cc5ec457528"
-  integrity sha512-DVA4eFbgvMEyyIuV6Lfn18MoiYWnXXTAaA32AX4fsVX0Q/ovjJdknjBy1RE69xhZotxLBxiwRiZy3419nRxyDQ==
+"@ibiz-template/service@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.14.tgz#6b49f73ead49ac3d51f6276e44e080e76a0a0a11"
+  integrity sha512-lONZfDih1ovQAZEu8Mi3IiWfSPyWtjnmgGqT7iZ/2lludNSRUyCQzZ+mmQ2WldzslLi2i8ZG1W082A43wxcQBw==
 
-"@ibiz-template/theme@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.13.tgz#99bd30a2fa208ac6d85972561099e22ec1566a1c"
-  integrity sha512-5/InomGBlZciBXxbRh4bvue3b7ncuOllT/3VN2cZBS3VmU3l0f0ZVaS8O2dpKmYzHRf/nijqacMyeemQZ25juQ==
+"@ibiz-template/theme@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.14.tgz#77787d2317d5a36bbb8a64d1378d397ce14a6438"
+  integrity sha512-oas6HHAIUvacGBETPN95VxlUzGhpr8NIH2wM/0On7XgHnjWCNg8O203Zg1XRID1/j+EzShSASwbTgYElq7XOkg==
 
-"@ibiz-template/vue-util@^0.0.1-beta.13":
-  version "0.0.1-beta.13"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.13.tgz#de4ba4e17c8bc50f05a4e49bf6d7170cf2f0c548"
-  integrity sha512-qDZTzR0gLkusALfXhF9DRY6Bv/l9edXbejwM2tfzpS6cWIICg8Yt3dhmKZtoHHA+abZ1Du0YJh8b5a4yLmVUIg==
+"@ibiz-template/vue-util@^0.0.1-beta.14":
+  version "0.0.1-beta.14"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.14.tgz#3d1e2c5ad68739921850b03773a77bfcb45286ef"
+  integrity sha512-iJ/RDHaWU0HNVJv5mXQNJUH/XEWEd+7deLg2N9HvDWjE8QQkYRm3F9MUZ8Dq5Nb7ULzjm4bVatOfzJjafO4gkA==
 
 "@ibiz/dynamic-model-api@^2.1.5":
   version "2.1.5"
@@ -1002,10 +1002,10 @@
     "@vue/compiler-core" "3.2.41"
     "@vue/shared" "3.2.41"
 
-"@vue/compiler-sfc@2.7.13":
-  version "2.7.13"
-  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"
-  integrity sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==
+"@vue/compiler-sfc@2.7.14":
+  version "2.7.14"
+  resolved "http://npm.zhr.icu/@vue%2fcompiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd"
+  integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
   dependencies:
     "@babel/parser" "^7.18.4"
     postcss "^8.4.14"
@@ -4286,12 +4286,12 @@ vue-tsc@^1.0.9:
     "@volar/vue-language-core" "1.0.9"
     "@volar/vue-typescript" "1.0.9"
 
-vue@^2.7.13:
-  version "2.7.13"
-  resolved "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"
-  integrity sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==
+vue@^2.7.14:
+  version "2.7.14"
+  resolved "http://npm.zhr.icu/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
+  integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
   dependencies:
-    "@vue/compiler-sfc" "2.7.13"
+    "@vue/compiler-sfc" "2.7.14"
     csstype "^3.1.0"
 
 which-boxed-primitive@^1.0.2: