@cniot/mdd-editor 0.2.0-beta.30 → 0.2.0-beta.32

package/build/index.es.js

@@ -3468,7 +3468,8 @@ class DetailItemSchema extends JSONWatch {
       current = 1,
       columnsDirection = "row",
       columnsBoxes = [],
-      hideCardTitle = false,
+      height = 100,
+      hideCard = true,
       ...more2
     } = props || {};
     super({
@@ -3489,7 +3490,8 @@ class DetailItemSchema extends JSONWatch {
       current,
       columnsDirection,
       columnsBoxes,
-      hideCardTitle,
+      height,
+      hideCard,
       ...more2
     });
   }
@@ -24645,13 +24647,8 @@ const TitleRender$2 = (props) => {
     onClick: onRemove
   }));
 };
-const watchFields = (listSchema) => {
-  const fieldStringArray = listSchema.map((item) => {
-    return `${item.label}_${item.name}`;
-  });
-  return fieldStringArray.join(",");
-};
 const ContentRender$2 = (props) => {
+  var _a2, _b2;
   const { values, effects, onChange, schema, index: index2, extraFieldSchema: extraFieldSchema2, updateForceFLag, listSchema } = props;
   const { type, label, name } = values;
   const { formilySchema: formilySchema2, dataAdaptor: dataAdaptor2 } = schema || {};
@@ -24663,7 +24660,7 @@ const ContentRender$2 = (props) => {
     debounce_1(() => {
       setUuid(uuidv4());
     }, 500),
-    [watchFields(listSchema)]
+    [`${(_a2 = props == null ? void 0 : props.values) == null ? void 0 : _a2.label}_${(_b2 = props == null ? void 0 : props.values) == null ? void 0 : _b2.name}`]
   );
   const realSchema = useMemo(() => {
     const srcSchema = getRealSchema(formilySchema2 || schema, { moduleDataSource, listSchema, blocksDataSource });
@@ -26001,7 +25998,7 @@ const { Panel: Panel$2 } = Collapse;
 const TitleRender$1 = (props) => {
   const ref = useRef(null);
   const { data, onSortUpdate, index: index2, draggable, onRemove, onChange, customRender = () => {
-  } } = props;
+  }, otherInfo } = props;
   const { dataMap, getModule } = useModule$1();
   const moduleDataSource = getModule("$ModuleDataSource");
   const [{ isOver }, drop] = useDrop({
@@ -26040,7 +26037,7 @@ const TitleRender$1 = (props) => {
     className: cls,
     style: { cursor: draggable ? "move" : "default", opacity },
     onClick: (e) => e.stopPropagation()
-  }, customRender && customRender({ data, index: index2, onChange, moduleDataSource }), /* @__PURE__ */ React$1.createElement(Icon, {
+  }, customRender && customRender({ data, index: index2, onChange, moduleDataSource, otherInfo }), /* @__PURE__ */ React$1.createElement(Icon, {
     type: "close",
     size: "small",
     className: styles$9.itemClose,
@@ -26061,7 +26058,8 @@ function MddTableSimpleArray(props) {
     onRemove,
     draggable = true,
     titleRender,
-    contentRender: contentRender2
+    contentRender: contentRender2,
+    otherInfo
   } = props;
   const onSortUpdate = useCallback(
     (dragIndex, hoverIndex) => {
@@ -26106,11 +26104,12 @@ function MddTableSimpleArray(props) {
         onRemove: () => onRemove(idx),
         data: item,
         onSortUpdate,
-        customRender: titleRender
+        customRender: titleRender,
+        otherInfo
       })
     }, /* @__PURE__ */ React$1.createElement("div", {
       className: styles$9.collapseContent
-    }, contentRender2({ data: item, index: idx, onChange: onTableArrayChange })));
+    }, contentRender2({ data: item, index: idx, onChange: onTableArrayChange, otherInfo })));
   })))), /* @__PURE__ */ React$1.createElement("div", {
     className: styles$9.tableArrayBottom
   }, /* @__PURE__ */ React$1.createElement(Button, {
@@ -27237,7 +27236,7 @@ function DetailColumns(props) {
     data.add(
       {
         moduleName: "",
-        cols: 1,
+        hideSelfCard: true,
         params: [],
         canUpdateOtherColumns: true,
         canBeUpdated: true
@@ -27314,13 +27313,14 @@ function DetailColumns(props) {
       forceUpdate({});
     },
     onAdd: onAddHandle,
-    onRemove: (index2) => onRemoveHandle(index2)
+    onRemove: (index2) => onRemoveHandle(index2),
+    otherInfo: { columnsDirection: data.get("columnsDirection") }
   })), data.get("hideCardTitle") ? null : /* @__PURE__ */ React$1.createElement(ActionsPanel, {
     schema: data
   }));
 }
 function customTitleRender$1(props) {
-  const { data, index: index2, onChange, moduleDataSource } = props;
+  const { data, index: index2, onChange, moduleDataSource, otherInfo = {} } = props;
   return /* @__PURE__ */ React$1.createElement("div", {
     className: styles$5.title
   }, /* @__PURE__ */ React$1.createElement("div", {
@@ -27337,7 +27337,7 @@ function customTitleRender$1(props) {
     dataSource: (moduleDataSource == null ? void 0 : moduleDataSource.l4ModuleOptions) || moduleDataSource || [],
     value: data == null ? void 0 : data.moduleName,
     onChange: (v2) => onChange({ ...data, moduleName: v2 })
-  })), /* @__PURE__ */ React$1.createElement("div", {
+  })), (otherInfo == null ? void 0 : otherInfo.columnsDirection) === "row" && /* @__PURE__ */ React$1.createElement("div", {
     className: styles$5.titleItem
   }, /* @__PURE__ */ React$1.createElement("label", {
     className: styles$5.titleItemLabel
@@ -27368,16 +27368,8 @@ function contentRender(props) {
   });
 }
 const ContentRender = (props) => {
-  const { data, index: index2, onChange } = props;
-  return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(Form.Item, {
-    wrapperCol: { span: 20 },
-    labelCol: { span: 4 },
-    label: "\u9690\u85CF \u5F53\u524D\u680F \u5361\u7247",
-    name: ""
-  }, /* @__PURE__ */ React$1.createElement(CnSwitch, {
-    defaultChecked: data == null ? void 0 : data.hideSelfCard,
-    onChange: (v2) => onChange({ index: index2, record: { ...data, hideSelfCard: v2 } })
-  })), /* @__PURE__ */ React$1.createElement(Form.Item, {
+  const { data, index: index2, onChange, otherInfo = {} } = props;
+  return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, (otherInfo == null ? void 0 : otherInfo.columnsDirection) === "column" && /* @__PURE__ */ React$1.createElement(Form.Item, {
     wrapperCol: { span: 20 },
     labelCol: { span: 4 },
     label: "\u9AD8\u5EA6",
@@ -27411,6 +27403,14 @@ const ContentRender = (props) => {
     valueTitle: "value(\u53C2\u6570\u503C) - .$ALL \u53EF\u83B7\u53D6\u6574\u4E2A\u52A8\u6001\u5BF9\u8C61",
     value: data == null ? void 0 : data.params,
     onChange: (v2) => onChange({ index: index2, record: { ...data, params: v2 } })
+  })), /* @__PURE__ */ React$1.createElement(Form.Item, {
+    wrapperCol: { span: 20 },
+    labelCol: { span: 4 },
+    label: "\u9690\u85CF \u5F53\u524D\u680F \u5361\u7247",
+    name: ""
+  }, /* @__PURE__ */ React$1.createElement(CnSwitch, {
+    defaultChecked: data == null ? void 0 : data.hideSelfCard,
+    onChange: (v2) => onChange({ index: index2, record: { ...data, hideSelfCard: v2 } })
   })), /* @__PURE__ */ React$1.createElement(Collapse, {
     accordion: true
   }, /* @__PURE__ */ React$1.createElement(Panel, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cniot/mdd-editor",
-  "version": "0.2.0-beta.30",
+  "version": "0.2.0-beta.32",
   "description": "模型驱动编辑器",
   "scripts": {
     "build": "vite build"

package/src/schema/detail/detail-item.js

@@ -20,7 +20,8 @@ export default class DetailItemSchema extends JSONWatch {
       current = 1, // 步骤条，当前步数
       columnsDirection = 'row', // 分栏组件 方向，默认横向分栏
       columnsBoxes = [],
-      hideCardTitle = false,
+      height = 100,
+      hideCard = true,
       ...more
     } = props || {};
     super({
@@ -41,7 +42,8 @@ export default class DetailItemSchema extends JSONWatch {
       current,
       columnsDirection,
       columnsBoxes,
-      hideCardTitle,
+      height,
+      hideCard,
       ...more,
     });
   }
@@ -143,7 +145,7 @@ export default class DetailItemSchema extends JSONWatch {
      * {array} actionColumns 操作列
      * {object} pagination 分页
      */
-    if (['columnsBoxes','columns', 'actionColumns', 'bulkActions'].includes(key)) {
+    if (['columnsBoxes', 'columns', 'actionColumns', 'bulkActions'].includes(key)) {
       this.data[key].splice(index, 1, record);
     } else {
       this.data[key] = record;
@@ -195,5 +197,5 @@ export default class DetailItemSchema extends JSONWatch {
     this.emit('$updated');
   }
 
-  delete() { }
+  delete() {}
 }

package/src/template/detail/components/DetailColumns.jsx

@@ -45,7 +45,7 @@ export default function DetailColumns(props) {
     data.add(
       {
         moduleName: '',
-        cols: 1,
+        hideSelfCard: true,
         params: [],
         canUpdateOtherColumns: true,
         canBeUpdated: true,
@@ -106,6 +106,7 @@ export default function DetailColumns(props) {
           }}
           onAdd={onAddHandle}
           onRemove={(index) => onRemoveHandle(index)}
+          otherInfo={{ columnsDirection: data.get('columnsDirection') }}
           // onRemove={onRemoveHandle}
         />
       </Form.Item>
@@ -115,7 +116,7 @@ export default function DetailColumns(props) {
 }
 
 function customTitleRender(props) {
-  const { data, index, onChange, moduleDataSource } = props;
+  const { data, index, onChange, moduleDataSource, otherInfo = {} } = props;
 
   return (
     <div className={styles.title}>
@@ -133,28 +134,30 @@ function customTitleRender(props) {
           onChange={(v) => onChange({ ...data, moduleName: v })}
         />
       </div>
-      <div className={styles.titleItem}>
-        <label className={styles.titleItemLabel}>
-          <Balloon
-            trigger={
-              <div style={{ display: 'flex', alignItems: 'center' }}>
-                占列数 <Icon type="help" size="small" />
-              </div>
-            }
-            align="t"
-          >
-            <b>左右布局时，占列数之和应为24</b>
-          </Balloon>
-        </label>
-        <CnNumberPicker
-          size="small"
-          min={0}
-          max={24}
-          value={data?.cols}
-          onChange={(v) => onChange({ ...data, cols: v })}
-          placeholder="占列数 之和应为24"
-        />
-      </div>
+      {otherInfo?.columnsDirection === 'row' && (
+        <div className={styles.titleItem}>
+          <label className={styles.titleItemLabel}>
+            <Balloon
+              trigger={
+                <div style={{ display: 'flex', alignItems: 'center' }}>
+                  占列数 <Icon type="help" size="small" />
+                </div>
+              }
+              align="t"
+            >
+              <b>左右布局时，占列数之和应为24</b>
+            </Balloon>
+          </label>
+          <CnNumberPicker
+            size="small"
+            min={0}
+            max={24}
+            value={data?.cols}
+            onChange={(v) => onChange({ ...data, cols: v })}
+            placeholder="占列数 之和应为24"
+          />
+        </div>
+      )}
     </div>
   );
 }
@@ -169,30 +172,26 @@ function contentRender(props) {
 }
 
 const ContentRender = (props) => {
-  const { data, index, onChange } = props;
+  const { data, index, onChange, otherInfo = {} } = props;
   // const [_, forceUpdate] = React.useState({});
 
   return (
     <>
-      <Form.Item wrapperCol={{ span: 20 }} labelCol={{ span: 4 }} label="隐藏 当前栏 卡片" name="">
-        <CnSwitch
-          defaultChecked={data?.hideSelfCard}
-          onChange={(v) => onChange({ index, record: { ...data, hideSelfCard: v } })}
-        />
-      </Form.Item>
-      <Form.Item wrapperCol={{ span: 20 }} labelCol={{ span: 4 }} label="高度" name="">
-        <CnNumberPicker
-          min={0}
-          max={100}
-          innerAfter="%"
-          style={{ width: 90 }}
-          defaultValue={data?.height}
-          onChange={(v) => onChange({ index, record: { ...data, height: v } })}
-        />
-        <CnTooltip trigger={<Icon type="prompt" style={{ marginLeft: 6 }} />}>
-          仅在上下布局中生效：0-100 的整数，0 表示自动高度
-        </CnTooltip>
-      </Form.Item>
+      {otherInfo?.columnsDirection === 'column' && (
+        <Form.Item wrapperCol={{ span: 20 }} labelCol={{ span: 4 }} label="高度" name="">
+          <CnNumberPicker
+            min={0}
+            max={100}
+            innerAfter="%"
+            style={{ width: 90 }}
+            defaultValue={data?.height}
+            onChange={(v) => onChange({ index, record: { ...data, height: v } })}
+          />
+          <CnTooltip trigger={<Icon type="prompt" style={{ marginLeft: 6 }} />}>
+            仅在上下布局中生效：0-100 的整数，0 表示自动高度
+          </CnTooltip>
+        </Form.Item>
+      )}
       <Form.Item
         name=""
         wrapperCol={{ span: 20 }}
@@ -220,6 +219,12 @@ const ContentRender = (props) => {
           onChange={(v) => onChange({ index, record: { ...data, params: v } })}
         />
       </Form.Item>
+      <Form.Item wrapperCol={{ span: 20 }} labelCol={{ span: 4 }} label="隐藏 当前栏 卡片" name="">
+        <CnSwitch
+          defaultChecked={data?.hideSelfCard}
+          onChange={(v) => onChange({ index, record: { ...data, hideSelfCard: v } })}
+        />
+      </Form.Item>
       <Collapse accordion>
         <Panel
           title={