@nocobase/client-v2 2.2.17 → 2.2.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/index.mjs
CHANGED
|
@@ -1095,7 +1095,7 @@ ctx.render(\`
|
|
|
1095
1095
|
&:hover .edit-icon {
|
|
1096
1096
|
display: inline-flex;
|
|
1097
1097
|
}
|
|
1098
|
-
`,children:[(0,m.jsx)(fi,{model:s}),r.mapSubModels("field",e=>{var d,c,g;let v=e.context.fieldPath.split("."),y=v.pop();if(void 0===y)return null;let _=ff(v,o,y,null==s||null==(d=s.context)?void 0:d.fieldIndex),b=ut([...v,o,y],a),x=e.createFork({},`${n}`);if(x.context.defineProperty("currentObject",{get:()=>l}),x.context.defineProperty("fieldPathArray",{get:()=>_,cache:!1}),s){let{value:e,...t}=(null==(c=(g=s.context).getPropertyOptions)?void 0:c.call(g,"item"))||{};x.context.defineProperty("item",{...t,get:()=>s.context.item,cache:!1}),x.context.defineProperty("fieldIndex",{get:()=>s.context.fieldIndex,cache:!1})}else x.context.defineProperty("item",{get:()=>{var e,t;let n=null==r||null==(t=r.parent)||null==(e=t.props)?void 0:e.value;return{index:o,length:Array.isArray(n)?n.length:void 0,__is_new__:p,__is_stored__:null==l?void 0:l.__is_stored__,value:l}},cache:!1});return fv(r)?(x.setProps(fb(r,t)),(0,m.jsx)(i.default.Fragment,{children:x.render()},n)):r.props.aclViewDisabled&&!p?null:(0,i.createElement)(f.FormItem,{...r.props,key:n,name:b,style:{marginBottom:0},showLabel:!1,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled},x.constructor.isLargeField?(0,m.jsx)(fa,{model:x,params:{fieldPath:[r.context.fieldPath,o,y],index:n},defaultValue:t,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled}):(0,m.jsx)(fx,{model:x,id:[r.context.fieldPath,o],commitOnChange:u}))})]})},(e,t)=>e.value===t.value&&e.id===t.id&&e.memoKey===t.memoKey&&e.width===t.width&&e.commitOnChange===t.commitOnChange&&e.rowIdx===t.rowIdx&&e.disabled===t.disabled);class fw extends f.EditableItemModel{getAssociationField(){var e,t;return null==(t=this.parent)||null==(e=t.context)?void 0:e.collectionField}getParentFormValues(){var e,t,l;return null==(l=this.context)||null==(t=l.blockModel)||null==(e=t.context)?void 0:e.formValues}createParentItemAccessors(e){let t=hH({parentContextAccessor:()=>{var e;return null==(e=this.parent)?void 0:e.context},fallbackParentPropertiesAccessor:()=>this.getParentFormValues()});return e?{parentPropertiesAccessor:l=>{var o;return(null==(o=e())?void 0:o.value)??t.parentPropertiesAccessor(l)},parentItemMetaAccessor:t.parentItemMetaAccessor,parentItemResolverAccessor:t.parentItemResolverAccessor}:t}createRowItemContextPropertyOptions(){var e,t,l;let o=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=this.getAssociationField();return hW({t:this.context.t,title:hV(this.context.t,n,null==(e=this.props)?void 0:e.name),showIndex:!0,showParentIndex:o.showParentIndex??(Array.isArray(null==(l=this.parent)||null==(t=l.context)?void 0:t.fieldIndex)&&this.parent.context.fieldIndex.length>0),collectionAccessor:()=>{var e;return(null==(e=this.parent)?void 0:e.collection)??(null==n?void 0:n.targetCollection)??null},propertiesAccessor:e=>{var t;return null==e||null==(t=e.item)?void 0:t.value},resolverPropertiesAccessor:o.resolverPropertiesAccessor??(()=>void 0),parentCollectionAccessor:()=>null==n?void 0:n.collection,parentAccessors:this.createParentItemAccessors(o.parentItemAccessor)})}renderHiddenInConfig(){return(0,m.jsx)(fr,{targetModel:this})}static defineChildren(e){let t=e.model.collection||e.collection;return t.getFields().map(l=>{if(!l.interface)return null;let o=this.getDefaultBindingByField(e,l,{fallbackToTargetTitleField:!0});if(!o)return null;let n=fs(o.modelName),i=e.fieldPath?`${e.fieldPath}.${l.name}`:l.name;return{key:i,label:l.title,refreshTargets:["SubTableColumnModel/TableJSFieldItemModel"],toggleable:e=>{var t;return(null==(t=e.getStepParams("fieldSettings","init"))?void 0:t.fieldPath)===i},useModel:this.name,createModelOptions:()=>({use:this.name,stepParams:{fieldSettings:{init:{dataSourceKey:t.dataSourceKey,collectionName:e.model.context.blockModel.collection.name,fieldPath:i}}},subModels:{field:{use:n,props:"function"==typeof o.defaultProps?o.defaultProps(e,l):o.defaultProps}}})}}).filter(Boolean)}get collection(){return this.parent.collection}get hasFormulaColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{let t=e.collectionField;return(null==t?void 0:t.interface)==="formula"||(null==t?void 0:t.type)==="formula"}))||[]).some(Boolean)}get hasFormValueDrivenDataScopeColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{var t;return fc(null==e||null==(t=e.subModels)?void 0:t.field)}))||[]).some(Boolean)}onInit(e){super.onInit(e),this.context.defineProperty("resourceName",{get:()=>this.context.collectionField.collection.name,cache:!1}),this.context.defineProperty("actionName",{get:()=>"view"}),this.context.defineProperty("item",{get:()=>void 0,...this.createRowItemContextPropertyOptions()}),this.emitter.on("onSubModelAdded",e=>{this.collectionField&&e.setProps(this.collectionField.getComponentProps())})}async afterAddAsSubModel(){await super.afterAddAsSubModel(),await this.dispatchEvent("beforeRender")}getColumnProps(){let e=(0,m.jsx)(f.Droppable,{model:this,children:(0,m.jsx)(f.FlowsFloatContextMenu,{model:this,containerStyle:{display:"block",padding:"11px 7px",margin:"-11px -7px"},showBorder:!1,settingsMenuLevel:2,extraToolbarItems:[{key:"drag-handler",component:f.DragHandler,sort:1}],enabled:this.context.flowSettingsEnabled,children:(0,m.jsxs)("div",{className:(0,A.css)`
|
|
1098
|
+
`,children:[(0,m.jsx)(fi,{model:s}),r.mapSubModels("field",e=>{var d,c,g;let v=e.context.fieldPath.split("."),y=v.pop();if(void 0===y)return null;let _=ff(v,o,y,null==s||null==(d=s.context)?void 0:d.fieldIndex),b=ut([...v,o,y],a),x=e.createFork({},`${n}`);if(x.context.defineProperty("currentObject",{get:()=>l}),x.context.defineProperty("fieldPathArray",{get:()=>_,cache:!1}),s){let{value:e,...t}=(null==(c=(g=s.context).getPropertyOptions)?void 0:c.call(g,"item"))||{};x.context.defineProperty("item",{...t,get:()=>s.context.item,cache:!1}),x.context.defineProperty("fieldIndex",{get:()=>s.context.fieldIndex,cache:!1})}else x.context.defineProperty("item",{get:()=>{var e,t;let n=null==r||null==(t=r.parent)||null==(e=t.props)?void 0:e.value;return{index:o,length:Array.isArray(n)?n.length:void 0,__is_new__:p,__is_stored__:null==l?void 0:l.__is_stored__,value:l}},cache:!1});return fv(r)?(x.setProps(fb(r,t)),(0,m.jsx)(i.default.Fragment,{children:x.render()},n)):r.props.aclViewDisabled&&!p?null:(0,i.createElement)(f.FormItem,{...r.props,key:n,name:b,style:{marginBottom:0},showLabel:!1,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled},x.constructor.isLargeField?(0,m.jsx)(fa,{model:x,params:{fieldPath:[r.context.fieldPath,o,y],index:n},defaultValue:t,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled}):(0,m.jsx)(fx,{model:x,id:[r.context.fieldPath,o],commitOnChange:u}))})]})},(e,t)=>e.value===t.value&&e.id===t.id&&e.memoKey===t.memoKey&&e.width===t.width&&e.commitOnChange===t.commitOnChange&&e.rowIdx===t.rowIdx&&e.disabled===t.disabled);class fw extends f.EditableItemModel{getAssociationField(){var e,t;return null==(t=this.parent)||null==(e=t.context)?void 0:e.collectionField}getParentFormValues(){var e,t,l;return null==(l=this.context)||null==(t=l.blockModel)||null==(e=t.context)?void 0:e.formValues}createParentItemAccessors(e){let t=hH({parentContextAccessor:()=>{var e;return null==(e=this.parent)?void 0:e.context},fallbackParentPropertiesAccessor:()=>this.getParentFormValues()});return e?{parentPropertiesAccessor:l=>{var o;return(null==(o=e())?void 0:o.value)??t.parentPropertiesAccessor(l)},parentItemMetaAccessor:t.parentItemMetaAccessor,parentItemResolverAccessor:t.parentItemResolverAccessor}:t}createRowItemContextPropertyOptions(){var e,t,l;let o=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=this.getAssociationField();return hW({t:this.context.t,title:hV(this.context.t,n,null==(e=this.props)?void 0:e.name),showIndex:!0,showParentIndex:o.showParentIndex??(Array.isArray(null==(l=this.parent)||null==(t=l.context)?void 0:t.fieldIndex)&&this.parent.context.fieldIndex.length>0),collectionAccessor:()=>{var e;return(null==(e=this.parent)?void 0:e.collection)??(null==n?void 0:n.targetCollection)??null},propertiesAccessor:e=>{var t;return null==e||null==(t=e.item)?void 0:t.value},resolverPropertiesAccessor:o.resolverPropertiesAccessor??(()=>void 0),parentCollectionAccessor:()=>null==n?void 0:n.collection,parentAccessors:this.createParentItemAccessors(o.parentItemAccessor)})}renderHiddenInConfig(){return(0,m.jsx)(fr,{targetModel:this})}static defineChildren(e){let t=e.model.collection||e.collection;return t.getFields().map(l=>{if(!l.interface)return null;let o=this.getDefaultBindingByField(e,l,{fallbackToTargetTitleField:!0});if(!o)return null;let n=fs(o.modelName),i=e.fieldPath?`${e.fieldPath}.${l.name}`:l.name;return{key:i,label:l.title,refreshTargets:["SubTableColumnModel/TableJSFieldItemModel"],toggleable:e=>{var t;return(null==(t=e.getStepParams("fieldSettings","init"))?void 0:t.fieldPath)===i},useModel:this.name,createModelOptions:()=>({use:this.name,stepParams:{fieldSettings:{init:{dataSourceKey:t.dataSourceKey,collectionName:e.model.context.blockModel.collection.name,fieldPath:i}}},subModels:{field:{use:n,props:"function"==typeof o.defaultProps?o.defaultProps(e,l):o.defaultProps}}})}}).filter(Boolean)}get collection(){return this.parent.collection}get hasFormulaColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{let t=e.collectionField;return(null==t?void 0:t.interface)==="formula"||(null==t?void 0:t.type)==="formula"}))||[]).some(Boolean)}get hasFormValueDrivenDataScopeColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{var t;return fc(null==e||null==(t=e.subModels)?void 0:t.field)}))||[]).some(Boolean)}onInit(e){var t,l,o,n;super.onInit(e);let i=null==(l=this.context.blockModel)||null==(t=l.context)?void 0:t.resource,r=this.context.fieldPath;(null==i?void 0:i.addUpdateAssociationValues)&&r&&(null==(n=this.collectionField)||null==(o=n.isAssociationField)?void 0:o.call(n))&&i.addUpdateAssociationValues(r),this.context.defineProperty("resourceName",{get:()=>this.context.collectionField.collection.name,cache:!1}),this.context.defineProperty("actionName",{get:()=>"view"}),this.context.defineProperty("item",{get:()=>void 0,...this.createRowItemContextPropertyOptions()}),this.emitter.on("onSubModelAdded",e=>{this.collectionField&&e.setProps(this.collectionField.getComponentProps())})}async afterAddAsSubModel(){await super.afterAddAsSubModel(),await this.dispatchEvent("beforeRender")}getColumnProps(){let e=(0,m.jsx)(f.Droppable,{model:this,children:(0,m.jsx)(f.FlowsFloatContextMenu,{model:this,containerStyle:{display:"block",padding:"11px 7px",margin:"-11px -7px"},showBorder:!1,settingsMenuLevel:2,extraToolbarItems:[{key:"drag-handler",component:f.DragHandler,sort:1}],enabled:this.context.flowSettingsEnabled,children:(0,m.jsxs)("div",{className:(0,A.css)`
|
|
1099
1099
|
overflow: hidden;
|
|
1100
1100
|
text-overflow: ellipsis;
|
|
1101
1101
|
white-space: nowrap;
|
package/lib/index.js
CHANGED
|
@@ -1095,7 +1095,7 @@ ctx.render(\`
|
|
|
1095
1095
|
&:hover .edit-icon {
|
|
1096
1096
|
display: inline-flex;
|
|
1097
1097
|
}
|
|
1098
|
-
`,children:[(0,m.jsx)(fn,{model:s}),r.mapSubModels("field",e=>{var d,c,g;let v=e.context.fieldPath.split("."),y=v.pop();if(void 0===y)return null;let b=ff(v,o,y,null==s||null==(d=s.context)?void 0:d.fieldIndex),x=ut([...v,o,y],a),M=e.createFork({},`${i}`);if(M.context.defineProperty("currentObject",{get:()=>l}),M.context.defineProperty("fieldPathArray",{get:()=>b,cache:!1}),s){let{value:e,...t}=(null==(c=(g=s.context).getPropertyOptions)?void 0:c.call(g,"item"))||{};M.context.defineProperty("item",{...t,get:()=>s.context.item,cache:!1}),M.context.defineProperty("fieldIndex",{get:()=>s.context.fieldIndex,cache:!1})}else M.context.defineProperty("item",{get:()=>{var e,t;let i=null==r||null==(t=r.parent)||null==(e=t.props)?void 0:e.value;return{index:o,length:Array.isArray(i)?i.length:void 0,__is_new__:p,__is_stored__:null==l?void 0:l.__is_stored__,value:l}},cache:!1});return fv(r)?(M.setProps(fx(r,t)),(0,m.jsx)(n.default.Fragment,{children:M.render()},i)):r.props.aclViewDisabled&&!p?null:(0,n.createElement)(f.FormItem,{...r.props,key:i,name:x,style:{marginBottom:0},showLabel:!1,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled},M.constructor.isLargeField?(0,m.jsx)(fa,{model:M,params:{fieldPath:[r.context.fieldPath,o,y],index:i},defaultValue:t,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled}):(0,m.jsx)(fM,{model:M,id:[r.context.fieldPath,o],commitOnChange:u}))})]})},(e,t)=>e.value===t.value&&e.id===t.id&&e.memoKey===t.memoKey&&e.width===t.width&&e.commitOnChange===t.commitOnChange&&e.rowIdx===t.rowIdx&&e.disabled===t.disabled);class fS extends f.EditableItemModel{getAssociationField(){var e,t;return null==(t=this.parent)||null==(e=t.context)?void 0:e.collectionField}getParentFormValues(){var e,t,l;return null==(l=this.context)||null==(t=l.blockModel)||null==(e=t.context)?void 0:e.formValues}createParentItemAccessors(e){let t=hH({parentContextAccessor:()=>{var e;return null==(e=this.parent)?void 0:e.context},fallbackParentPropertiesAccessor:()=>this.getParentFormValues()});return e?{parentPropertiesAccessor:l=>{var o;return(null==(o=e())?void 0:o.value)??t.parentPropertiesAccessor(l)},parentItemMetaAccessor:t.parentItemMetaAccessor,parentItemResolverAccessor:t.parentItemResolverAccessor}:t}createRowItemContextPropertyOptions(){var e,t,l;let o=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=this.getAssociationField();return hW({t:this.context.t,title:hV(this.context.t,i,null==(e=this.props)?void 0:e.name),showIndex:!0,showParentIndex:o.showParentIndex??(Array.isArray(null==(l=this.parent)||null==(t=l.context)?void 0:t.fieldIndex)&&this.parent.context.fieldIndex.length>0),collectionAccessor:()=>{var e;return(null==(e=this.parent)?void 0:e.collection)??(null==i?void 0:i.targetCollection)??null},propertiesAccessor:e=>{var t;return null==e||null==(t=e.item)?void 0:t.value},resolverPropertiesAccessor:o.resolverPropertiesAccessor??(()=>void 0),parentCollectionAccessor:()=>null==i?void 0:i.collection,parentAccessors:this.createParentItemAccessors(o.parentItemAccessor)})}renderHiddenInConfig(){return(0,m.jsx)(fr,{targetModel:this})}static defineChildren(e){let t=e.model.collection||e.collection;return t.getFields().map(l=>{if(!l.interface)return null;let o=this.getDefaultBindingByField(e,l,{fallbackToTargetTitleField:!0});if(!o)return null;let i=fs(o.modelName),n=e.fieldPath?`${e.fieldPath}.${l.name}`:l.name;return{key:n,label:l.title,refreshTargets:["SubTableColumnModel/TableJSFieldItemModel"],toggleable:e=>{var t;return(null==(t=e.getStepParams("fieldSettings","init"))?void 0:t.fieldPath)===n},useModel:this.name,createModelOptions:()=>({use:this.name,stepParams:{fieldSettings:{init:{dataSourceKey:t.dataSourceKey,collectionName:e.model.context.blockModel.collection.name,fieldPath:n}}},subModels:{field:{use:i,props:"function"==typeof o.defaultProps?o.defaultProps(e,l):o.defaultProps}}})}}).filter(Boolean)}get collection(){return this.parent.collection}get hasFormulaColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{let t=e.collectionField;return(null==t?void 0:t.interface)==="formula"||(null==t?void 0:t.type)==="formula"}))||[]).some(Boolean)}get hasFormValueDrivenDataScopeColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{var t;return fc(null==e||null==(t=e.subModels)?void 0:t.field)}))||[]).some(Boolean)}onInit(e){super.onInit(e),this.context.defineProperty("resourceName",{get:()=>this.context.collectionField.collection.name,cache:!1}),this.context.defineProperty("actionName",{get:()=>"view"}),this.context.defineProperty("item",{get:()=>void 0,...this.createRowItemContextPropertyOptions()}),this.emitter.on("onSubModelAdded",e=>{this.collectionField&&e.setProps(this.collectionField.getComponentProps())})}async afterAddAsSubModel(){await super.afterAddAsSubModel(),await this.dispatchEvent("beforeRender")}getColumnProps(){let e=(0,m.jsx)(f.Droppable,{model:this,children:(0,m.jsx)(f.FlowsFloatContextMenu,{model:this,containerStyle:{display:"block",padding:"11px 7px",margin:"-11px -7px"},showBorder:!1,settingsMenuLevel:2,extraToolbarItems:[{key:"drag-handler",component:f.DragHandler,sort:1}],enabled:this.context.flowSettingsEnabled,children:(0,m.jsxs)("div",{className:(0,A.css)`
|
|
1098
|
+
`,children:[(0,m.jsx)(fn,{model:s}),r.mapSubModels("field",e=>{var d,c,g;let v=e.context.fieldPath.split("."),y=v.pop();if(void 0===y)return null;let b=ff(v,o,y,null==s||null==(d=s.context)?void 0:d.fieldIndex),x=ut([...v,o,y],a),M=e.createFork({},`${i}`);if(M.context.defineProperty("currentObject",{get:()=>l}),M.context.defineProperty("fieldPathArray",{get:()=>b,cache:!1}),s){let{value:e,...t}=(null==(c=(g=s.context).getPropertyOptions)?void 0:c.call(g,"item"))||{};M.context.defineProperty("item",{...t,get:()=>s.context.item,cache:!1}),M.context.defineProperty("fieldIndex",{get:()=>s.context.fieldIndex,cache:!1})}else M.context.defineProperty("item",{get:()=>{var e,t;let i=null==r||null==(t=r.parent)||null==(e=t.props)?void 0:e.value;return{index:o,length:Array.isArray(i)?i.length:void 0,__is_new__:p,__is_stored__:null==l?void 0:l.__is_stored__,value:l}},cache:!1});return fv(r)?(M.setProps(fx(r,t)),(0,m.jsx)(n.default.Fragment,{children:M.render()},i)):r.props.aclViewDisabled&&!p?null:(0,n.createElement)(f.FormItem,{...r.props,key:i,name:x,style:{marginBottom:0},showLabel:!1,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled},M.constructor.isLargeField?(0,m.jsx)(fa,{model:M,params:{fieldPath:[r.context.fieldPath,o,y],index:i},defaultValue:t,disabled:h||!p&&r.props.aclDisabled||p&&r.props.aclCreateDisabled}):(0,m.jsx)(fM,{model:M,id:[r.context.fieldPath,o],commitOnChange:u}))})]})},(e,t)=>e.value===t.value&&e.id===t.id&&e.memoKey===t.memoKey&&e.width===t.width&&e.commitOnChange===t.commitOnChange&&e.rowIdx===t.rowIdx&&e.disabled===t.disabled);class fS extends f.EditableItemModel{getAssociationField(){var e,t;return null==(t=this.parent)||null==(e=t.context)?void 0:e.collectionField}getParentFormValues(){var e,t,l;return null==(l=this.context)||null==(t=l.blockModel)||null==(e=t.context)?void 0:e.formValues}createParentItemAccessors(e){let t=hH({parentContextAccessor:()=>{var e;return null==(e=this.parent)?void 0:e.context},fallbackParentPropertiesAccessor:()=>this.getParentFormValues()});return e?{parentPropertiesAccessor:l=>{var o;return(null==(o=e())?void 0:o.value)??t.parentPropertiesAccessor(l)},parentItemMetaAccessor:t.parentItemMetaAccessor,parentItemResolverAccessor:t.parentItemResolverAccessor}:t}createRowItemContextPropertyOptions(){var e,t,l;let o=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=this.getAssociationField();return hW({t:this.context.t,title:hV(this.context.t,i,null==(e=this.props)?void 0:e.name),showIndex:!0,showParentIndex:o.showParentIndex??(Array.isArray(null==(l=this.parent)||null==(t=l.context)?void 0:t.fieldIndex)&&this.parent.context.fieldIndex.length>0),collectionAccessor:()=>{var e;return(null==(e=this.parent)?void 0:e.collection)??(null==i?void 0:i.targetCollection)??null},propertiesAccessor:e=>{var t;return null==e||null==(t=e.item)?void 0:t.value},resolverPropertiesAccessor:o.resolverPropertiesAccessor??(()=>void 0),parentCollectionAccessor:()=>null==i?void 0:i.collection,parentAccessors:this.createParentItemAccessors(o.parentItemAccessor)})}renderHiddenInConfig(){return(0,m.jsx)(fr,{targetModel:this})}static defineChildren(e){let t=e.model.collection||e.collection;return t.getFields().map(l=>{if(!l.interface)return null;let o=this.getDefaultBindingByField(e,l,{fallbackToTargetTitleField:!0});if(!o)return null;let i=fs(o.modelName),n=e.fieldPath?`${e.fieldPath}.${l.name}`:l.name;return{key:n,label:l.title,refreshTargets:["SubTableColumnModel/TableJSFieldItemModel"],toggleable:e=>{var t;return(null==(t=e.getStepParams("fieldSettings","init"))?void 0:t.fieldPath)===n},useModel:this.name,createModelOptions:()=>({use:this.name,stepParams:{fieldSettings:{init:{dataSourceKey:t.dataSourceKey,collectionName:e.model.context.blockModel.collection.name,fieldPath:n}}},subModels:{field:{use:i,props:"function"==typeof o.defaultProps?o.defaultProps(e,l):o.defaultProps}}})}}).filter(Boolean)}get collection(){return this.parent.collection}get hasFormulaColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{let t=e.collectionField;return(null==t?void 0:t.interface)==="formula"||(null==t?void 0:t.type)==="formula"}))||[]).some(Boolean)}get hasFormValueDrivenDataScopeColumn(){var e;return((null==(e=this.parent)?void 0:e.mapSubModels("columns",e=>{var t;return fc(null==e||null==(t=e.subModels)?void 0:t.field)}))||[]).some(Boolean)}onInit(e){var t,l,o,i;super.onInit(e);let n=null==(l=this.context.blockModel)||null==(t=l.context)?void 0:t.resource,r=this.context.fieldPath;(null==n?void 0:n.addUpdateAssociationValues)&&r&&(null==(i=this.collectionField)||null==(o=i.isAssociationField)?void 0:o.call(i))&&n.addUpdateAssociationValues(r),this.context.defineProperty("resourceName",{get:()=>this.context.collectionField.collection.name,cache:!1}),this.context.defineProperty("actionName",{get:()=>"view"}),this.context.defineProperty("item",{get:()=>void 0,...this.createRowItemContextPropertyOptions()}),this.emitter.on("onSubModelAdded",e=>{this.collectionField&&e.setProps(this.collectionField.getComponentProps())})}async afterAddAsSubModel(){await super.afterAddAsSubModel(),await this.dispatchEvent("beforeRender")}getColumnProps(){let e=(0,m.jsx)(f.Droppable,{model:this,children:(0,m.jsx)(f.FlowsFloatContextMenu,{model:this,containerStyle:{display:"block",padding:"11px 7px",margin:"-11px -7px"},showBorder:!1,settingsMenuLevel:2,extraToolbarItems:[{key:"drag-handler",component:f.DragHandler,sort:1}],enabled:this.context.flowSettingsEnabled,children:(0,m.jsxs)("div",{className:(0,A.css)`
|
|
1099
1099
|
overflow: hidden;
|
|
1100
1100
|
text-overflow: ellipsis;
|
|
1101
1101
|
white-space: nowrap;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/client-v2",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.18",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "es/index.mjs",
|
|
@@ -27,11 +27,11 @@
|
|
|
27
27
|
"@formily/antd-v5": "1.2.3",
|
|
28
28
|
"@formily/react": "^2.2.27",
|
|
29
29
|
"@formily/shared": "^2.2.27",
|
|
30
|
-
"@nocobase/evaluators": "2.2.
|
|
31
|
-
"@nocobase/flow-engine": "2.2.
|
|
32
|
-
"@nocobase/sdk": "2.2.
|
|
33
|
-
"@nocobase/shared": "2.2.
|
|
34
|
-
"@nocobase/utils": "2.2.
|
|
30
|
+
"@nocobase/evaluators": "2.2.18",
|
|
31
|
+
"@nocobase/flow-engine": "2.2.18",
|
|
32
|
+
"@nocobase/sdk": "2.2.18",
|
|
33
|
+
"@nocobase/shared": "2.2.18",
|
|
34
|
+
"@nocobase/utils": "2.2.18",
|
|
35
35
|
"ahooks": "^3.7.2",
|
|
36
36
|
"antd": "5.24.2",
|
|
37
37
|
"antd-style": "3.7.1",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"react-router-dom": "^6.30.1",
|
|
50
50
|
"zxing-wasm": "^3.1.3"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "0c464cd27b2c1ccdf10b00d339bf6599b18bee22"
|
|
53
53
|
}
|
package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableColumnModel.tsx
CHANGED
|
@@ -620,6 +620,11 @@ export class SubTableColumnModel<
|
|
|
620
620
|
|
|
621
621
|
onInit(options: any): void {
|
|
622
622
|
super.onInit(options);
|
|
623
|
+
const resource = this.context.blockModel?.context?.resource;
|
|
624
|
+
const fieldPath = this.context.fieldPath;
|
|
625
|
+
if (resource?.addUpdateAssociationValues && fieldPath && this.collectionField?.isAssociationField?.()) {
|
|
626
|
+
resource.addUpdateAssociationValues(fieldPath);
|
|
627
|
+
}
|
|
623
628
|
this.context.defineProperty('resourceName', {
|
|
624
629
|
get: () => {
|
|
625
630
|
return this.context.collectionField.collection.name;
|