bl-common-vue3 3.8.105 → 3.8.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.105",
+  "version": "3.8.106",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/AttachmentInfo/index.vue

@@ -123,6 +123,16 @@
             </a-space>
             <span v-else>--</span>
           </template>
+
+          <template v-if="column.key === 'user_show'">
+            <a-switch
+              v-model:checked="record.user_show"
+              :checkedValue="1"
+              :unCheckedValue="0"
+              :disabled="userShowConfig.disabled"
+              @change="handleUseShowChange($event, record)"
+            />
+          </template>
         </template>
       </a-table>
     </a-card>
@@ -296,6 +306,16 @@ export default defineComponent({
       type: String,
       default: "",
     },
+    // 是否显示业户开放操作
+    userShowConfig: {
+      type: Object,
+      default: () => {
+        return {
+          show: false,
+          disabled: false,
+        };
+      },
+    }
   },
   setup(props, context) {
     const homeCrumb = { key: "home", parentId: 0, title: t('AttachmentInfo.index.559728-8') };
@@ -623,12 +643,19 @@ export default defineComponent({
             return utils.i18nTypeShow(record,'date','operate_time') || '--'
           }
         },
+        // 是否显示业户开放操作
+        {
+          title: t('AttchmentInfo.userShow'),
+          dataIndex: "user_show",
+          key: "user_show",
+          hidden: !props.userShowConfig.show,
+        },
         {
           title: t('common.table.operation'),
           dataIndex: "id",
           key: "action",
         },
-      ]
+     ].filter(item => !item.hidden);
     });
 
     loadLanguageAsync(utils.getLang());
@@ -647,6 +674,29 @@ export default defineComponent({
       }
     })
 
+    // 对业户开放操作
+    const handleUseShowChange = (e, record) => {
+      let params = {
+        ids: [record.id],
+        user_show: e ? 1 : 0,
+        alias: props.fileAlias,
+      }
+      context.emit("request", {
+        params: {
+          method: "post",
+          server: `/${props.serviceFrom}`,
+          url: `${props.annexEditFrom}`,
+          extra: {
+            ...params,
+          },
+        },
+        success: (res) => {
+          getDataList();
+          message.success(res.msg || t('common.action.success'));
+        },
+      });
+    }
+
     return {
       t,
       crumbList,
@@ -677,6 +727,7 @@ export default defineComponent({
       getDataList,
       getPicList,
       attachParams,
+      handleUseShowChange,
     };
   },
 });

package/src/components/CustomTable/index.vue

@@ -807,20 +807,39 @@
                     <template
                       v-for="(item, itemIndex) in rightMoreButtons"
                       :key="itemIndex">
-                      <a-menu-item v-if="item?.show ?? true">
-                        <a-button
-                          v-bind="{
-                            ...(item?.props || {}),
-                          }"
-                          @click.stop="item?.onClick">
-                          <template
-                            #icon
-                            v-if="buttonIconSlots.indexOf(`${item.key}`) > -1">
+                      <template v-if="((item?.show ?? true) && item?.children?.length)">
+                        <!-- 配置 children 时渲染二级菜单，未配置时保持原有普通按钮行为。 -->
+                        <a-sub-menu :key="item.key">
+                          <template #icon v-if="buttonIconSlots.indexOf(`${item.key}`) > -1">
                             <slot :name="`buttonIcon-${item.key}`"></slot>
                           </template>
-                          {{ i18nMapShow(item, ["name"], ["name"]) }}
-                        </a-button>
-                      </a-menu-item>
+                          <template #title>
+                            {{ i18nMapShow(item, ["name"], ["name"]) }}
+                          </template>
+                          <template v-for="(child, childIndex) in item.children" :key="child.key">
+                            <a-menu-item v-if="child?.show ?? true" :key="child.key">
+                              <a-button v-bind="{ ...(child?.props || {}), }" @click.stop="child?.onClick">
+                                <template #icon v-if="buttonIconSlots.indexOf(`${child.key}`) > -1">
+                                  <slot :name="`buttonIcon-${child.key}`"></slot>
+                                </template>
+                                {{ i18nMapShow(child, ["name"], ["name"]) }}
+                              </a-button>
+                            </a-menu-item>
+                          </template>
+                        </a-sub-menu>
+                      </template>
+                      <template v-if="((item?.show ?? true) && !item?.children?.length)">
+                        <a-menu-item :key="item.key">
+                          <a-button v-bind="{ ...(item?.props || {}), }" @click.stop="item?.onClick">
+                            <template
+                              #icon
+                              v-if="buttonIconSlots.indexOf(`${item.key}`) > -1">
+                              <slot :name="`buttonIcon-${item.key}`"></slot>
+                            </template>
+                            {{ i18nMapShow(item, ["name"], ["name"]) }}
+                          </a-button>
+                        </a-menu-item>
+                      </template>
                     </template>
                   </a-menu>
                 </template>
@@ -1345,7 +1364,8 @@
       @request="handleRequest"
       @closeModal="handleCloseExpandFields"
       :hasVillageSelect="expandFieldsHasVillageSelect"
-      :displayCompany="expandFieldsDisplayCompany" />
+      :displayCompany="expandFieldsDisplayCompany"
+      :customConfigItems="expandFieldsCustomConfigItems" />
 
     <!-- 选择成员 -->
     <ChooseOrgMember
@@ -1482,7 +1502,7 @@ export default defineComponent({
         return [];
       },
     },
-    /* 右侧更多按钮组 */
+    /* 右侧更多按钮组，配置 children 时展示二级菜单 */
     rightMoreButtons: {
       type: Array,
       default: () => {
@@ -1753,6 +1773,11 @@ export default defineComponent({
       type: Function,
       default: () => {},
     },
+    // 拓展字段的附加配置项会透传给拓展字段组件。
+    expandFieldsCustomConfigItems: {
+      type: Array,
+      default: () => [],
+    },
   },
   components: {
     PlusOutlined,

package/src/components/ExtraManage/components/CustomConfigFormItem.vue

@@ -0,0 +1,58 @@
+<template>
+  <a-col :span="config.form.span">
+    <a-form-item v-bind="validateInfo">
+      <template #label>
+        <span>{{ config.form.label }}</span>
+        <!-- 外部存在提示配置时复用统一的提示组件。 -->
+        <text-tip v-if="config.form.tips.length" :tips="config.form.tips" />
+      </template>
+      <a-switch
+        v-if="config.type === 'switch'"
+        v-bind="config.form.props"
+        :checked="modelValue"
+        @update:checked="handleUpdate"
+      />
+    </a-form-item>
+  </a-col>
+</template>
+
+<script>
+import { defineComponent } from "vue";
+import { Col, FormItem, Switch } from "ant-design-vue";
+import TextTip from "../../TextTip/index.vue";
+
+export default defineComponent({
+  name: "CustomConfigFormItem",
+  components: {
+    "a-col": Col,
+    "a-form-item": FormItem,
+    "a-switch": Switch,
+    TextTip,
+  },
+  props: {
+    config: {
+      type: Object,
+      required: true,
+    },
+    modelValue: {
+      type: [Boolean, Number, String],
+      default: undefined,
+    },
+    validateInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, { emit }) {
+    // switch 事件值保持组件按外部 props 协议返回的原始类型。
+    const handleUpdate = (value) => {
+      emit("update:modelValue", value);
+    };
+
+    return {
+      handleUpdate,
+    };
+  },
+});
+</script>

package/src/components/ExtraManage/components/ExtraManageEdit.vue

@@ -103,6 +103,14 @@
             />
           </a-form-item>
         </a-col>
+        <!-- 外部配置项统一在基础设置区域渲染。 -->
+        <CustomConfigFormItem
+          v-for="item in normalizedCustomConfigItems"
+          :key="item.key"
+          v-model="formState[item.key]"
+          :config="item"
+          :validateInfo="validateInfos[item.key]"
+        />
         <a-col :span="24">
           <div class="text-title">{{t('components.extraManageEdit.enterSetting')}}</div>
         </a-col>
@@ -202,6 +210,14 @@ import draggable from "vuedraggable";
 import { DragOutlined , DeleteOutlined , QuestionCircleOutlined } from "@ant-design/icons-vue";
 import TextTip from "../../TextTip/index.vue";
 import BlModal from "../../BlModal/index.vue";
+import CustomConfigFormItem from "./CustomConfigFormItem.vue";
+import {
+  createCustomConfigRules,
+  handleCustomConfigItems,
+  resetCustomConfigState,
+  setCustomConfigDetail,
+  syncCustomConfigState,
+} from "../utils/customConfig";
 
 export default defineComponent({
   name: "ExtraManageEdit",
@@ -251,6 +267,11 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    // 外部传入的拓展字段附加配置项，目前仅支持 switch 类型。
+    customConfigItems: {
+      type: Array,
+      default: () => [],
+    },
   },
   components: {
     BlModal,
@@ -268,9 +289,12 @@ export default defineComponent({
     DeleteOutlined,
     TextTip,
     QuestionCircleOutlined,
+    CustomConfigFormItem,
   },
   setup(props, {emit}) {
     const fieldsTypeList = ref([]);
+    // 统一补齐外部配置的回退值，表单和列表共享同一份配置约定。
+    const normalizedCustomConfigItems = computed(() => handleCustomConfigItems(props.customConfigItems));
     const state = reactive({
       formState: {
         fields_name: '',
@@ -307,6 +331,8 @@ export default defineComponent({
         fields_name: [{ required: true, message: t('components.ExtraManageEdit.301828-6') }],
         fields_type: [{ required: true, message: t('components.ExtraManageEdit.249040-16') }],
         sort: [{ required: true, message: t('components.ExtraManageEdit.249040-17') }],
+        // 自定义项按外部 required 配置动态生成校验规则。
+        ...createCustomConfigRules(normalizedCustomConfigItems.value, t('common.please.choose')),
       }
     });
 
@@ -401,13 +427,19 @@ export default defineComponent({
 
 
     const setModelRef = (info) => {
+      const customConfigKeys = new Set(normalizedCustomConfigItems.value.map((item) => item.key));
       for (let key in state.formState) {
+        // 自定义项由统一回填方法处理，避免覆盖配置声明的默认值。
+        if (customConfigKeys.has(key)) {
+          continue;
+        }
         if (['org_branch_id', 'village_id'].includes(key)) {
           state.formState[key] = info[key] || undefined;
         } else {
           state.formState[key] = info[key];
         }
       }
+      setCustomConfigDetail(state.formState, info, normalizedCustomConfigItems.value);
     };
 
     const getCompanyList = () => {
@@ -575,6 +607,8 @@ export default defineComponent({
     };
     const reset = () => {
       resetFields();
+      // resetFields 后显式恢复动态项，保证每次新增都使用最新配置默认值。
+      resetCustomConfigState(state.formState, normalizedCustomConfigItems.value);
       state.submitLoading = false;
       state.companyList = [];
       state.villageList = [];
@@ -591,6 +625,19 @@ export default defineComponent({
         }
     );
 
+    watch(
+      normalizedCustomConfigItems,
+      (items, previousItems = []) => {
+        // 配置运行时变化时同步动态字段，并清理已移除的配置项。
+        syncCustomConfigState(state.formState, items, previousItems);
+        if (!props.visible) {
+          // 弹窗关闭时应用最新默认值，避免下次新增继续使用旧配置。
+          resetCustomConfigState(state.formState, items);
+        }
+      },
+      { immediate: true, deep: true },
+    );
+
     loadLanguageAsync(utils.getLang());
 
     window.addEventListener('setBLLang', (event) => {
@@ -626,6 +673,7 @@ export default defineComponent({
       changeCompany,
       hasOptionValue,
       getContainer,
+      normalizedCustomConfigItems,
     };
   },
 });

package/src/components/ExtraManage/index.vue

@@ -20,6 +20,14 @@
       @request="handleRequest"
       :tableConfig="tableConfig"
     >
+      <!-- 可编辑的自定义列统一通过动态具名插槽渲染。 -->
+      <template v-for="item in editableCustomConfigItems" :key="item.key" #[`column-${item.key}`]="{ record }" >
+        <a-switch
+          v-if="item.type == 'switch'"
+          v-bind="getCustomConfigEditorProps(record, item)"
+          @change="handleCustomConfigChange($event, record, item)"
+        />
+      </template>
       <template #column-action="{ record }">
         <div v-if="record.is_system == 1">
           <a-button @click="handleEdit(record)" type="link" v-if="record?.can_edit">{{t('common.button.edit')}}</a-button>
@@ -47,6 +55,7 @@
       :expandFieldsExtraParams="expandFieldsExtraParams"
       :id="editId"
       :hasVillageSelect="hasVillageSelect"
+      :customConfigItems="customConfigItems"
       @closeModal="editVisible = false"
       @success="editSuccess"
       @request="handleRequest"
@@ -58,10 +67,17 @@
 import { cloneDeep } from "lodash";
 import {defineComponent, reactive, toRefs, defineAsyncComponent, computed} from "vue";
 import ExtraManageEdit from "./components/ExtraManageEdit.vue";
-import {Drawer, message,} from "ant-design-vue";
+import {Drawer, message, Switch} from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
 import BlDrawer from "../BlDrawer/index.vue";
+import {
+  getCustomConfigEditorProps,
+  handleCustomConfigItems,
+  getCustomConfigEditorChange,
+  getColumnsVisibleCustomConfigItems,
+  getEditableCustomConfigItems,
+} from "./utils/customConfig";
 const CustomTable = defineAsyncComponent(() =>
   import("../CustomTable/index.vue")
 );
@@ -114,11 +130,17 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    // 外部传入的拓展字段附加配置项
+    customConfigItems: {
+      type: Array,
+      default: () => [],
+    },
   },
   components: {
     BlDrawer,
     ExtraManageEdit,
     CustomTable,
+    "a-switch": Switch,
   },
   setup(props, {emit}) {
     const state = reactive({
@@ -126,6 +148,13 @@ export default defineComponent({
       editId: 0,
       customTable: null,
     });
+
+    // 处理后的自定义配置项
+    const normalizedCustomConfigItems = computed(() => handleCustomConfigItems(props.customConfigItems));
+
+    // 表格列中支持编辑的配置项
+    const editableCustomConfigItems = computed(() => getEditableCustomConfigItems(normalizedCustomConfigItems.value));
+
     const closeModal = () => {
       emit("closeModal");
     };
@@ -265,6 +294,10 @@ export default defineComponent({
           },
         })
       }
+      // 自定义列表项统一插入必填列之前，保留外部传入的其他表格配置。
+      const fillColumnIndex = _deepColumns.findIndex((column) => column.key === 'fill');
+      const customColumns = getColumnsVisibleCustomConfigItems(normalizedCustomConfigItems.value);
+      _deepColumns.splice(fillColumnIndex, 0, ...customColumns);
       return _deepColumns;
     });
 
@@ -286,6 +319,33 @@ export default defineComponent({
       loadLanguageAsync(newLang);
     });
 
+    // 列表快捷切换复用拓展字段编辑接口，仅提交当前配置字段及必要参数。
+    const handleCustomConfigChange = (value, record, item) => {
+      if (!record?.id) {
+        return;
+      }
+      const requestInfo = props.requestAllInfo?.edit || {};
+      const params = requestInfo?.params || props.requestAllParams?.edit || {};
+      const changeValue = getCustomConfigEditorChange(value, record, item);
+      emit("request", {
+        params: {
+          method: requestInfo.serviceType || 'put',
+          server: requestInfo.service || '/work_property',
+          url: requestInfo.serviceUrl ? requestInfo.serviceUrl.replace(/\${id}/g, record.id) : `/org/property/extra/info/field/${record.id}`,
+          extra: {
+            ...params,
+            ...props.expandFieldsExtraParams,
+            id: record.id,
+            [item.key]: changeValue,
+          },
+        },
+        success: (res) => {
+          state.customTable?.refresh();
+          message.success(res?.msg || t('common.save.success'));
+        },
+      });
+    };
+
     return {
       t,
       ...toRefs(state),
@@ -298,6 +358,9 @@ export default defineComponent({
       handleDelete,
       handleEdit,
       editSuccess,
+      getCustomConfigEditorProps,
+      handleCustomConfigChange,
+      editableCustomConfigItems,
     };
   },
 });

package/src/components/ExtraManage/utils/customConfig.js

@@ -0,0 +1,195 @@
+import { cloneDeep } from "lodash";
+
+// 拓展字段列表支持编辑的配置项类型。
+export const EDITABLE_CUSTOM_CONFIG_TYPES = ["switch"];
+
+// dataIndex 未配置、空字符串或空数组时均回退到配置项 key。
+const normalizeDataIndex = (dataIndex, fallbackKey) => {
+  if (dataIndex === undefined || dataIndex === null || dataIndex === "") {
+    return fallbackKey;
+  }
+  return Array.isArray(dataIndex) && dataIndex.length === 0 ? fallbackKey : dataIndex;
+};
+
+// 将外部配置补齐默认值
+/* 配置项示例
+const customConfigItems = [
+  {
+    // 必填且唯一，同时作为新增、编辑接口提交的字段名
+    key: 'user_show',
+    // 表单和列表标题的公共默认值
+    label: '用户端展示',
+    // 表单组件及可编辑列表组件类型
+    type: 'switch',
+    form: {
+      // 未配置或为空时读取外层 label
+      label: '用户端展示',
+      // 可选，未配置时不展示提示
+      tips: ['用户端展示1', '用户端展示2'],
+      // 默认 false
+      required: false,
+      // 默认值
+      defaultValue: 1,
+      // 默认 8
+      span: 8,
+      // 传递给具体表单组件
+      props: {
+        checkedValue: 1,
+        unCheckedValue: 0,
+      },
+    },
+    columns: {
+      // 默认 false
+      show: true,
+      // 默认 false，开启后允许在列表中快捷编辑
+      editable: true,
+      width: 100,
+      // 未配置或为空时读取外层 key
+      dataIndex: 'user_show',
+      // 未配置或为空时读取外层 label
+      title: '用户端展示',
+      // 其他 CustomTable 列配置
+      fixed: false,
+    },
+  },
+]; */
+export const handleCustomConfigItems = (items = []) => {
+  const keys = new Set();
+  return (Array.isArray(items) ? items : []).reduce((result, item) => {
+    // 当前仅兼容已声明的编辑组件类型，避免未知类型渲染空表单项。
+    if (!item?.key || keys.has(item.key) || !EDITABLE_CUSTOM_CONFIG_TYPES.includes(item.type)) {
+      return result;
+    }
+    keys.add(item.key);
+    const form = item.form || {};
+    const columns = item.columns || {};
+    result.push({
+      ...item,
+      form: {
+        ...form,
+        label: form.label || item.label || "",
+        tips: Array.isArray(form.tips) ? form.tips.filter(Boolean) : [],
+        required: form.required ?? false,
+        defaultValue: form.defaultValue,
+        span: form.span ?? 8,
+        props: form.props || {},
+      },
+      columns: {
+        ...columns,
+        show: columns.show ?? false,
+        editable: columns.editable ?? false,
+        dataIndex: normalizeDataIndex(columns.dataIndex, item.key),
+        title: columns.title || item.label || "",
+      },
+    });
+    return result;
+  }, []);
+};
+
+// 配置变化时同步动态字段，并清理已经从外部配置中移除的字段。
+export const syncCustomConfigState = (formState, items, previousItems = []) => {
+  const currentKeys = new Set(items.map((item) => item.key));
+  previousItems.forEach((item) => {
+    if (!currentKeys.has(item.key)) {
+      delete formState[item.key];
+    }
+  });
+  items.forEach((item) => {
+    if (!Object.prototype.hasOwnProperty.call(formState, item.key)) {
+      // 默认值直接使用外部配置，不根据 switch 协议转换类型。
+      formState[item.key] = cloneDeep(item.form.defaultValue);
+    }
+  });
+};
+
+// 新增或关闭弹窗时将全部动态字段恢复为外部配置声明的默认值。
+export const resetCustomConfigState = (formState, items) => {
+  items.forEach((item) => {
+    // 重置时保持外部 defaultValue 的原始类型和值。
+    formState[item.key] = cloneDeep(item.form.defaultValue);
+  });
+};
+
+// 编辑详情存在字段时原样回填，缺少字段时才使用外部配置默认值。
+export const setCustomConfigDetail = (formState, detail, items) => {
+  items.forEach((item) => {
+    const hasDetailValue = Object.prototype.hasOwnProperty.call(detail || {}, item.key);
+    formState[item.key] = cloneDeep(hasDetailValue ? detail[item.key] : item.form.defaultValue);
+  });
+};
+
+// required 只校验是否存在值，switch 的 0 和 false 都属于有效值。
+export const createCustomConfigRules = (items, requiredMessage) => {
+  return items.reduce((rules, item) => {
+    if (!item.form.required) {
+      return rules;
+    }
+    rules[item.key] = [
+      {
+        required: true,
+        validator: async (rule, value) => {
+          const isEmpty = value === undefined || value === null || value === "";
+          return isEmpty ? Promise.reject(requiredMessage) : Promise.resolve();
+        },
+      },
+    ];
+    return rules;
+  }, {});
+};
+
+// 支持字符串或数组形式的 dataIndex，供动态列表列读取嵌套值。
+export const getCustomConfigValue = (record, item) => {
+  const dataIndex = item?.columns?.dataIndex || item?.key;
+  const paths = Array.isArray(dataIndex) ? dataIndex : `${dataIndex}`.split(".");
+  const value = paths.reduce((result, path) => result?.[path], record);
+  // 列表值存在时保持接口原始类型，缺省时使用外部配置默认值。
+  return value === undefined ? item?.form?.defaultValue : value;
+};
+
+// 列表编辑组件组件属性
+export const getCustomConfigEditorProps = (record, item) => {
+  let componentProps = {};
+  const { type } = item || {};
+  if(type === 'switch'){
+    const externalDisabled = item?.form?.props?.disabled || false;
+    componentProps = {
+      checked: getCustomConfigValue(record, item),
+      // 外部禁用、列不可编辑或系统字段无权限时均禁止快捷切换。
+      disabled: externalDisabled || !item?.columns?.editable || (record?.is_system == 1 && !record?.can_edit),
+    };
+  }
+  return {
+    ...(item?.form?.props || {}),
+    ...componentProps,
+  };
+};
+
+// 列表编辑组件change获取value
+export const getCustomConfigEditorChange = (changeValue, record, item) => {
+  const { type } = item || {};
+  if(type === 'switch'){
+    // switch 事件值完全遵循外部 checkedValue/unCheckedValue 协议。
+    return changeValue;
+  }
+  return changeValue;
+};
+
+// 获取在拓展字段列表显示的配置项，组合配置项columns
+export const getColumnsVisibleCustomConfigItems = (customConfigItems = []) => {
+  const visibleCustomConfigItems = customConfigItems.filter((item) => item.columns.show)
+  const customColumns = visibleCustomConfigItems.map((item) => {
+    const columnConfig = cloneDeep(item.columns);
+    delete columnConfig.show;
+    return {
+      ...columnConfig,
+      key: item.key,
+    };
+  });
+  return customColumns;
+};
+
+// 获取在拓展字段列表显示的可编辑配置项
+export const getEditableCustomConfigItems = (customConfigItems = []) => {
+  const visibleCustomConfigItems = customConfigItems.filter((item) => item.columns.show)
+  return visibleCustomConfigItems.filter((item) => EDITABLE_CUSTOM_CONFIG_TYPES.includes(item.type));
+};

package/src/components/PublicExtensionField/components/ExtraManageEdit.vue

@@ -102,6 +102,14 @@
             />
           </a-form-item>
         </a-col>
+        <!-- 外部配置项统一在基础设置区域渲染。 -->
+        <CustomConfigFormItem
+          v-for="item in normalizedCustomConfigItems"
+          :key="item.key"
+          v-model="formState[item.key]"
+          :config="item"
+          :validateInfo="validateInfos[item.key]"
+        />
         <a-col :span="24">
           <div class="text-title">{{t('components.extraManageEdit.enterSetting')}}</div>
         </a-col>
@@ -196,6 +204,14 @@ import draggable from "vuedraggable";
 import { DragOutlined , DeleteOutlined , QuestionCircleOutlined } from "@ant-design/icons-vue";
 import TextTip from "../../TextTip/index.vue";
 import BlModal from "../../BlModal/index.vue";
+import CustomConfigFormItem from "../../ExtraManage/components/CustomConfigFormItem.vue";
+import {
+  createCustomConfigRules,
+  handleCustomConfigItems,
+  resetCustomConfigState,
+  setCustomConfigDetail,
+  syncCustomConfigState,
+} from "../../ExtraManage/utils/customConfig";
 
 export default defineComponent({
   name: "ExtraManageEdit",
@@ -228,7 +244,12 @@ export default defineComponent({
     server:{
       type: String,
       default: '',
-    }
+    },
+    // 外部传入的拓展字段附加配置项，目前仅支持 switch 类型。
+    customConfigItems: {
+      type: Array,
+      default: () => [],
+    },
   },
   components: {
     BlModal,
@@ -246,9 +267,12 @@ export default defineComponent({
     DeleteOutlined,
     TextTip,
     QuestionCircleOutlined,
+    CustomConfigFormItem,
   },
   setup(props, {emit}) {
     const fieldsTypeList = ref([]);
+    // 公共拓展字段复用标准拓展字段的配置归一化规则。
+    const normalizedCustomConfigItems = computed(() => handleCustomConfigItems(props.customConfigItems));
     const state = reactive({
       formState: {
         fields_name: '',
@@ -281,6 +305,8 @@ export default defineComponent({
         fields_name: [{ required: true, message: t('components.ExtraManageEdit.301828-6') }],
         fields_type: [{ required: true, message: t('components.ExtraManageEdit.249040-16') }],
         sort: [{ required: true, message: t('components.ExtraManageEdit.249040-17') }],
+        // 自定义项按外部 required 配置动态生成校验规则。
+        ...createCustomConfigRules(normalizedCustomConfigItems.value, t('common.please.choose')),
       }
     });
 
@@ -366,13 +392,19 @@ export default defineComponent({
 
 
     const setModelRef = (info) => {
+      const customConfigKeys = new Set(normalizedCustomConfigItems.value.map((item) => item.key));
       for (let key in state.formState) {
+        // 自定义项由统一回填方法处理，避免覆盖配置声明的默认值。
+        if (customConfigKeys.has(key)) {
+          continue;
+        }
         if (['org_branch_id', 'village_id'].includes(key)) {
           state.formState[key] = info[key] || undefined;
         } else {
           state.formState[key] = info[key];
         }
       }
+      setCustomConfigDetail(state.formState, info, normalizedCustomConfigItems.value);
     };
 
     const getCompanyList = () => {
@@ -537,6 +569,8 @@ export default defineComponent({
     };
     const reset = () => {
       resetFields();
+      // resetFields 后显式恢复动态项，保证每次新增都使用最新配置默认值。
+      resetCustomConfigState(state.formState, normalizedCustomConfigItems.value);
       state.submitLoading = false;
       state.companyList = [];
       state.villageList = [];
@@ -553,6 +587,19 @@ export default defineComponent({
         }
     );
 
+    watch(
+      normalizedCustomConfigItems,
+      (items, previousItems = []) => {
+        // 配置运行时变化时同步动态字段，并清理已移除的配置项。
+        syncCustomConfigState(state.formState, items, previousItems);
+        if (!props.visible) {
+          // 弹窗关闭时应用最新默认值，避免下次新增继续使用旧配置。
+          resetCustomConfigState(state.formState, items);
+        }
+      },
+      { immediate: true, deep: true },
+    );
+
     loadLanguageAsync(utils.getLang());
 
     window.addEventListener('setBLLang', (event) => {
@@ -582,6 +629,7 @@ export default defineComponent({
       fieldsTypechage,
       i18nMapShow,
       changeCompany,
+      normalizedCustomConfigItems,
     };
   },
 });

package/src/components/PublicExtensionField/index.vue

@@ -20,6 +20,14 @@
       @request="handleRequest"
       :tableConfig="tableConfig"
     >
+      <!-- 可编辑的自定义列统一通过动态具名插槽渲染。 -->
+      <template v-for="item in editableCustomConfigItems" :key="item.key" #[`column-${item.key}`]="{ record }" >
+        <a-switch
+          v-if="item.type == 'switch'"
+          v-bind="getCustomConfigEditorProps(record, item)"
+          @change="handleCustomConfigChange($event, record, item)"
+        />
+      </template>
       <template #column-action="{ record }">
         <div v-if="record.is_system == 1">
           <a-tooltip>
@@ -46,6 +54,7 @@
       :alias="alias"
       :server="server"
       :hasVillageSelect="hasVillageSelect"
+      :customConfigItems="customConfigItems"
       @closeModal="editVisible = false"
       @success="editSuccess"
       @request="handleRequest"
@@ -57,10 +66,17 @@
 import { cloneDeep } from "lodash";
 import {defineComponent, reactive, toRefs, defineAsyncComponent, computed} from "vue";
 import ExtraManageEdit from "./components/ExtraManageEdit.vue";
-import {Drawer, message,} from "ant-design-vue";
+import {Drawer, message, Switch} from "ant-design-vue";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
 import BlDrawer from "../BlDrawer/index.vue";
+import {
+  getCustomConfigEditorProps,
+  handleCustomConfigItems,
+  getCustomConfigEditorChange,
+  getColumnsVisibleCustomConfigItems,
+  getEditableCustomConfigItems,
+} from "../ExtraManage/utils/customConfig";
 const CustomTable = defineAsyncComponent(() =>
   import("../CustomTable/index.vue")
 );
@@ -96,12 +112,18 @@ export default defineComponent({
     server:{
       type: String,
       default: '',
-    }
+    },
+    // 外部传入的拓展字段附加配置项，目前仅支持 switch 类型。
+    customConfigItems: {
+      type: Array,
+      default: () => [],
+    },
   },
   components: {
     BlDrawer,
     ExtraManageEdit,
     CustomTable,
+    "a-switch": Switch,
   },
   setup(props, {emit}) {
     const state = reactive({
@@ -109,6 +131,12 @@ export default defineComponent({
       editId: 0,
       customTable: null,
     });
+    // 公共拓展字段复用标准拓展字段的配置归一化规则。
+    const normalizedCustomConfigItems = computed(() => handleCustomConfigItems(props.customConfigItems));
+
+    // 表格列中支持编辑的配置项
+    const editableCustomConfigItems = computed(() => getEditableCustomConfigItems(normalizedCustomConfigItems.value));
+
     const closeModal = () => {
       emit("closeModal");
     };
@@ -237,6 +265,10 @@ export default defineComponent({
           },
         })
       }
+      // 自定义列表项统一插入必填列之前，保留外部传入的其他表格配置。
+      const fillColumnIndex = _deepColumns.findIndex((column) => column.key === 'fill');
+      const customColumns = getColumnsVisibleCustomConfigItems(normalizedCustomConfigItems.value);
+      _deepColumns.splice(fillColumnIndex, 0, ...customColumns);
       return _deepColumns;
     });
 
@@ -257,6 +289,31 @@ export default defineComponent({
       loadLanguageAsync(newLang);
     });
 
+    // 列表快捷切换复用公共拓展字段编辑接口，仅提交当前配置字段及必要参数。
+    const handleCustomConfigChange = (value, record, item) => {
+      if (!record?.id) {
+        return;
+      }
+      const changeValue = getCustomConfigEditorChange(value, record, item);
+      emit("request", {
+        params: {
+          method: 'put',
+          server: `/${props.server}`,
+          url: `/common/extra/field/${record.id}`,
+          extra: {
+            alias: props.alias,
+            ...props.expandFieldsExtraParams,
+            id: record.id,
+            [item.key]: changeValue,
+          },
+        },
+        success: (res) => {
+          state.customTable?.refresh();
+          message.success(res?.msg || t('common.save.success'));
+        },
+      });
+    };
+
     return {
       t,
       ...toRefs(state),
@@ -268,6 +325,9 @@ export default defineComponent({
       handleDelete,
       handleEdit,
       editSuccess,
+      getCustomConfigEditorProps,
+      handleCustomConfigChange,
+      editableCustomConfigItems,
     };
   },
 });

package/src/locale/local/cht.json

@@ -514,5 +514,6 @@
   "DepartmentUser.index.555981-0": "清除選項",
 	"DepartmentUser.index.555981-1": "展開",
 	"DepartmentUser.index.555981-2": "收起",
-  "BlMobileAnnexUpload.index.676543-0": "此 QR Code 於 15 分鐘內有效"
+  "BlMobileAnnexUpload.index.676543-0": "此 QR Code 於 15 分鐘內有效",
+  "AttchmentInfo.userShow": "對業戶开放"
 }

package/src/locale/local/en.json

@@ -514,5 +514,6 @@
   "DepartmentUser.index.555981-0": "Clear selection",
   "DepartmentUser.index.555981-1": "Expand",
   "DepartmentUser.index.555981-2": "Collapse",
-  "BlMobileAnnexUpload.index.676543-0": "This QR code is valid for 15 minutes"
+  "BlMobileAnnexUpload.index.676543-0": "This QR code is valid for 15 minutes",
+  "AttchmentInfo.userShow": "Show to Users"
 }

package/src/locale/local/jp.json

@@ -514,5 +514,6 @@
   "DepartmentUser.index.555981-0": "選択をクリア",
   "DepartmentUser.index.555981-1": "展開",
   "DepartmentUser.index.555981-2": "折りたたむ",
-  "BlMobileAnnexUpload.index.676543-0": "このQRコードは15分間有効です"
+  "BlMobileAnnexUpload.index.676543-0": "このQRコードは15分間有効です",
+  "AttchmentInfo.userShow": "ユーザー表示"
 }

package/src/locale/local/zh-HK.json

@@ -514,5 +514,6 @@
   "CheckedHousingResources.index.074796-0": "選擇品牌",
   "BlMobileAnnexUpload.index-0": "查看二維碼",
   "BlMobileAnnexUpload.index-1": "使用手機掃碼上載",
-  "modules.ListFieldModal.082665-0": "選項內容不能留空"
+  "modules.ListFieldModal.082665-0": "選項內容不能留空",
+  "AttchmentInfo.userShow": "對業戶开放"
 }

package/src/locale/local/zh.json

@@ -514,5 +514,6 @@
   "DepartmentUser.index.555981-0": "清除选项",
 	"DepartmentUser.index.555981-1": "展开",
 	"DepartmentUser.index.555981-2": "收起",
-  "BlMobileAnnexUpload.index.676543-0": "该二维码十五分钟内有效"
+  "BlMobileAnnexUpload.index.676543-0": "该二维码十五分钟内有效",
+  "AttchmentInfo.userShow": "对业户开放"
 }