bl-common-vue3 3.8.134 → 3.8.136

package/package.json

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

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

@@ -55,7 +55,10 @@
             <a-divider />
             <div class="section-title">{{ t('components.extraManageEdit.enterSetting') }}</div>
             <template v-if="isTextField">
-              <a-form-item :label="t('components.ExtraManageEdit.249040-3')"><a-input v-model:value="formState.default_value" /></a-form-item>
+              <a-form-item :label="t('components.ExtraManageEdit.249040-3')">
+                <a-input-number v-if="formState.fields_type === 'number'" v-model:value="formState.default_value" class="full-width" />
+                <a-input v-else v-model:value="formState.default_value" />
+              </a-form-item>
               <a-form-item :label="t(formState.fields_type === 'number' ? 'PublicExtensionField.numberRange' : 'components.ExtraManageEdit.249040-4')">
                 <div class="range-inputs"><a-input-number v-model:value="formState.min_length" @blur="blurNumber" /><span>{{ t('components.ExtraManageEdit.249040-5') }}</span><a-input-number v-model:value="formState.max_length" @blur="blurNumber" /></div>
               </a-form-item>
@@ -358,18 +361,14 @@ export default defineComponent({
     }
 
     const addclick = () => {
-      let num = 0
-
-      for (let j = 0; j < state.formState.option_value.length; j++) {
-        if(state.formState.option_value[j].value >  num){
-          num = state.formState.option_value[j].value
-        }
-      }
-
-      state.formState.option_value.push(
-          {label : '' , value : num + 1 }
-      )
-    }
+      // 历史选项编号可能是字符串，必须按数值取最大值，避免拼接或字典序比较。
+      const maxValue = state.formState.option_value.reduce((max, item) => {
+        const value = Number(item.value);
+        return Number.isFinite(value) ? Math.max(max, value) : max;
+      }, 0);
+      // 沿用旧编辑器新增选项的字符串协议，不改写已有选项编号，避免影响已保存的业务值。
+      state.formState.option_value.push({label: '', value: String(maxValue + 1)});
+    };
 
     const gettypelist = (text) => {
       emit("request", {
@@ -396,8 +395,11 @@ export default defineComponent({
     }
 
     const fieldsTypechage = () => {
-      if(state.formState.fields_type == 'radio' || state.formState.fields_type == 'multiple_choice' || state.formState.fields_type == 'select_single' || state.formState.fields_type == 'select_multiple'){
+      if(state.formState.fields_type == 'radio' || state.formState.fields_type == 'multiple_choice'){
         state.formState.option_value = [{label : '' , value : 1}]
+      }else if(state.formState.fields_type == 'select_single' || state.formState.fields_type == 'select_multiple'){
+        // 下拉字段沿用历史字符串编号，保证旧业务表单的选中值能够匹配。
+        state.formState.option_value = [{label : '' , value : '1'}]
       }else {
         state.formState.option_value = []
       }
@@ -407,6 +409,8 @@ export default defineComponent({
       }else {
         state.formState.option_max = ''
       }
+      // 新建时切换类型不能把文本默认值带入数字等其他字段类型。
+      state.formState.default_value = '';
     };
 
     const getVillageList = (isDetail = false) => {

package/src/components/PublicExtensionField/index.vue

@@ -43,7 +43,9 @@
       </template>
       <template #column-action="{ record }">
         <div v-if="record.is_system == 1">
-          <a-tooltip>
+          <!-- 沿用旧组件的后端可编辑标记，系统字段仍不可删除。 -->
+          <a-button v-if="record.can_edit" @click="handleEdit(record)" type="link">{{t('common.button.edit')}}</a-button>
+          <a-tooltip v-else>
             <template #title>{{t('villageIotInfo.index.885385-0')}}</template>
             <a-button disabled type="link">{{t('common.button.edit')}}</a-button>
           </a-tooltip>
@@ -370,7 +372,20 @@ export default defineComponent({
 </script>
 <style lang="less" scoped>
 .field-manager-description { margin-bottom: 20px; padding: 12px 16px; background: #edf5ff; border: 1px solid #dceaff; border-radius: 5px; color: #5c7da3; line-height: 1.7; }
-.field-manager-table { padding: 10px 14px; border: 1px solid #e8edf3; border-radius: 6px; background: #fff; }
+.field-manager-table {
+  // 限定到当前字段管理器的直属区域，避免影响弹窗内的其他表格。
+  :deep(> .table-warp > .filter-warp),
+  :deep(> .table-warp > .ant-table-wrapper) {
+    padding: 10px 14px;
+    border: 1px solid #e8edf3;
+    border-radius: 6px;
+    background: #fff;
+  }
+
+  :deep(> .table-warp > .filter-warp) {
+    margin-bottom: 16px;
+  }
+}
 .field-manager-title { display: flex; align-items: center; gap: 20px; flex-wrap: wrap; }
 .field-manager-title strong { font-size: 15px; font-weight: 500; }
 .field-manager-title strong span { margin-left: 6px; color: #8c97a6; font-size: 13px; }
@@ -378,5 +393,12 @@ export default defineComponent({
 .field-required { padding: 3px 8px; border-radius: 4px; color: #487ecc; background: #eef5ff; font-size: 12px; }
 .field-optional { color: #8c97a6; font-size: 12px; }
 .field-manager-hint { padding: 12px 8px; color: #8c97a6; font-size: 12px; }
-@media (max-width: 767px) { .field-manager-title { gap: 8px; } .field-manager-search { width: 145px; } .field-manager-table { padding: 8px; } }
+@media (max-width: 767px) {
+  .field-manager-title { gap: 8px; }
+  .field-manager-search { width: 145px; }
+  .field-manager-table {
+    :deep(> .table-warp > .filter-warp),
+    :deep(> .table-warp > .ant-table-wrapper) { padding: 8px; }
+  }
+}
 </style>

package/test/publicExtensionField.test.js

@@ -193,3 +193,163 @@ test('field list has no footer and mask closing remains disabled while editing w
     assert.equal(drawerAttrs.maskClosable, true);
   } finally {app.unmount(); global.window = previousWindow;}
 });
+
+// 挂载真实编辑逻辑和表单校验，仅替换接口与 UI 渲染边界。
+function mountEditor({detail, id = detail ? 9 : 0, deferredDetail = false, props = {}, template = false} = {}) {
+  const previousWindow = global.window;
+  global.window = {addEventListener() {}, removeEventListener() {}};
+  const antd = require('ant-design-vue');
+  const compiled = loadScript(path.resolve(__dirname, '../src/components/PublicExtensionField/components/ExtraManageEdit.vue'), {
+    'ant-design-vue': {...antd, message: {success() {}, warning() {}}},
+  }, template);
+  const controls = [];
+  const components = Object.fromEntries(Object.keys(compiled.default.components).map(name => [name, {
+    inheritAttrs: false,
+    setup(_, {attrs, slots}) {
+      return () => {
+        controls.push({name, ...attrs});
+        return Vue.h('div', slots.default?.());
+      };
+    },
+  }]));
+  const requests = [];
+  const instance = Vue.ref();
+  const settings = Vue.reactive({visible: true, id, alias: 'roomExpandFieldAlias_9', server: 'village',
+    displayCompany: false, ...props});
+  const component = {...compiled.default, components, render: template ? compiled.render : () => Vue.h('div')};
+  const app = renderer.createApp({render: () => Vue.h(component, {
+    ...settings, ref: instance, onRequest: event => {
+      requests.push(event);
+      if (event.params.url === '/system/dict/data') event.success({list: [{value: 'single_text', label: 'Text'}]});
+      else if (event.params.url === '/company/authBranchList') event.success({list: [{id: 12, name: 'Company'}]});
+      else if (event.params.method === 'get' && !deferredDetail) event.success({detail: structuredClone(detail)});
+    },
+  })});
+  app.config.warnHandler = () => {};
+  app.mount({children: []});
+  return {instance, requests, settings, controls,
+    writes: () => requests.filter(event => ['post', 'put'].includes(event.params.method)),
+    close: () => {app.unmount(); global.window = previousWindow;},
+  };
+}
+
+test('historical option IDs survive reordering and new options use the numeric maximum without string concatenation', async () => {
+  const fixture = mountEditor({detail: {fields_name: 'Choices', fields_type: 'select_multiple', sort: 1,
+    option_value: [{label: 'Ten', value: '10'}, {label: 'Two', value: '2'}, {label: 'One', value: '1'}]}});
+  try {
+    await flush();
+    fixture.instance.value.addclick();
+    assert.deepEqual(fixture.instance.value.formState.option_value.map(item => item.value), ['10', '2', '1', '11']);
+    fixture.instance.value.belerasure(1);
+    fixture.instance.value.addclick();
+    assert.deepEqual(fixture.instance.value.formState.option_value.map(item => item.value), ['10', '1', '11', '12']);
+  } finally {fixture.close();}
+});
+
+test('new dropdown choices retain legacy string IDs and changing type clears the previous default', async () => {
+  const fixture = mountEditor();
+  try {
+    await flush();
+    for (const [type, firstValue] of [['select_single', '1'], ['select_multiple', '1'], ['radio', 1], ['multiple_choice', 1]]) {
+      fixture.instance.value.formState.default_value = 'old text';
+      fixture.instance.value.formState.fields_type = type;
+      fixture.instance.value.fieldsTypechage();
+      assert.equal(fixture.instance.value.formState.option_value[0].value, firstValue);
+      assert.equal(fixture.instance.value.formState.default_value, '');
+    }
+  } finally {fixture.close();}
+});
+
+for (const type of ['single_text', 'multiple_text', 'number', 'radio', 'multiple_choice', 'select_single', 'select_multiple', 'date', 'image', 'attachment']) {
+  test(`${type}: editing retains historical configuration, zero values and custom switches in the submitted data`, async () => {
+    const detail = {fields_name: 'Existing', fields_type: type, sort: 0, fill: 0, org_branch_id: 12,
+      default_value: type === 'number' ? 0 : '', min_length: 0, max_length: 20, placeholder: 'Hint',
+      date_type: 2, option_max: 2, option_value: [{label: 'Existing', value: '10'}], file_type: '.pdf,.doc', user_show: 0};
+    const fixture = mountEditor({detail, props: {displayCompany: true,
+      customConfigItems: [{key: 'user_show', type: 'switch', form: {defaultValue: 1}}]}});
+    try {
+      await flush();
+      fixture.instance.value.onSubmit();
+      await flush();
+      assert.equal(fixture.writes().length, 1);
+      assert.deepEqual(fixture.writes()[0].params.extra, {...detail, id: 9, alias: 'roomExpandFieldAlias_9'});
+      assert.equal(fixture.requests.filter(event => event.params.url === '/company/authBranchList').length, 1);
+    } finally {fixture.close();}
+  });
+}
+
+test('detail failure blocks saving; reopening a new editor resets historical values and custom defaults', async () => {
+  const fixture = mountEditor({id: 9, deferredDetail: true,
+    props: {customConfigItems: [{key: 'user_show', type: 'switch', form: {defaultValue: 1}}]}});
+  try {
+    await flush();
+    fixture.requests.find(event => event.params.url.endsWith('/field/9')).fail(new Error('offline'));
+    fixture.instance.value.onSubmit();
+    await flush();
+    assert.equal(fixture.writes().length, 0);
+    fixture.settings.visible = false;
+    await flush();
+    fixture.settings.id = 0;
+    fixture.settings.visible = true;
+    await flush();
+    assert.equal(fixture.instance.value.detailLoading, false);
+    assert.equal(fixture.instance.value.formState.user_show, 1);
+    assert.equal(fixture.instance.value.formState.file_type, '');
+    fixture.instance.value.formState.fields_name = 'New';
+    await flush();
+    fixture.instance.value.onSubmit();
+    fixture.instance.value.onSubmit();
+    await flush();
+    assert.equal(fixture.writes().length, 1);
+    fixture.writes()[0].fail(new Error('offline'));
+    fixture.instance.value.onSubmit();
+    await flush();
+    assert.equal(fixture.writes().length, 2);
+    assert.equal(fixture.writes()[1].params.method, 'post');
+  } finally {fixture.close();}
+});
+
+test('numeric defaults use a numeric input and attachment restrictions stay hidden in the editor', async () => {
+  for (const type of ['number', 'attachment']) {
+    const fixture = mountEditor({template: true, detail: {fields_name: 'Existing', fields_type: type,
+      sort: 1, default_value: 123, file_type: '.pdf', option_value: []}});
+    try {
+      await flush();
+      assert.equal(fixture.controls.some(control => control.name === 'a-input' && control.value === '.pdf'), false);
+      if (type === 'number') {
+        assert.equal(fixture.controls.some(control => control.name === 'a-input-number' && control.value === 123), true);
+        assert.equal(fixture.controls.some(control => control.name === 'a-input' && control.value === 123), false);
+      }
+    } finally {fixture.close();}
+  }
+});
+
+test('system field actions preserve can_edit while all system field deletion stays disabled', async () => {
+  const previousWindow = global.window;
+  global.window = {addEventListener() {}, removeEventListener() {}};
+  const compiled = loadScript(path.resolve(__dirname, '../src/components/PublicExtensionField/index.vue'), {}, true);
+  const record = Vue.reactive({id: 9, is_system: 1, can_edit: true});
+  const actions = [];
+  const components = Object.fromEntries(Object.keys(compiled.default.components).map(name => [name, {
+    inheritAttrs: false, setup(_, {attrs, slots}) {return () => {
+      if (name === 'a-button') actions.push({...attrs});
+      return Vue.h('div', name === 'CustomTable' ? slots['column-action']({record}) : slots.default?.());
+    };},
+  }]));
+  const app = renderer.createApp({render: () => Vue.h({...compiled.default, components, render: compiled.render}, {visible: true})});
+  app.config.warnHandler = () => {};
+  try {
+    app.mount({children: []});
+    await flush();
+    assert.equal(actions.length, 2);
+    assert.equal(typeof actions[0].onClick, 'function');
+    assert.notEqual(actions[0].disabled, '');
+    assert.equal(actions[1].disabled, '');
+    record.can_edit = false;
+    actions.length = 0;
+    await flush();
+    assert.equal(actions.length, 2);
+    assert.equal(actions[0].disabled, '');
+    assert.equal(actions[1].disabled, '');
+  } finally {app.unmount(); global.window = previousWindow;}
+});