npm - sun-biz - Versions diffs - 0.0.2-beta.4 → 0.0.2-beta.6 - Mend

sun-biz 0.0.2-beta.4 → 0.0.2-beta.6

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.

Files changed (5) hide show

package/dist/components/form-design-render/utils.d.ts +12 -2
package/dist/components/index.d.ts +1 -1
package/dist/components/index.js +196 -84
package/dist/index.js +196 -84
package/package.json +1 -1

package/dist/components/form-design-render/utils.d.ts CHANGED Viewed

@@ -25,7 +25,14 @@ export declare const COMPONENT_MAP: {
  * @param result
  * @returns
  */
-export declare function expansionGroup(data: FormDesignDetailInfo[], result?: FormDesignDetailInfo[]): FormDesignDetailInfo[];
+export declare function expansionGroup(data: FormDesignDetailInfo[], result?: FormDesignDetailInfo[], hideData?: {
+    [key: string]: unknown;
+}): {
+    result: FormDesignDetailInfo[];
+    hideData: {
+        [key: string]: unknown;
+    };
+};
 /**
  * 获取组件类型
  * @param item
@@ -40,9 +47,12 @@ export declare function getExtraProps(item: FormDesignDetailInfo, dataValueNames
 }): {
     [key: string]: unknown;
 };
-export declare function useGetFromConfigData(result: FormDesignDetailInfo[], layoutTypeCode: number): {
+export declare function useGetFromConfigData(result: FormDesignDetailInfo[], layoutTypeCode: number, afterValueChange: ((key: string, value: unknown, model: unknown) => void) | undefined): {
     label: string | undefined;
     name: string;
+    onModelChange: <T = {
+        [key: string]: unknown;
+    }>(value: unknown, model: T) => void;
     component: string;
     placeholder: string;
     defaultValue: {};

package/dist/components/index.d.ts CHANGED Viewed

@@ -5,4 +5,4 @@ export { DictSelect, FlagSelect, HospitalSelect } from './biz-select/index.ts';
 export { CopyTextWithTooltip } from './copy-text-with-tooltip/index.ts';
 export { FormDesignRender } from './form-design-render/index.ts';
 export { ProDialog } from './pro-dialog/index.ts';
-export { ProForm } from './pro-form/index.ts';
+export { ProForm, FormUnit } from './pro-form/index.ts';

package/dist/components/index.js CHANGED Viewed

@@ -261,7 +261,7 @@ function useTableConfigColumn(changeInputSort, length) {
             prop: 'displayFlag',
             minWidth: 170,
             editable: true,
-            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-checkbox', {
+            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElCheckbox, {
                     class: 'w-full justify-center',
                     'true-label': 1,
                     'false-label': 0,
@@ -274,7 +274,7 @@ function useTableConfigColumn(changeInputSort, length) {
             label: '列宽 (最小值)',
             prop: 'minWidth',
             minWidth: 170,
-            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-input-number', {
+            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElInputNumber, {
                     maxLength: 16,
                     'controls-position': 'right',
                     modelValue: row.minWidth,
@@ -287,7 +287,7 @@ function useTableConfigColumn(changeInputSort, length) {
             label: '排序',
             prop: 'sort',
             minWidth: 170,
-            render: (row, index)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-input-number', {
+            render: (row, index)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElInputNumber, {
                     max: length,
                     min: 0,
                     'controls-position': 'right',
@@ -641,7 +641,7 @@ const _hoisted_3 = {
                     sort: index + 1,
                     columnClass: 'truncate',
                     render: (row, index)=>{
-                        if (item.render) return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-button', {
+                        if (item.render) return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton, {
                             type: 'text',
                             class: 'pointer-events-none h-5',
                             disabled: true
@@ -953,7 +953,7 @@ const _hoisted_3 = {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-6b73f6ca"
+        "data-v-5ff76b6b"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1058,7 +1058,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: void 0
         },
         componentNo: {
-            default: ''
+            default: ""
         },
         fetchData: {
             type: Function,
@@ -1073,7 +1073,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: false
         },
         rowKey: {
-            default: 'id'
+            default: "id"
         },
         loading: {
             type: Boolean,
@@ -1114,11 +1114,11 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         const serveColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const columnTypes = [
-            'selection',
-            'radio',
-            'index',
-            'expand',
-            'sort'
+            "selection",
+            "radio",
+            "index",
+            "expand",
+            "sort"
         ];
         const dbgridComponentSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1126,23 +1126,75 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         const uuid = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)((0, __WEBPACK_EXTERNAL_MODULE_vue__.useId)());
         // 定义 emit 事件
         const emit = __emit;
+        const attrs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs)();
+        /**
+ *获取参与排序的列表 索引 是否可以拖拽
+ */ function getDragSortData(newIndex, data, startIndexObj, sortData) {
+            data.forEach((item, index)=>{
+                startIndexObj.startIndex += 1;
+                if (startIndexObj.startIndex > newIndex) return;
+                if (startIndexObj.startIndex === newIndex) {
+                    sortData.curIndex = index;
+                    sortData.curData = item;
+                    sortData.result = data;
+                }
+                if (item?.[attrs?.["tree-props"]?.children]) getDragSortData(newIndex, item?.[attrs?.["tree-props"]?.children], startIndexObj, sortData);
+            });
+            return sortData;
+        }
+        /**
+ * 获取拖拽排序数据结果
+ */ function getSortableResult(newIndex, oldIndex) {
+            let data = [
+                ...state.tableData
+            ];
+            if (attrs?.["tree-props"]) {
+                let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
+                    startIndex: -1
+                }, {
+                    result: [],
+                    curIndex: 0,
+                    curData: {}
+                });
+                let { curIndex: oldCurIndex, curData: oldCurData } = getDragSortData(oldIndex, data, {
+                    startIndex: -1
+                }, {
+                    result: [],
+                    curIndex: 0,
+                    curData: {}
+                });
+                if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning("暂不支持跨层级拖拽配置");
+                    return [];
+                }
+                const [removedItem] = result.splice(oldCurIndex, 1);
+                result.splice(newCurIndex, 0, removedItem);
+                data = result;
+            } else {
+                const [removedItem] = data.splice(oldIndex, 1);
+                data.splice(newIndex, 0, removedItem);
+            }
+            return data;
+        }
         /***
  * 表格拖拽排序
  **/ const initDragSort = ()=>{
             const tbody = document.querySelector(`#${uuid.value} tbody`);
+            let initialHTML = ""; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
-                handle: '.cursor-move',
+                handle: ".cursor-move",
                 animation: 300,
                 onEnd (evt) {
                     const { newIndex, oldIndex } = evt;
                     if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return;
                     //获取拖动后的排序
-                    const data = [
-                        ...state.tableData
-                    ];
-                    const [removedItem] = data.splice(oldIndex, 1);
-                    data.splice(newIndex, 0, removedItem);
-                    emit('drag-end', data);
+                    let data = getSortableResult(newIndex, oldIndex);
+                    if (data.length) emit("drag-end", data);
+                    else evt.from.innerHTML = initialHTML;
+                },
+                onStart (evt) {
+                    // 在拖拽开始时，记录当前容器的 HTML
+                    initialHTML = evt.from.innerHTML;
                 }
             });
         };
@@ -1152,7 +1204,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         async function fetchDbgridComponent() {
             let [, result] = await queryDbgridComponentByExample({
-                componentNo: props.componentNo || ''
+                componentNo: props.componentNo || ""
             });
             if (result?.success) try {
                 let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
@@ -1185,7 +1237,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
-            } else emit('size-page-change', val);
+            } else emit("size-page-change", val);
         };
         /**
  * 分页组件改变 当前页数 事件
@@ -1193,7 +1245,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
-            } else emit('current-page-change', val);
+            } else emit("current-page-change", val);
         }
         // 超级表格 ref
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1210,7 +1262,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (Object.keys(props.filterObj).length) return [
                 ...state.tableData
             ].filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
-                        '',
+                        "",
                         void 0,
                         null
                     ].includes(props.filterObj[cur]) || item[cur] === props.filterObj[cur]));
@@ -2175,13 +2227,18 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
         const emit = __emit;
         const loading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(true);
         const props = __props;
-        const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([
-            {
-                value: props.defaultValue,
-                label: props.defaultValueName
-            }
-        ]);
-        let inputChange = debounce(fetchData, 800);
+        const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.defaultValue, ()=>{
+            if (props.defaultValue && props.defaultValueName) tableData.value = [
+                {
+                    value: props.defaultValue,
+                    label: props.defaultValueName
+                }
+            ];
+        }, {
+            immediate: true
+        });
+        let inputChange = debounce(fetchData, 500);
         async function fetchData(value) {
             loading.value = true;
             let [, result] = await queryDictDataListByExample({
@@ -2201,9 +2258,9 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
             }
         }
         /**
-   *
-   * @param value 下拉框选择
-   */ function change(value) {
+ *
+ * @param value 下拉框选择
+ */ function change(value) {
             let name = (tableData.value.find((item)=>item.value === value) || {})['label'];
             emit('change', value, name);
         }
@@ -2215,10 +2272,12 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
                 loading: loading.value && !tableData.value.length,
                 disabled: props.disabled,
                 remote: true,
+                "remote-show-suffix": "",
                 filterable: true,
                 onChange: change,
                 "remote-method": (value)=>{
-                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(inputChange)(value);
+                    if (value) (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(inputChange)(value);
+                    else fetchData(value);
                 }
             }, {
                 default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
@@ -2244,7 +2303,7 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
 const dict_select_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dict_selectvue_type_script_setup_true_lang_ts, [
     [
         '__scopeId',
-        "data-v-54541b2c"
+        "data-v-7d3f5f96"
     ]
 ]);
 /* ESM default export */ const dict_select = dict_select_exports_;
@@ -2935,20 +2994,25 @@ const COMMA = ',';
  * @param data
  * @param result
  * @returns
- */ function expansionGroup(data, result = []) {
-    data = data.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES);
+ */ function expansionGroup(data, result = [], hideData = {} //部分数据页面不展示 但是接口还需要传递配置的默认值
+) {
     data.forEach((item)=>{
-        const isGroup = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.GROUP;
-        const isSet = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.SET;
-        if (isGroup || isSet) {
-            item.subFormControlList = item.subFormControlList?.map((cur)=>({
-                    ...cur,
-                    bindingFieldNo: cur.bindingFieldNo.startsWith(GROUP) || cur.bindingFieldNo.startsWith(SET) ? cur.bindingFieldNo : `${isGroup ? GROUP : SET}${SEPARATOR}${item.bindingFieldNo}${SEPARATOR}${cur.bindingFieldNo}`
-                }));
-            expansionGroup(item.subFormControlList || [], result);
-        } else result.push(item);
+        if (item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES) {
+            const isGroup = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.GROUP;
+            const isSet = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.SET;
+            if (isGroup || isSet) {
+                item.subFormControlList = item.subFormControlList?.map((cur)=>({
+                        ...cur,
+                        bindingFieldNo: cur.bindingFieldNo.startsWith(GROUP) || cur.bindingFieldNo.startsWith(SET) ? cur.bindingFieldNo : `${isGroup ? GROUP : SET}${SEPARATOR}${item.bindingFieldNo}${SEPARATOR}${cur.bindingFieldNo}`
+                    }));
+                expansionGroup(item.subFormControlList || [], result, hideData);
+            } else result.push(item);
+        } else if (item.defaultValue) hideData[item.bindingFieldNo] = item.defaultValue;
     });
-    return result;
+    return {
+        result,
+        hideData
+    };
 }
 /**
  * 获取组件类型
@@ -3014,10 +3078,13 @@ function getExtraProps(item, dataValueNames, modelValue) {
     };
     return resultObj;
 }
-function useGetFromConfigData(result, layoutTypeCode) {
+function useGetFromConfigData(result, layoutTypeCode, afterValueChange) {
     return result.map((item)=>({
             label: item.labelNameDisplay || item.labelName,
             name: item.bindingFieldNo,
+            onModelChange: (value, model)=>{
+                if (afterValueChange) afterValueChange(item.bindingFieldNo, value, model); // 调用函数并传递参数
+            },
             component: getComponentType(item),
             placeholder: getPlaceholder(item),
             defaultValue: item.defaultValue || '',
@@ -3106,14 +3173,16 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
         function handleClick() {
             show.value = !show.value;
         } /**
- * 获取初始化的数据
- */
-        const initList = expansionGroup(props.designDetailInfo.subFormControlList || [], []); /**
- * 初次渲染
- */
-        const initData = useGetFromConfigData(initList, props.layoutTypeCode); /**
- * 数据更新后获取对应的name
- */
+   * 获取初始化的数据
+   */
+        const { result: initList, hideData } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled'); /**
+   * 初次渲染
+   */
+        const initData = useGetFromConfigData(initList, props.layoutTypeCode, afterValueChange); /**
+   * 数据更新后获取对应的name
+   */
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item, index)=>({
                     ...item,
                     extraProps: getExtraProps(initList[index] || {}, props.dataValueNames, modelValue.value)
@@ -3121,7 +3190,10 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
         __expose({
             submit: async ()=>{
                 let result = await formRef.value?.ref.validate();
-                if (result) return integrateData(modelValue.value);
+                if (result) return integrateData({
+                    ...modelValue.value,
+                    ...hideData
+                });
             },
             setModelValue: (val)=>{
                 modelValue.value = val;
@@ -3177,12 +3249,14 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                     key: 0,
                     ref_key: "formRef",
                     ref: formRef,
+                    disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                     modelValue: modelValue.value,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
                     class: "ml-4 mr-4 mt-4",
                     column: props.layoutTypeCode,
                     data: formData.value
                 }, null, 8, [
+                    "disabled",
                     "modelValue",
                     "column",
                     "data"
@@ -3194,7 +3268,7 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const Collapse_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Collapsevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-46a48028"
+        "data-v-89d161d4"
     ]
 ]);
 /* ESM default export */ const Collapse = Collapse_exports_;
@@ -3209,10 +3283,13 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
     },
     setup (__props, { expose: __expose }) {
         const props = __props;
+        const hideData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); //页面不展示 但是具有默认值  需传递给接口
         const tableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const settingList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
         function useGetTableColumnData() {
-            let result = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            let { result, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            hideData.value = hideObj;
             return result.map((item)=>({
                     label: item.labelNameDisplay || item.labelName,
                     prop: item.bindingFieldNo,
@@ -3230,6 +3307,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                         }
                     ],
                     render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
+                            disabled: disabled,
                             component: getComponentType(item),
                             label: item.labelNameDisplay || item.labelName,
                             placeholder: getPlaceholder(item),
@@ -3255,7 +3333,10 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
             submit: async ()=>{
                 let result = await tableRef?.value?.formRef?.validateField();
                 if (result) return {
-                    [props.designDetailInfo.bindingFieldNo]: settingList.value.map(({ editable, ...item })=>integrateData(item))
+                    [props.designDetailInfo.bindingFieldNo]: settingList.value.map(({ editable, ...item })=>integrateData({
+                            ...hideData.value,
+                            ...item
+                        }))
                 };
             },
             setModelValue: (val)=>{
@@ -3287,7 +3368,8 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                     "columns",
                     "data"
                 ]),
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_button, {
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled) ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
+                    key: 0,
                     class: "w-full border-t-0",
                     onClick: onAddItem
                 }, {
@@ -3300,7 +3382,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                             })
                         ]),
                     _: 1
-                })
+                }))
             ]);
         };
     }
@@ -3308,7 +3390,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-737d0299"
+        "data-v-4437dec2"
     ]
 ]);
 /* ESM default export */ const Table = Table_exports_;
@@ -3338,10 +3420,12 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
         const modelValue = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); /**
  * 获取初始化的数据
  */
-        const initList = expansionGroup(props.designDetailInfo.subFormControlList || [], []); /**
+        const { hideData, result: initList } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled'); /**
  * 初次渲染
  */
-        const initData = useGetFromConfigData(initList, props.layoutTypeCode); /**
+        const initData = useGetFromConfigData(initList, props.layoutTypeCode, afterValueChange); /**
  * 数据更新后获取对应的name
  */
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item, index)=>({
@@ -3352,7 +3436,10 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
             submit: async ()=>{
                 let result = await formRef.value?.ref.validate();
                 if (result) return {
-                    [props.designDetailInfo.bindingFieldNo]: integrateData(modelValue.value),
+                    [props.designDetailInfo.bindingFieldNo]: integrateData({
+                        ...hideData,
+                        ...modelValue.value
+                    }),
                     bindingFieldNo: props.designDetailInfo.bindingFieldNo,
                     isSet: true
                 };
@@ -3369,12 +3456,14 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
                     ref_key: "formRef",
                     ref: formRef,
+                    disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                     modelValue: modelValue.value,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
                     class: "ml-4 mr-4",
                     column: props.layoutTypeCode,
                     data: formData.value
                 }, null, 8, [
+                    "disabled",
                     "modelValue",
                     "column",
                     "data"
@@ -3385,7 +3474,7 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
 const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_script_setup_true_lang_tsx_name_Set, [
     [
         '__scopeId',
-        "data-v-3db350f4"
+        "data-v-8c594a84"
     ]
 ]);
 /* ESM default export */ const Set = Set_exports_;
@@ -3399,14 +3488,16 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
     setup (__props, { expose: __expose }) {
         const props = __props;
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        const modelValue = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); /**
- * 初次渲染
- */
+        const modelValue = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({});
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange'); /**
+   * 初次渲染
+   */
         const initData = useGetFromConfigData([
             props.designDetailInfo
-        ], props.layoutTypeCode); /**
- * 数据更新后获取对应的name
- */
+        ], props.layoutTypeCode, afterValueChange); /**
+   * 数据更新后获取对应的name
+   */
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item)=>({
                     ...item,
                     extraProps: getExtraProps(props.designDetailInfo, props.dataValueNames, modelValue.value)
@@ -3428,13 +3519,16 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
         return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
                 ref_key: "formRef",
                 ref: formRef,
+                disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                 modelValue: modelValue.value,
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
                 class: "ml-4 mr-4",
-                column: 1,
+                column: props.layoutTypeCode,
                 data: formData.value
             }, null, 8, [
+                "disabled",
                 "modelValue",
+                "column",
                 "data"
             ]));
     }
@@ -3442,7 +3536,7 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
 const Other_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Othervue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-065dcd30"
+        "data-v-87036b8a"
     ]
 ]);
 /* ESM default export */ const Other = Other_exports_;
@@ -3524,9 +3618,17 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             type: Boolean,
             default: true
         },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
         afterChildSearch: {
             type: Function,
             default: ()=>{}
+        },
+        afterValueChange: {
+            type: Function,
+            default: ()=>{}
         }
     },
     emits: [
@@ -3540,6 +3642,7 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
         const submitLoading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
         const scrollbarRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const layoutTypeCode = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(4);
+        const hideData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); //页面不展示 但是具有默认值  需传递给接口
         const emit = __emit;
         const configList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]); // 定义 dynamicRef 的类型
         const refs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({});
@@ -3550,7 +3653,10 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             });
             loading.value = false;
             if (result?.success) {
-                configList.value = result.data?.formDesignDetailList.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES || item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.COLLAPSE);
+                configList.value = result.data?.formDesignDetailList.filter((item)=>{
+                    if (item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO && item.defaultValue) hideData.value[item.bindingFieldNo] = item.defaultValue;
+                    return item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES || item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.COLLAPSE;
+                });
                 layoutTypeCode.value = Number(result.data?.layoutTypeCode);
             }
         } // 修复 ref 赋值问题
@@ -3567,11 +3673,15 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             let [, result] = await queryDataValueNameByKeys(params);
             if (result?.success) dataValueNames.value = result.data || {};
         }
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('disabled', props.disabled);
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('afterValueChange', (name, value, model)=>{
+            if (props.afterValueChange) props.afterValueChange(name, value, model);
+        });
         function setValue(data, loading) {
             let queryList = [];
             configList.value.forEach((item)=>{
                 if (loading) return;
-                const list = expansionGroup(item?.subFormControlList || [], []);
+                const { result: list } = expansionGroup(item?.subFormControlList || [], []);
                 let result = {};
                 let otherDefaultValue = void 0 === getDefaultValue(data, item.bindingFieldNo) ? item.defaultValue : getDefaultValue(data, item.bindingFieldNo);
                 switch(item.controlTypeCode){
@@ -3618,14 +3728,14 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
                     if (!Object.keys(data).length) refs.value[`${FIELD_REF}${item.formCtlNo}`]?.dynamicRef?.resetFields();
                 });
             }); /**
-     * 查询key value 对应的中文
-     */
+   * 查询key value 对应的中文
+   */
             if (queryList.length) fetchDataValueNameByKeys({
                 queryDataValueNameByKeys: queryList
             });
         } /**
-   * props.data 监听变化，获取dataValueName
-   */
+ * props.data 监听变化，获取dataValueName
+ */
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)([
             ()=>props.data,
             loading
@@ -3654,7 +3764,9 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
                         ...acc,
                         ...other
                     };
-                }, {});
+                }, {
+                    ...hideData.value
+                });
                 return [
                     null,
                     params
@@ -3754,9 +3866,9 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
 const form_design_render_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(form_design_rendervue_type_script_setup_true_lang_tsx_name_FormDesignRender, [
     [
         '__scopeId',
-        "data-v-0a99cc9e"
+        "data-v-0281f06a"
     ]
 ]);
 /* ESM default export */ const form_design_render = form_design_render_exports_;
 var __webpack_exports__COMPONENT_CODE = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.COMPONENT_CODE;
-export { copy_text_with_tooltip as CopyTextWithTooltip, dbgrid_component_setting as DbgridComponentSetting, dict_select as DictSelect, flag_select as FlagSelect, form_design_render as FormDesignRender, hospital_select as HospitalSelect, patient_access as PatientAccess, PatientInfo, pro_dialog as ProDialog, pro_form as ProForm, pro_table as ProTable, Title, __webpack_exports__COMPONENT_CODE as COMPONENT_CODE };
+export { copy_text_with_tooltip as CopyTextWithTooltip, dbgrid_component_setting as DbgridComponentSetting, dict_select as DictSelect, flag_select as FlagSelect, form_design_render as FormDesignRender, FormUnit, hospital_select as HospitalSelect, patient_access as PatientAccess, PatientInfo, pro_dialog as ProDialog, pro_form as ProForm, pro_table as ProTable, Title, __webpack_exports__COMPONENT_CODE as COMPONENT_CODE };

package/dist/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
-import * as __WEBPACK_EXTERNAL_MODULE_sortablejs__ from "sortablejs";
 import * as __WEBPACK_EXTERNAL_MODULE_element_sun__ from "element-sun";
+import * as __WEBPACK_EXTERNAL_MODULE_sortablejs__ from "sortablejs";
 import * as __WEBPACK_EXTERNAL_MODULE__element_sun_icons_vue__ from "@element-sun/icons-vue";
 import * as __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__ from "@sun-toolkit/enums";
 import * as __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__ from "@sun-toolkit/request";
@@ -229,7 +229,7 @@ function useTableConfigColumn(changeInputSort, length) {
             prop: 'displayFlag',
             minWidth: 170,
             editable: true,
-            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-checkbox', {
+            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElCheckbox, {
                     class: 'w-full justify-center',
                     'true-label': 1,
                     'false-label': 0,
@@ -242,7 +242,7 @@ function useTableConfigColumn(changeInputSort, length) {
             label: '列宽 (最小值)',
             prop: 'minWidth',
             minWidth: 170,
-            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-input-number', {
+            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElInputNumber, {
                     maxLength: 16,
                     'controls-position': 'right',
                     modelValue: row.minWidth,
@@ -255,7 +255,7 @@ function useTableConfigColumn(changeInputSort, length) {
             label: '排序',
             prop: 'sort',
             minWidth: 170,
-            render: (row, index)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-input-number', {
+            render: (row, index)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElInputNumber, {
                     max: length,
                     min: 0,
                     'controls-position': 'right',
@@ -610,7 +610,7 @@ const _hoisted_3 = {
                     sort: index + 1,
                     columnClass: 'truncate',
                     render: (row, index)=>{
-                        if (item.render) return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)('el-button', {
+                        if (item.render) return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton, {
                             type: 'text',
                             class: 'pointer-events-none h-5',
                             disabled: true
@@ -922,7 +922,7 @@ const _hoisted_3 = {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-6b73f6ca"
+        "data-v-5ff76b6b"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1027,7 +1027,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: void 0
         },
         componentNo: {
-            default: ''
+            default: ""
         },
         fetchData: {
             type: Function,
@@ -1042,7 +1042,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: false
         },
         rowKey: {
-            default: 'id'
+            default: "id"
         },
         loading: {
             type: Boolean,
@@ -1083,11 +1083,11 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         const serveColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const columnTypes = [
-            'selection',
-            'radio',
-            'index',
-            'expand',
-            'sort'
+            "selection",
+            "radio",
+            "index",
+            "expand",
+            "sort"
         ];
         const dbgridComponentSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1095,23 +1095,75 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         const uuid = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)((0, __WEBPACK_EXTERNAL_MODULE_vue__.useId)());
         // 定义 emit 事件
         const emit = __emit;
+        const attrs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs)();
+        /**
+ *获取参与排序的列表 索引 是否可以拖拽
+ */ function getDragSortData(newIndex, data, startIndexObj, sortData) {
+            data.forEach((item, index)=>{
+                startIndexObj.startIndex += 1;
+                if (startIndexObj.startIndex > newIndex) return;
+                if (startIndexObj.startIndex === newIndex) {
+                    sortData.curIndex = index;
+                    sortData.curData = item;
+                    sortData.result = data;
+                }
+                if (item?.[attrs?.["tree-props"]?.children]) getDragSortData(newIndex, item?.[attrs?.["tree-props"]?.children], startIndexObj, sortData);
+            });
+            return sortData;
+        }
+        /**
+ * 获取拖拽排序数据结果
+ */ function getSortableResult(newIndex, oldIndex) {
+            let data = [
+                ...state.tableData
+            ];
+            if (attrs?.["tree-props"]) {
+                let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
+                    startIndex: -1
+                }, {
+                    result: [],
+                    curIndex: 0,
+                    curData: {}
+                });
+                let { curIndex: oldCurIndex, curData: oldCurData } = getDragSortData(oldIndex, data, {
+                    startIndex: -1
+                }, {
+                    result: [],
+                    curIndex: 0,
+                    curData: {}
+                });
+                if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning("暂不支持跨层级拖拽配置");
+                    return [];
+                }
+                const [removedItem] = result.splice(oldCurIndex, 1);
+                result.splice(newCurIndex, 0, removedItem);
+                data = result;
+            } else {
+                const [removedItem] = data.splice(oldIndex, 1);
+                data.splice(newIndex, 0, removedItem);
+            }
+            return data;
+        }
         /***
  * 表格拖拽排序
  **/ const initDragSort = ()=>{
             const tbody = document.querySelector(`#${uuid.value} tbody`);
+            let initialHTML = ""; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
-                handle: '.cursor-move',
+                handle: ".cursor-move",
                 animation: 300,
                 onEnd (evt) {
                     const { newIndex, oldIndex } = evt;
                     if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return;
                     //获取拖动后的排序
-                    const data = [
-                        ...state.tableData
-                    ];
-                    const [removedItem] = data.splice(oldIndex, 1);
-                    data.splice(newIndex, 0, removedItem);
-                    emit('drag-end', data);
+                    let data = getSortableResult(newIndex, oldIndex);
+                    if (data.length) emit("drag-end", data);
+                    else evt.from.innerHTML = initialHTML;
+                },
+                onStart (evt) {
+                    // 在拖拽开始时，记录当前容器的 HTML
+                    initialHTML = evt.from.innerHTML;
                 }
             });
         };
@@ -1121,7 +1173,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         async function fetchDbgridComponent() {
             let [, result] = await queryDbgridComponentByExample({
-                componentNo: props.componentNo || ''
+                componentNo: props.componentNo || ""
             });
             if (result?.success) try {
                 let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
@@ -1154,7 +1206,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
-            } else emit('size-page-change', val);
+            } else emit("size-page-change", val);
         };
         /**
  * 分页组件改变 当前页数 事件
@@ -1162,7 +1214,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
-            } else emit('current-page-change', val);
+            } else emit("current-page-change", val);
         }
         // 超级表格 ref
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1179,7 +1231,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (Object.keys(props.filterObj).length) return [
                 ...state.tableData
             ].filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
-                        '',
+                        "",
                         void 0,
                         null
                     ].includes(props.filterObj[cur]) || item[cur] === props.filterObj[cur]));
@@ -2480,13 +2532,18 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
         const emit = __emit;
         const loading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(true);
         const props = __props;
-        const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([
-            {
-                value: props.defaultValue,
-                label: props.defaultValueName
-            }
-        ]);
-        let inputChange = debounce(fetchData, 800);
+        const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.defaultValue, ()=>{
+            if (props.defaultValue && props.defaultValueName) tableData.value = [
+                {
+                    value: props.defaultValue,
+                    label: props.defaultValueName
+                }
+            ];
+        }, {
+            immediate: true
+        });
+        let inputChange = debounce(fetchData, 500);
         async function fetchData(value) {
             loading.value = true;
             let [, result] = await queryDictDataListByExample({
@@ -2506,9 +2563,9 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
             }
         }
         /**
-   *
-   * @param value 下拉框选择
-   */ function change(value) {
+ *
+ * @param value 下拉框选择
+ */ function change(value) {
             let name = (tableData.value.find((item)=>item.value === value) || {})['label'];
             emit('change', value, name);
         }
@@ -2520,10 +2577,12 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
                 loading: loading.value && !tableData.value.length,
                 disabled: props.disabled,
                 remote: true,
+                "remote-show-suffix": "",
                 filterable: true,
                 onChange: change,
                 "remote-method": (value)=>{
-                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(inputChange)(value);
+                    if (value) (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(inputChange)(value);
+                    else fetchData(value);
                 }
             }, {
                 default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
@@ -2549,7 +2608,7 @@ const PatientInfo_exports_ = PatientInfovue_type_script_setup_true_lang_ts;
 const dict_select_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dict_selectvue_type_script_setup_true_lang_ts, [
     [
         '__scopeId',
-        "data-v-54541b2c"
+        "data-v-7d3f5f96"
     ]
 ]);
 /* ESM default export */ const dict_select = dict_select_exports_;
@@ -3240,20 +3299,25 @@ const COMMA = ',';
  * @param data
  * @param result
  * @returns
- */ function expansionGroup(data, result = []) {
-    data = data.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES);
+ */ function expansionGroup(data, result = [], hideData = {} //部分数据页面不展示 但是接口还需要传递配置的默认值
+) {
     data.forEach((item)=>{
-        const isGroup = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.GROUP;
-        const isSet = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.SET;
-        if (isGroup || isSet) {
-            item.subFormControlList = item.subFormControlList?.map((cur)=>({
-                    ...cur,
-                    bindingFieldNo: cur.bindingFieldNo.startsWith(GROUP) || cur.bindingFieldNo.startsWith(SET) ? cur.bindingFieldNo : `${isGroup ? GROUP : SET}${SEPARATOR}${item.bindingFieldNo}${SEPARATOR}${cur.bindingFieldNo}`
-                }));
-            expansionGroup(item.subFormControlList || [], result);
-        } else result.push(item);
+        if (item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES) {
+            const isGroup = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.GROUP;
+            const isSet = item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.SET;
+            if (isGroup || isSet) {
+                item.subFormControlList = item.subFormControlList?.map((cur)=>({
+                        ...cur,
+                        bindingFieldNo: cur.bindingFieldNo.startsWith(GROUP) || cur.bindingFieldNo.startsWith(SET) ? cur.bindingFieldNo : `${isGroup ? GROUP : SET}${SEPARATOR}${item.bindingFieldNo}${SEPARATOR}${cur.bindingFieldNo}`
+                    }));
+                expansionGroup(item.subFormControlList || [], result, hideData);
+            } else result.push(item);
+        } else if (item.defaultValue) hideData[item.bindingFieldNo] = item.defaultValue;
     });
-    return result;
+    return {
+        result,
+        hideData
+    };
 }
 /**
  * 获取组件类型
@@ -3319,10 +3383,13 @@ function getExtraProps(item, dataValueNames, modelValue) {
     };
     return resultObj;
 }
-function useGetFromConfigData(result, layoutTypeCode) {
+function useGetFromConfigData(result, layoutTypeCode, afterValueChange) {
     return result.map((item)=>({
             label: item.labelNameDisplay || item.labelName,
             name: item.bindingFieldNo,
+            onModelChange: (value, model)=>{
+                if (afterValueChange) afterValueChange(item.bindingFieldNo, value, model); // 调用函数并传递参数
+            },
             component: getComponentType(item),
             placeholder: getPlaceholder(item),
             defaultValue: item.defaultValue || '',
@@ -3411,14 +3478,16 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
         function handleClick() {
             show.value = !show.value;
         } /**
- * 获取初始化的数据
- */
-        const initList = expansionGroup(props.designDetailInfo.subFormControlList || [], []); /**
- * 初次渲染
- */
-        const initData = useGetFromConfigData(initList, props.layoutTypeCode); /**
- * 数据更新后获取对应的name
- */
+   * 获取初始化的数据
+   */
+        const { result: initList, hideData } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled'); /**
+   * 初次渲染
+   */
+        const initData = useGetFromConfigData(initList, props.layoutTypeCode, afterValueChange); /**
+   * 数据更新后获取对应的name
+   */
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item, index)=>({
                     ...item,
                     extraProps: getExtraProps(initList[index] || {}, props.dataValueNames, modelValue.value)
@@ -3426,7 +3495,10 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
         __expose({
             submit: async ()=>{
                 let result = await formRef.value?.ref.validate();
-                if (result) return integrateData(modelValue.value);
+                if (result) return integrateData({
+                    ...modelValue.value,
+                    ...hideData
+                });
             },
             setModelValue: (val)=>{
                 modelValue.value = val;
@@ -3482,12 +3554,14 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                     key: 0,
                     ref_key: "formRef",
                     ref: formRef,
+                    disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                     modelValue: modelValue.value,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
                     class: "ml-4 mr-4 mt-4",
                     column: props.layoutTypeCode,
                     data: formData.value
                 }, null, 8, [
+                    "disabled",
                     "modelValue",
                     "column",
                     "data"
@@ -3499,7 +3573,7 @@ const Collapsevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const Collapse_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Collapsevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-46a48028"
+        "data-v-89d161d4"
     ]
 ]);
 /* ESM default export */ const Collapse = Collapse_exports_;
@@ -3514,10 +3588,13 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
     },
     setup (__props, { expose: __expose }) {
         const props = __props;
+        const hideData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); //页面不展示 但是具有默认值  需传递给接口
         const tableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const settingList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
         function useGetTableColumnData() {
-            let result = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            let { result, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            hideData.value = hideObj;
             return result.map((item)=>({
                     label: item.labelNameDisplay || item.labelName,
                     prop: item.bindingFieldNo,
@@ -3535,6 +3612,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                         }
                     ],
                     render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
+                            disabled: disabled,
                             component: getComponentType(item),
                             label: item.labelNameDisplay || item.labelName,
                             placeholder: getPlaceholder(item),
@@ -3560,7 +3638,10 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
             submit: async ()=>{
                 let result = await tableRef?.value?.formRef?.validateField();
                 if (result) return {
-                    [props.designDetailInfo.bindingFieldNo]: settingList.value.map(({ editable, ...item })=>integrateData(item))
+                    [props.designDetailInfo.bindingFieldNo]: settingList.value.map(({ editable, ...item })=>integrateData({
+                            ...hideData.value,
+                            ...item
+                        }))
                 };
             },
             setModelValue: (val)=>{
@@ -3592,7 +3673,8 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                     "columns",
                     "data"
                 ]),
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_button, {
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled) ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
+                    key: 0,
                     class: "w-full border-t-0",
                     onClick: onAddItem
                 }, {
@@ -3605,7 +3687,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                             })
                         ]),
                     _: 1
-                })
+                }))
             ]);
         };
     }
@@ -3613,7 +3695,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-737d0299"
+        "data-v-4437dec2"
     ]
 ]);
 /* ESM default export */ const Table = Table_exports_;
@@ -3643,10 +3725,12 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
         const modelValue = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); /**
  * 获取初始化的数据
  */
-        const initList = expansionGroup(props.designDetailInfo.subFormControlList || [], []); /**
+        const { hideData, result: initList } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled'); /**
  * 初次渲染
  */
-        const initData = useGetFromConfigData(initList, props.layoutTypeCode); /**
+        const initData = useGetFromConfigData(initList, props.layoutTypeCode, afterValueChange); /**
  * 数据更新后获取对应的name
  */
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item, index)=>({
@@ -3657,7 +3741,10 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
             submit: async ()=>{
                 let result = await formRef.value?.ref.validate();
                 if (result) return {
-                    [props.designDetailInfo.bindingFieldNo]: integrateData(modelValue.value),
+                    [props.designDetailInfo.bindingFieldNo]: integrateData({
+                        ...hideData,
+                        ...modelValue.value
+                    }),
                     bindingFieldNo: props.designDetailInfo.bindingFieldNo,
                     isSet: true
                 };
@@ -3674,12 +3761,14 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
                     ref_key: "formRef",
                     ref: formRef,
+                    disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                     modelValue: modelValue.value,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
                     class: "ml-4 mr-4",
                     column: props.layoutTypeCode,
                     data: formData.value
                 }, null, 8, [
+                    "disabled",
                     "modelValue",
                     "column",
                     "data"
@@ -3690,7 +3779,7 @@ const Setvue_type_script_setup_true_lang_tsx_name_Set_hoisted_2 = {
 const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_script_setup_true_lang_tsx_name_Set, [
     [
         '__scopeId',
-        "data-v-3db350f4"
+        "data-v-8c594a84"
     ]
 ]);
 /* ESM default export */ const Set = Set_exports_;
@@ -3704,14 +3793,16 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
     setup (__props, { expose: __expose }) {
         const props = __props;
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        const modelValue = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); /**
- * 初次渲染
- */
+        const modelValue = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({});
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange'); /**
+   * 初次渲染
+   */
         const initData = useGetFromConfigData([
             props.designDetailInfo
-        ], props.layoutTypeCode); /**
- * 数据更新后获取对应的name
- */
+        ], props.layoutTypeCode, afterValueChange); /**
+   * 数据更新后获取对应的name
+   */
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item)=>({
                     ...item,
                     extraProps: getExtraProps(props.designDetailInfo, props.dataValueNames, modelValue.value)
@@ -3733,13 +3824,16 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
         return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
                 ref_key: "formRef",
                 ref: formRef,
+                disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                 modelValue: modelValue.value,
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
                 class: "ml-4 mr-4",
-                column: 1,
+                column: props.layoutTypeCode,
                 data: formData.value
             }, null, 8, [
+                "disabled",
                 "modelValue",
+                "column",
                 "data"
             ]));
     }
@@ -3747,7 +3841,7 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
 const Other_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Othervue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-065dcd30"
+        "data-v-87036b8a"
     ]
 ]);
 /* ESM default export */ const Other = Other_exports_;
@@ -3829,9 +3923,17 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             type: Boolean,
             default: true
         },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
         afterChildSearch: {
             type: Function,
             default: ()=>{}
+        },
+        afterValueChange: {
+            type: Function,
+            default: ()=>{}
         }
     },
     emits: [
@@ -3845,6 +3947,7 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
         const submitLoading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
         const scrollbarRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const layoutTypeCode = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(4);
+        const hideData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({}); //页面不展示 但是具有默认值  需传递给接口
         const emit = __emit;
         const configList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]); // 定义 dynamicRef 的类型
         const refs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({});
@@ -3855,7 +3958,10 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             });
             loading.value = false;
             if (result?.success) {
-                configList.value = result.data?.formDesignDetailList.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES || item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.COLLAPSE);
+                configList.value = result.data?.formDesignDetailList.filter((item)=>{
+                    if (item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO && item.defaultValue) hideData.value[item.bindingFieldNo] = item.defaultValue;
+                    return item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES || item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.COLLAPSE;
+                });
                 layoutTypeCode.value = Number(result.data?.layoutTypeCode);
             }
         } // 修复 ref 赋值问题
@@ -3872,11 +3978,15 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             let [, result] = await queryDataValueNameByKeys(params);
             if (result?.success) dataValueNames.value = result.data || {};
         }
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('disabled', props.disabled);
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('afterValueChange', (name, value, model)=>{
+            if (props.afterValueChange) props.afterValueChange(name, value, model);
+        });
         function setValue(data, loading) {
             let queryList = [];
             configList.value.forEach((item)=>{
                 if (loading) return;
-                const list = expansionGroup(item?.subFormControlList || [], []);
+                const { result: list } = expansionGroup(item?.subFormControlList || [], []);
                 let result = {};
                 let otherDefaultValue = void 0 === getDefaultValue(data, item.bindingFieldNo) ? item.defaultValue : getDefaultValue(data, item.bindingFieldNo);
                 switch(item.controlTypeCode){
@@ -3923,14 +4033,14 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
                     if (!Object.keys(data).length) refs.value[`${FIELD_REF}${item.formCtlNo}`]?.dynamicRef?.resetFields();
                 });
             }); /**
-     * 查询key value 对应的中文
-     */
+   * 查询key value 对应的中文
+   */
             if (queryList.length) fetchDataValueNameByKeys({
                 queryDataValueNameByKeys: queryList
             });
         } /**
-   * props.data 监听变化，获取dataValueName
-   */
+ * props.data 监听变化，获取dataValueName
+ */
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)([
             ()=>props.data,
             loading
@@ -3959,7 +4069,9 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
                         ...acc,
                         ...other
                     };
-                }, {});
+                }, {
+                    ...hideData.value
+                });
                 return [
                     null,
                     params
@@ -4059,7 +4171,7 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
 const form_design_render_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(form_design_rendervue_type_script_setup_true_lang_tsx_name_FormDesignRender, [
     [
         '__scopeId',
-        "data-v-0a99cc9e"
+        "data-v-0281f06a"
     ]
 ]);
 /* ESM default export */ const form_design_render = form_design_render_exports_;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sun-biz",
-  "version": "0.0.2-beta.4",
+  "version": "0.0.2-beta.6",
   "type": "module",
   "exports": {
     ".": {