Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

9a382530 · YunaiV · 8d8ada17 · 7993c32f · 9a382530 · 9a382530
Commit 9a382530 authored Mar 01, 2025 by YunaiV
12 changed files
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -105,7 +105,7 @@ const editorConfig = computed((): IEditorConfig => {
          },
          // 超时时间，默认为 10 秒
-          timeout: 5 * 1000, // 5 秒
+          timeout: 15 * 1000, // 15 秒
          // form-data fieldName，后端接口参数名称，默认值wangeditor-uploaded-image
          fieldName: 'file',

--- a/src/views/ai/model/chatModel/index.vue
+++ b/src/views/ai/model/chatModel/index.vue
@@ -58,8 +58,8 @@
          <dict-tag :type="DICT_TYPE.AI_PLATFORM" :value="scope.row.platform" />
        </template>
      </el-table-column>
-      <el-table-column label="模型名字" align="center" prop="name" />
+      <el-table-column label="模型名字" align="center" prop="name" min-width="120" />
-      <el-table-column label="模型标识" align="center" prop="model" />
+      <el-table-column label="模型标识" align="center" prop="model" min-width="120" />
      <el-table-column label="API 秘钥" align="center" prop="keyId" min-width="140">
        <template #default="scope">
          <span>{{ apiKeyList.find((item) => item.id === scope.row.keyId)?.name }}</span>

--- a/src/views/bpm/processInstance/index.vue
+++ b/src/views/bpm/processInstance/index.vue
@@ -75,7 +75,7 @@
              <Icon icon="ep:plus" class="mr-5px" />高级筛选
            </el-button>
          </template>
-          <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
+          <!-- <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
            <el-select
              v-model="queryParams.category"
              placeholder="请选择流程发起人"
@@ -89,7 +89,7 @@
                :value="category.code"
              />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <el-form-item
            label="所属流程"
            class="bold-label"

--- a/src/views/bpm/task/done/index.vue
+++ b/src/views/bpm/task/done/index.vue
@@ -81,7 +81,7 @@
            </el-button>
          </template>
-          <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
+          <!-- <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
            <el-select
              v-model="queryParams.category"
              placeholder="请选择流程发起人"
@@ -95,7 +95,7 @@
                :value="category.code"
              />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <el-form-item label="发起时间" class="bold-label" label-position="top" prop="createTime">
            <el-date-picker
              v-model="queryParams.createTime"
@@ -170,7 +170,7 @@
          {{ formatPast2(scope.row.durationInMillis) }}
        </template>
      </el-table-column>
-      <el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" />
+      <el-table-column align="center" label="流程编号" prop="processInstanceId" :show-overflow-tooltip="true" />
      <el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
      <el-table-column align="center" label="操作" fixed="right" width="80">
        <template #default="scope">
@@ -193,7 +193,7 @@ import { dateFormatter, formatPast2 } from '@/utils/formatTime'
 import * as TaskApi from '@/api/bpm/task'
 import { CategoryApi, CategoryVO } from '@/api/bpm/category'
-defineOptions({ name: 'BpmTodoTask' })
+defineOptions({ name: 'BpmDoneTask' })
 const { push } = useRouter() // 路由

--- a/src/views/bpm/task/manager/index.vue
+++ b/src/views/bpm/task/manager/index.vue
@@ -87,7 +87,7 @@
          {{ formatPast2(scope.row.durationInMillis) }}
        </template>
      </el-table-column>
-      <el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" />
+      <el-table-column align="center" label="流程编号" prop="processInstanceId" :show-overflow-tooltip="true" />
      <el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
      <el-table-column align="center" label="操作" fixed="right" width="80">
        <template #default="scope">

--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -64,7 +64,7 @@
            </el-button>
          </template>
-          <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
+          <!-- <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
            <el-select
              v-model="queryParams.category"
              placeholder="请选择流程发起人"
@@ -78,7 +78,7 @@
                :value="category.code"
              />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <el-form-item label="发起时间" class="bold-label" label-position="top" prop="createTime">
            <el-date-picker
              v-model="queryParams.createTime"
@@ -135,7 +135,7 @@
        prop="createTime"
        width="180"
      />
-      <el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" />
+      <el-table-column align="center" label="流程编号" prop="processInstanceId" :show-overflow-tooltip="true" />
      <el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
      <el-table-column align="center" label="操作" fixed="right" width="80">
        <template #default="scope">

--- a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
@@ -200,7 +200,7 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .kefu {
-  background-color: #e5e4e4;
+  background-color: var(--app-content-bg-color);
  &-conversation {
    height: 60px;

--- a/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
@@ -373,7 +373,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
 <style lang="scss" scoped>
 .kefu {
-  background-color: #f5f5f5;
+  background-color: var(--app-content-bg-color);
  position: relative;
  width: calc(100% - 300px - 260px);
@@ -389,7 +389,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
  }
  .kefu-header {
-    background-color: #f5f5f5;
+    background-color: var(--app-content-bg-color);
    position: relative;
    display: flex;
    align-items: center;
@@ -511,7 +511,7 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
  ::v-deep(textarea) {
    resize: none;
-    background-color: #f5f5f5;
+    background-color: var(--app-content-bg-color);
  }
  :deep(.el-input__wrapper) {

--- a/src/views/mall/promotion/kefu/components/member/MemberInfo.vue
+++ b/src/views/mall/promotion/kefu/components/member/MemberInfo.vue
@@ -167,7 +167,7 @@ const getUserData = async () => {
 .kefu {
  position: relative;
  width: 300px !important;
-  background-color: #f5f5f5;
+  background-color: var(--app-content-bg-color);
  &::after {
    content: '';
@@ -181,7 +181,7 @@ const getUserData = async () => {
  }
  &-header {
-    background-color: #f5f5f5;
+    background-color: var(--app-content-bg-color);
    position: relative;
    display: flex;
    align-items: center;

--- a/src/views/mall/promotion/kefu/components/message/OrderItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/OrderItem.vue
@@ -112,7 +112,7 @@ function formatOrderStatus(order: any) {
  border-radius: 10px;
  padding: 10px;
  border: 1px var(--el-border-color) solid;
-  background-color: #fff; // 透明色，暗黑模式下也能体现
+  background-color: rgba(128, 128, 128, 0.3); // 透明色，暗黑模式下也能体现
  .order-card-header {
    height: 28px;

--- a/src/views/mall/promotion/kefu/components/message/ProductItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/ProductItem.vue
@@ -77,7 +77,8 @@ const openDetail = (spuId: number) => {
 .product-warp {
  width: 100%;
-  background-color: #fff;
+  background-color: rgba(128, 128, 128, 0.3);
+  border: 1px solid var(--el-border-color);
  border-radius: 8px;
  display: flex;
  align-items: center;

--- a/src/views/mall/trade/order/detail/index.vue
+++ b/src/views/mall/trade/order/detail/index.vue
@@ -334,13 +334,13 @@ onMounted(async () => {
  // 如果配送方式为快递，则查询物流公司
  if (formData.value.deliveryType === DeliveryTypeEnum.EXPRESS.type) {
    deliveryExpressList.value = await DeliveryExpressApi.getSimpleDeliveryExpressList()
-    if (form.value.logisticsId) {
+    if (formData.value.logisticsId) {
      expressTrackList.value = await TradeOrderApi.getExpressTrackList(formData.value.id!)
    }
  } else if (formData.value.deliveryType === DeliveryTypeEnum.PICK_UP.type) {
-    pickUpStore.value = await DeliveryPickUpStoreApi.getDeliveryPickUpStore(
+    if (formData.value.pickUpStoreId) {
-      formData.value.pickUpStoreId
+      pickUpStore.value = await DeliveryPickUpStoreApi.getDeliveryPickUpStore(formData.value.pickUpStoreId)
-    )
+    }
  }
 })
 </script>