!59 Bug修复与功能优化

Merge pull request !59 from 大熊/master
2025-11-12 05:33:48 +08:00 · 2025-03-11 07:26:56 +00:00
parent ad7ad667c8 66147e47da
commit b1cbad8362
72 changed files with 974 additions and 459 deletions
--- a/smart-admin-web-javascript/src/components/framework/smart-enum-checkbox/index.vue
+++ b/smart-admin-web-javascript/src/components/framework/smart-enum-checkbox/index.vue
@@ -9,7 +9,11 @@
  *
 -->
 <template>
-  <a-checkbox-group :style="`width: ${width}`" v-model:value="selectValue" :options="optionList" @change="handleChange" />
+  <a-checkbox-group :style="`width: ${width}`" v-model:value="selectValue" @change="handleChange" :disabled="disabled">
+    <a-checkbox v-for="item in valueDescList" :key="item.value" :value="item.value" :disabled="disabledOption.includes(item.value)">
+      {{ item.desc }}
+    </a-checkbox>
+  </a-checkbox-group>
 </template>

 <script setup>
@@ -22,19 +26,32 @@
      type: String,
      default: '200px',
    },
+    // 禁用整个多选框
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    // 需要禁用的选项枚举值
+    disabledOption: {
+      type: Array,
+      default: () => [],
+    },
+    // 需要隐藏的选项枚举值
+    hiddenOption: {
+      type: Array,
+      default: () => [],
+    },
  });

  // ------------ 枚举数据 加载和构建 ------------

-  const optionList = ref([]);
-  function buildOptionList() {
+  const valueDescList = ref([]);
+
+  onMounted(() => {
    const internalInstance = getCurrentInstance(); // 有效  全局
    const smartEnumPlugin = internalInstance.appContext.config.globalProperties.$smartEnumPlugin;
-    const valueList = smartEnumPlugin.getValueDescList(props.enumName);
-    optionList.value = valueList.map((e) => Object.assign({}, { value: e.value, label: e.desc }));
-  }
-
-  onMounted(buildOptionList);
+    valueDescList.value = smartEnumPlugin.getValueDescList(props.enumName).filter((item) => !props.hiddenOption.includes(item.value));
+  });

  // ------------ 数据选中 事件及其相关 ------------

@@ -43,11 +60,14 @@
  watch(
    () => props.value,
    (newValue) => {
-      selectValue.value = newValue;
-    }
+      // 如果传入的值是被禁用或被隐藏的选项，则移除这些选项
+      selectValue.value = newValue.filter((item) => !props.hiddenOption.includes(item) && !props.disabledOption.includes(item));
+    },
+    { immediate: true }
  );

  const emit = defineEmits(['update:value', 'change']);
+
  function handleChange(value) {
    emit('update:value', value);
    emit('change', value);
--- a/smart-admin-web-javascript/src/components/framework/smart-enum-radio/index.vue
+++ b/smart-admin-web-javascript/src/components/framework/smart-enum-radio/index.vue
@@ -10,15 +10,15 @@
 -->
 <template>
  <template v-if="isButton">
-    <a-radio-group v-model:value="selectValue" @change="handleChange" button-style="solid">
-      <a-radio-button v-for="item in $smartEnumPlugin.getValueDescList(props.enumName)" :key="item.value" :value="item.value">
+    <a-radio-group v-model:value="selectValue" @change="handleChange" button-style="solid" :disabled="disabled">
+      <a-radio-button v-for="item in valueDescList" :key="item.value" :value="item.value" :disabled="disabledOption.includes(item.value)">
        {{ item.desc }}
      </a-radio-button>
    </a-radio-group>
  </template>
  <template v-else>
-    <a-radio-group v-model:value="selectValue" @change="handleChange">
-      <a-radio v-for="item in $smartEnumPlugin.getValueDescList(props.enumName)" :key="item.value" :value="item.value">
+    <a-radio-group v-model:value="selectValue" @change="handleChange" :disabled="disabled">
+      <a-radio v-for="item in valueDescList" :key="item.value" :value="item.value" :disabled="disabledOption.includes(item.value)">
        {{ item.desc }}
      </a-radio>
    </a-radio-group>
@@ -26,7 +26,7 @@
 </template>

 <script setup>
-  import { ref, watch } from 'vue';
+  import { ref, watch, onMounted, getCurrentInstance } from 'vue';

  const props = defineProps({
    enumName: String,
@@ -43,19 +43,44 @@
      type: Boolean,
      default: false,
    },
+    // 禁用整个单选框
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    // 需要禁用的选项枚举值
+    disabledOption: {
+      type: Array,
+      default: () => [],
+    },
+    // 需要隐藏的选项枚举值
+    hiddenOption: {
+      type: Array,
+      default: () => [],
+    },
  });

-  const emit = defineEmits(['update:value', 'change']);
+  const valueDescList = ref([]);
+
+  onMounted(() => {
+    const internalInstance = getCurrentInstance(); // 有效  全局
+    const smartEnumPlugin = internalInstance.appContext.config.globalProperties.$smartEnumPlugin;
+    valueDescList.value = smartEnumPlugin.getValueDescList(props.enumName).filter((item) => !props.hiddenOption.includes(item.value));
+  });

  const selectValue = ref(props.value);

  watch(
    () => props.value,
    (newValue) => {
-      selectValue.value = newValue;
-    }
+      // 如果传入的值是被禁用或被隐藏的选项，则移除该选项
+      selectValue.value = props.disabledOption.includes(newValue) || props.hiddenOption.includes(newValue) ? undefined : newValue;
+    },
+    { immediate: true }
  );

+  const emit = defineEmits(['update:value', 'change']);
+
  function handleChange(e) {
    emit('update:value', e.target.value);
    emit('change', e.target.value);
--- a/smart-admin-web-javascript/src/components/framework/smart-enum-select/index.vue
+++ b/smart-admin-web-javascript/src/components/framework/smart-enum-select/index.vue
@@ -19,18 +19,18 @@
    @change="handleChange"
    :disabled="disabled"
  >
-    <a-select-option v-for="item in $smartEnumPlugin.getValueDescList(props.enumName)" :key="item.value" :value="item.value">
+    <a-select-option v-for="item in valueDescList" :key="item.value" :value="item.value" :disabled="disabledOption.includes(item.value)">
      {{ item.desc }}
    </a-select-option>
  </a-select>
 </template>

 <script setup>
-  import { ref, watch } from 'vue';
+  import { ref, watch, onMounted, getCurrentInstance } from 'vue';

  const props = defineProps({
    enumName: String,
-    value: [Number,String],
+    value: [Number, String],
    width: {
      type: String,
      default: '100%',
@@ -43,23 +43,44 @@
      type: String,
      default: 'default',
    },
+    // 禁用整个下拉选择框
    disabled: {
      type: Boolean,
      default: false,
    },
+    // 需要禁用的选项枚举值
+    disabledOption: {
+      type: Array,
+      default: () => [],
+    },
+    // 需要隐藏的选项枚举值
+    hiddenOption: {
+      type: Array,
+      default: () => [],
+    },
  });

-  const emit = defineEmits(['update:value', 'change']);
+  const valueDescList = ref([]);
+
+  onMounted(() => {
+    const internalInstance = getCurrentInstance(); // 有效  全局
+    const smartEnumPlugin = internalInstance.appContext.config.globalProperties.$smartEnumPlugin;
+    valueDescList.value = smartEnumPlugin.getValueDescList(props.enumName).filter((item) => !props.hiddenOption.includes(item.value));
+  });

  const selectValue = ref(props.value);

  watch(
    () => props.value,
    (newValue) => {
-      selectValue.value = newValue;
-    }
+      // 如果传入的值是被禁用或被隐藏的选项，则移除该选项
+      selectValue.value = props.disabledOption.includes(newValue) || props.hiddenOption.includes(newValue) ? undefined : newValue;
+    },
+    { immediate: true }
  );

+  const emit = defineEmits(['update:value', 'change']);
+
  function handleChange(value) {
    emit('update:value', value);
    emit('change', value);
--- a/smart-admin-web-javascript/src/components/support/dict-key-select/index.vue
+++ b/smart-admin-web-javascript/src/components/support/dict-key-select/index.vue
@@ -18,6 +18,7 @@
      :allowClear="true"
      :size="size"
      @change="onChange"
+      :disabled="disabled"
    >
      <a-select-option v-for="item in dictKeyCodeList" :key="item.keyCode" :value="item.keyCode">
        {{ item.keyName }}
@@ -27,7 +28,7 @@
 </template>

 <script setup>
-  import { computed, onMounted, ref, watch, defineExpose } from 'vue';
+  import { onMounted, ref, watch } from 'vue';
  import { dictApi } from '/@/api/support/dict-api';

  defineExpose({
@@ -49,7 +50,7 @@
      default: 'default',
    },
    // 禁用标识
-    disabledFlag: {
+    disabled: {
      type: Number,
      default: null,
    },
--- a/smart-admin-web-javascript/src/components/support/dict-select/index.vue
+++ b/smart-admin-web-javascript/src/components/support/dict-select/index.vue
@@ -20,7 +20,12 @@
      @change="onChange"
      :disabled="disabled"
    >
-      <a-select-option v-for="item in dictValueList" :key="item.valueCode" :value="item.valueCode">
+      <a-select-option
+        v-for="item in dictValueList"
+        :key="item.valueCode"
+        :value="item.valueCode"
+        :disabled="disabledOption.includes(item.valueCode)"
+      >
        {{ item.valueName }}
      </a-select-option>
    </a-select>
@@ -28,7 +33,7 @@
 </template>

 <script setup>
-  import { computed, onMounted, ref, watch } from 'vue';
+  import { onMounted, ref, watch } from 'vue';
  import { dictApi } from '/@/api/support/dict-api';

  const props = defineProps({
@@ -50,10 +55,21 @@
      type: String,
      default: 'default',
    },
+    // 禁用整个下拉选择框
    disabled: {
      type: Boolean,
      default: false,
    },
+    // 需要禁用的选项字典值编码
+    disabledOption: {
+      type: Array,
+      default: () => [],
+    },
+    // 需要隐藏的选项字典值编码
+    hiddenOption: {
+      type: Array,
+      default: () => [],
+    },
  });

  // -------------------------- 查询 字典数据 --------------------------
@@ -61,7 +77,7 @@
  const dictValueList = ref([]);
  async function queryDict() {
    let res = await dictApi.valueList(props.keyCode);
-    dictValueList.value = res.data;
+    dictValueList.value = res.data.filter((item) => !props.hiddenOption.includes(item.valueCode));
  }

  onMounted(queryDict);
@@ -69,26 +85,24 @@
  // -------------------------- 选中 相关、事件 --------------------------

  const selectValue = ref(props.value);
+
  watch(
    () => props.value,
-    (value) => {
-      selectValue.value = value;
-    }
+    (newValue) => {
+      // 如果传入的值是被禁用或被隐藏的选项，则移除这些选项
+      if (Array.isArray(newValue)) {
+        selectValue.value = newValue.filter((item) => !props.disabledOption.includes(item) && !props.hiddenOption.includes(item));
+      } else {
+        selectValue.value = props.hiddenOption.includes(newValue) || props.disabledOption.includes(newValue) ? undefined : newValue;
+      }
+    },
+    { immediate: true }
  );

  const emit = defineEmits(['update:value', 'change']);
+
  function onChange(value) {
-    if (!value) {
-      emit('update:value', []);
-      emit('change', []);
-      return;
-    }
-    if (Array.isArray(value)) {
-      emit('update:value', value);
-      emit('change', value);
-    } else {
-      emit('update:value', value);
-      emit('change', value);
-    }
+    emit('update:value', value);
+    emit('change', value);
  }
 </script>
--- a/smart-admin-web-javascript/src/components/support/table-operator/index.vue
+++ b/smart-admin-web-javascript/src/components/support/table-operator/index.vue
@@ -68,7 +68,15 @@
  // 原始表格列数据（复制一份最原始的columns集合，以供后续各个地方使用）
  let originalColumn = _.cloneDeep(props.modelValue);

-  onMounted(buildUserTableColumns);
+  onMounted(() => {
+    buildUserTableColumns();
+    // 监听全屏事件 解决按下 ESC 退出全屏 fullScreenFlag 未改变导致下次第一下点击全屏无效的问题
+    addEventListener('fullscreenchange', (event) => {
+      if (document.fullscreenElement === null) {
+        fullScreenFlag.value = false;
+      }
+    });
+  });

  //构建用户的数据列
  async function buildUserTableColumns() {
--- a/smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-modal.vue
+++ b/smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-modal.vue
@@ -9,46 +9,70 @@
  *
 -->
 <template>
-  <a-modal :width="700" :open="visible" title="设置列" :destroyOnClose="true" :closable="false">
-    <a-alert type="info" show-icon class="smart-margin-bottom10">
-      <template #icon><smile-outlined /></template>
-      <template #message> 可以通过拖拽行直接修改顺序哦；（ <pushpin-outlined />为固定列，不可拖拽 ）</template>
-    </a-alert>
-    <a-table
-      id="smartTableColumnModalTable"
-      rowKey="columnKey"
-      row-class-name="column-row"
-      :columns="tableColumns"
-      :dataSource="tableData"
-      :rowSelection="{ checkStrictly: false, selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
-      :pagination="false"
-      size="small"
-      bordered
-    >
-      <template #bodyCell="{ text, record, index, column }">
-        <template v-if="column.dataIndex === 'title'">
-          <a-button type="text" :class="record.fixed ? '' : 'handle'" size="small" style="width: 100%; text-align: left">
-            <template #icon v-if="!record.fixed"> <drag-outlined /> </template>
-            <template #icon v-if="record.fixed"> <pushpin-outlined /> </template>
-            {{ text }}
-          </a-button>
+  <a-modal :width="800" :open="visible" title="设置列" :destroyOnClose="true" :closable="false">
+    <div v-if="!tableId">
+      <a-alert type="error" show-icon class="smart-margin-bottom10">
+        <template #message> 您尚未设置 TableOperator 组件的 tableId</template>
+      </a-alert>
+      <a-alert type="error" class="smart-margin-bottom10">
+        <template #message>
+          1. 请在 src\constants\support\table-id-const.js 中配置 tableId 常量
+          <br />
+          <br />
+          2. 在自己的业务表格页面组件中使用如下：
+          <br />
+          导入: import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+          <br />
+          使用: {{ '<TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.XXX" :refresh="queryData" />' }}
+          <br />
+          <br />
+          3. 具体用法可参考员工管理
        </template>
-        <template v-if="column.dataIndex === 'width'">
-          <a-input-number v-model:value="record.width" style="width: 90px; margin-left: 10px; margin-right: 3px" size="small" />px
+      </a-alert>
+    </div>
+    <div v-else>
+      <a-alert type="info" show-icon class="smart-margin-bottom10">
+        <template #icon><smile-outlined /></template>
+        <template #message> 可以通过拖拽行直接修改顺序哦；（ <pushpin-outlined />为固定列，不可拖拽 ）</template>
+      </a-alert>
+      <a-table
+        id="smartTableColumnModalTable"
+        rowKey="columnKey"
+        row-class-name="column-row"
+        :columns="tableColumns"
+        :dataSource="tableData"
+        :rowSelection="{ checkStrictly: false, selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+        :pagination="false"
+        size="small"
+        bordered
+      >
+        <template #bodyCell="{ text, record, index, column }">
+          <template v-if="column.dataIndex === 'title'">
+            <a-button type="text" :class="record.fixed ? '' : 'handle'" size="small" style="width: 100%; text-align: left">
+              <template #icon>
+                <drag-outlined v-if="!record.fixed" />
+                <pushpin-outlined v-else />
+              </template>
+              {{ text }}
+            </a-button>
+          </template>
+          <template v-if="column.dataIndex === 'width'">
+            <a-input-number v-model:value="record.width" style="width: 90px; margin-left: 10px; margin-right: 3px" size="small" />px
+          </template>
+          <template v-if="column.dataIndex === 'operate'">
+            <div class="smart-table-operate" v-if="!record.fixed">
+              <a-button @click="up(index)" v-show="index > 0" type="link" class="handle" size="small" style="margin-right: 12px"> 上移 </a-button>
+              <a-button @click="down(index)" type="link" class="handle" size="small" v-show="index !== tableData.length - 1"> 下移</a-button>
+            </div>
+          </template>
        </template>
-        <template v-if="column.dataIndex === 'operate'">
-          <div class="smart-table-operate" v-if="!record.fixed">
-            <a-button @click="up(index)" v-show="index > 0" type="link" class="handle" size="small" style="margin-right: 12px"> 上移 </a-button>
-            <a-button @click="down(index)" type="link" class="handle" size="small" v-show="index !== tableData.length - 1"> 下移</a-button>
-          </div>
-        </template>
-      </template>
-    </a-table>
+      </a-table>
+    </div>

    <template #footer>
      <a-button key="back" @click="hide">取消</a-button>
-      <a-button key="submit" type="primary" :loading="submitLoading" @click="save">保存</a-button>
-      <a-button key="back" :loading="submitLoading" @click="reset" danger style="margin-left: 20px">恢复默认</a-button>
+      <a-button v-if="tableId" key="submit" type="primary" :loading="submitLoading" @click="save">保存</a-button>
+      <a-button v-if="tableId" key="back" :loading="submitLoading" @click="reset" danger style="margin-left: 20px">恢复默认</a-button>
    </template>
  </a-modal>
 </template>
@@ -67,7 +91,7 @@
  defineExpose({ show });

  // ---------------- 显示 / 隐藏 --------------------
-  let tableId = 1;
+  let tableId = null;
  const visible = ref(false);
  //显示
  function show(columns, showTableId) {
@@ -83,6 +107,9 @@

  //获取用户的列数据
  async function getUserTableColumns(tableId, columns) {
+    if (!tableId) {
+      return;
+    }
    SmartLoading.show();
    let userTableColumnArray = [];
    try {