wui-components-v2 1.1.41 → 1.1.42

package/components/form-control/form-control.vue

@@ -1,11 +1,16 @@
 <script lang="ts" setup>
-import { computed, defineExpose, defineOptions, defineProps, onBeforeMount, ref, toRaw } from 'vue'
-import type { FormRules } from 'wot-design-uni/components/wd-form/types'
+import { computed, onBeforeMount, ref, toRaw } from 'vue'
+import type { FormSchema, FormSchemaIssue } from '@wot-ui/ui/components/wd-form/types'
 import dayjs from 'dayjs/esm/index'
 import type { Enums, Fields, Groups } from '../../type'
 import mulselectPicker from '../mulselect-picker/mulselect-picker.vue'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
-// import SelectColPicker from '../select-col-picker/select-col-picker.vue'
+import { useCompanyFieldFilter } from '../../composables/useCompanyFieldFilter'
+import customSelectPicker from '../custom-select-picker/custom-select-picker.vue'
+import CustomDatePicker from '../custom-date-picker/custom-date-picker.vue'
+import addAddressPage from '../add-address-page/add-address-page.vue'
+import userChoose from '../user-choose/user-choose.vue'
+import { generateHighResolutionID } from '../../utils/index'
 // import { enums } from '../../api/page'
 defineOptions({
   name: 'FormControl',
@@ -14,6 +19,9 @@ const props = defineProps<{
   fieldGroup?: Groups
   entity?: { [key: string]: string }
   enumColumn?: Enums
+  companyFilter?: boolean
+  companyFieldSourceId?: string
+  smartPaste?: boolean
 }>()
 const fileTypes = [
   {
@@ -35,12 +43,13 @@ const hydrocarbonProgramToken = ref<string>('')
 const token = ref<string>('')
 const form = ref<any>(null)
 const model = ref<any>({})
-const fields = computed(() => {
-  return props.fieldGroup?.fields.filter((item) => {
-    return item
-    // return !item.title?.endsWith('y')// 排除字符串的最后一个字符为y的项
-  })
-})
+  const addEvent = generateHighResolutionID()// 全局事件名称
+const { filteredFields: fields } = useCompanyFieldFilter(
+  () => props.fieldGroup,
+  model,
+  props.companyFilter, // 是否自适应显示快递公司填充框
+  props.companyFieldSourceId, //  快递公司对应字段
+)
 // 初始化表单数据
 function initFormData() {
   const models: { [key: string]: any } = {}
@@ -81,30 +90,36 @@ onBeforeMount(() => {
   token.value = uni.getStorageSync('TOKEN')
   initFormData()
 })
+function formatSelectColumns(columns: any) {
+  return columns.map((item: any) => {
+    return {
+      ...item,
+      label: item.title,
+    }
+  })
+}
 
-const rules = computed((): FormRules => {
-  return props.fieldGroup?.fields.reduce((acc: any, item: Fields) => {
-    if (item.required) {
-      acc[item.sourceId] = [{
-        required: item.required,
-        message: `请填写${item.title}`,
-        validator: (value: any) => {
+const schema = computed((): FormSchema => {
+  return {
+    validate(_model: Record<string, any>): FormSchemaIssue[] {
+      const issues: FormSchemaIssue[] = []
+      props.fieldGroup?.fields.forEach((item: Fields) => {
+        if (item.required) {
+          const value = _model[item.sourceId]
           if (Array.isArray(value) && value.length < 1) {
-            return Promise.reject(new Error(`请填写${item.title}`))
+            issues.push({ path: [item.sourceId], message: `请填写${item.title}` })
           }
-          else {
-            if (value) {
-              return Promise.resolve()
-            }
-            return Promise.reject(new Error(`请填写${item.title}`))
+          else if (!value) {
+            issues.push({ path: [item.sourceId], message: `请填写${item.title}` })
           }
-        },
-
-      }]
-    }
-
-    return acc
-  }, {})
+        }
+      })
+      return issues
+    },
+    isRequired(path: string) {
+      return props.fieldGroup?.fields.some(f => f.sourceId === path && f.required) ?? false
+    },
+  }
 })
 
 // 监听文件上传成功
@@ -161,175 +176,241 @@ defineExpose({
 
 <template>
   <view>
-    <wd-form ref="form" :model="model" :rules="rules" error-type="toast">
-      <wd-cell-group border>
-        <view v-for="item in fields" :key="item.sourceId">
-          <view v-show="!item.title?.includes('y') && !item.hidden">
+    <wd-form ref="form" :model="model" :schema="schema" error-type="toast" :label-width="120" class="custom-from-style">
+      <addAddressPage  v-if="props.smartPaste" v-model="model" :group="props.fieldGroup" />
+      <view v-for="item in fields" :key="item.sourceId">
+        <view v-show="!item.title?.includes('y') && !item.hidden">
+          <wd-form-item
+            v-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'text'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
             <wd-input
-              v-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'text'"
               v-model="model[item.sourceId]"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
               :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
               :placeholder="`请输入${item.title}`"
             />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'decimal'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
             <wd-input
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'decimal'"
               v-model="model[item.sourceId]"
               type="number"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
               :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
               :placeholder="`请输入${item.title}`"
             />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'password'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
             <wd-input
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'password'"
               v-model="model[item.sourceId]"
               show-password
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
               :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
               :placeholder="`请输入${item.title}`"
             />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'textarea'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
             <wd-textarea
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'textarea'"
               v-model="model[item.sourceId]"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
               :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
               :placeholder="`请输入${item.title}`"
               auto-height
             />
-            <wd-select-picker
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'select'"
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'select'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+            :style="{ display: item.title?.includes('y') ? 'none' : null }"
+          >
+            <customSelectPicker
               v-model="model[item.sourceId]"
-              :style="{ display: item.title?.includes('y') ? 'none' : null }"
+              :placeholder="`请选择${item.title}`"
+              :columns="(enumColumn && formatSelectColumns(enumColumn[item.mstrucId]))"
               type="radio"
-              :columns="(enumColumn && enumColumn[item.mstrucId])"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
-              :readonly="item.disabled || item.rowEditType === 'readonly'"
-              :clearable="!item.disabled"
-              :placeholder="`请输入${item.title}`"
-              label-key="title"
-              filterable
             />
-            <wd-select-picker
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'multiselect'"
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relselect-extdis'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+            :style="{ display: item.title?.includes('y') ? 'none' : null }"
+          >
+            <userChoose
               v-model="model[item.sourceId]"
+              :placeholder="`请选择${item.title}`"
+              :source-id="item.sourceId"
+              :title="item.title"
+              :add-event="addEvent"
+              :ext-control-type="item.extControlType"
+            />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'multiselect'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <customSelectPicker
+              v-model="model[item.sourceId]"
+              :placeholder="`请选择${item.title}`"
+              :columns="(enumColumn && formatSelectColumns(enumColumn[item.mstrucId]))"
               type="checkbox"
-              :columns="(enumColumn && enumColumn[item.mstrucId])"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
-              :readonly="item.disabled || item.rowEditType === 'readonly'"
-              :clearable="!item.disabled"
-              :placeholder="`请输入${item.title}`"
-              label-key="title"
-              filterable
             />
-            <wd-calendar
-              v-else-if=" ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'date'"
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'date'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <customDatePicker
               v-model="model[item.sourceId]"
               type="date"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
-              :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
-              :placeholder="`请输入${item.title}`"
+              :placeholder="`请选择${item.title}`"
             />
-            <wd-calendar
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'datetime'"
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'datetime'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <customDatePicker
               v-model="model[item.sourceId]"
               type="datetime"
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
-              :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
-              :placeholder="`请输入${item.title}`"
+              :placeholder="`请选择${item.title}`"
             />
-            <wd-datetime-picker
-              v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'time'"
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'time'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <customDatePicker
               v-model="model[item.sourceId]"
               type="time"
               use-second
-              :label="item.title"
-              label-width="100px"
-              :prop="item.sourceId"
-              :readonly="item.disabled || item.rowEditType === 'readonly'"
               :clearable="!item.disabled"
-              :placeholder="`请输入${item.title}`"
+              :placeholder="`请选择${item.title}`"
             />
-            <wd-cell v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'file' || ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relfile' " :prop="item.sourceId" :title="item.title" title-width="100px">
-              <wd-radio-group v-if="!item.disabled" v-model="fileType" inline shape="dot" custom-class="custom-radio">
-                <wd-radio v-for="(titem, index) in fileTypes" :key="index" :value="titem.value">
-                  {{ titem.label }}
-                </wd-radio>
-              </wd-radio-group>
-              <wd-upload
-                :accept="fileType"
-                :disabled="item.disabled || item.rowEditType === 'readonly'"
-                :limit="1"
-                :header="{ 'hydrocarbon-program-token': hydrocarbonProgramToken, 'hydrocarbon-token': token }"
-                :file-list="model[item.sourceId]"
-                :action="`${action}/v3/upload`"
-                @success="(e) => { handleFileChange(e, item) }"
-              />
-            </wd-cell>
-            <wd-cell v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relselect'" :style="{ display: item.title?.includes('y') ? 'none' : null }" :prop="item.sourceId" :title="item.title" title-width="100px">
-              <mulselectPicker v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="Number(item.max) === 1 ? 'relselect' : 'ss' " :readonly="item.disabled || item.rowEditType === 'readonly'" :clearable="!item.disabled" />
-            </wd-cell>
-            <wd-cell v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relselectvalue'" :prop="item.sourceId" :title="item.title" title-width="100px">
-              <mulselectPicker v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="item.extControlType " :readonly="item.disabled || item.rowEditType === 'readonly'" :clearable="!item.disabled" />
-            </wd-cell>
-            <wd-cell v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'tree-entity-select' || ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'table-entity-select'" :prop="item.sourceId" :title="item.title" title-width="100px">
-              <mulselectPicker v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="Number(item.max) === 1 ? 'relselect' : 'ss' " :readonly="item.disabled || item.rowEditType === 'readonly'" :clearable="!item.disabled" fold-card-model="complex" />
-            </wd-cell>
-            <!-- <wd-cell v-if="item.extControlType === 'tree-entity-select'" :prop="item.sourceId" :title="item.title" title-width="100px">
-            <TreeSelectControl v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="item.extControlType " :readonly="item.disabled" :clearable="!item.disabled" />
-          </wd-cell> -->
-            <wd-cell v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'int' " :title="item.title" title-width="100px" :prop="item.sourceId">
-              <view style="text-align: left">
-                <wd-input-number v-model="model[item.sourceId]" :disabled="item.disabled || item.rowEditType === 'readonly'" :min="Number(item.min || 0)" :max="Number(item.max || Infinity)" />
-              </view>
-            </wd-cell>
-            <wd-cell v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'yes-no-switch' " :title="item.title" title-width="100px" :prop="item.sourceId">
-              <view style="text-align: left">
-                <wd-switch v-model="model[item.sourceId]" size="16" :disabled="item.disabled || item.rowEditType === 'readonly'" active-value="是" inactive-value="否" />
-              </view>
-            </wd-cell>
-          <!-- <SelectColPicker
-            v-if="item.extControlType === 'tree-entity-select' "
-            v-model="model[item.sourceId]"
-            :source-id="item.sourceId"
-            :label="item.title"
-            label-width="100px"
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'file' || ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relfile'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
             :prop="item.sourceId"
-            :readonly="item.disabled"
-            :clearable="!item.disabled"
-            :placeholder="`请输入${item.title}`"
-          /> -->
-          </view>
+            :title="item.title"
+          >
+            <wd-radio-group v-if="!item.disabled" v-model="fileType" inline shape="dot" custom-class="custom-radio">
+              <wd-radio v-for="(titem, index) in fileTypes" :key="index" :value="titem.value">
+                {{ titem.label }}
+              </wd-radio>
+            </wd-radio-group>
+            <wd-upload
+              :accept="fileType"
+              :disabled="item.disabled || item.rowEditType === 'readonly'"
+              :limit="1"
+              :header="{ 'hydrocarbon-program-token': hydrocarbonProgramToken, 'hydrocarbon-token': token }"
+              :file-list="model[item.sourceId]"
+              :action="`${action}/v3/upload`"
+              @success="(e) => { handleFileChange(e, item) }"
+            />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relselect'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+            :style="{ display: item.title?.includes('y') ? 'none' : null }"
+          >
+            <mulselectPicker v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="Number(item.max) === 1 ? 'relselect' : 'ss' " :readonly="item.disabled || item.rowEditType === 'readonly'" :clearable="!item.disabled" />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'relselectvalue'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <mulselectPicker v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="item.extControlType " :readonly="item.disabled || item.rowEditType === 'readonly'" :clearable="!item.disabled" />
+          </wd-form-item>
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'tree-entity-select' || ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'table-entity-select'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <mulselectPicker v-model="model[item.sourceId]" :source-id="item.sourceId" :title="item.title" :ext-control-type="Number(item.max) === 1 ? 'relselect' : 'ss' " :readonly="item.disabled || item.rowEditType === 'readonly'" :clearable="!item.disabled" fold-card-model="complex" />
+          </wd-form-item>
+          <!-- done -->
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'int'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <view style="text-align: left">
+              <wd-input-number v-model="model[item.sourceId]" :disabled="item.disabled || item.rowEditType === 'readonly'" :min="Number(item.min || 0)" :max="Number(item.max || Infinity)" />
+            </view>
+          </wd-form-item>
+          <!-- done -->
+          <wd-form-item
+            v-else-if="ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'yes-no-switch'"
+            :class="{ 'no-border-top': fields.indexOf(item) === 0 }"
+            :prop="item.sourceId"
+            :title="item.title"
+          >
+            <view style="text-align: left">
+              <wd-switch v-model="model[item.sourceId]" size="16" :disabled="item.disabled || item.rowEditType === 'readonly'" active-value="是" inactive-value="否" />
+            </view>
+          </wd-form-item>
         </view>
-      </wd-cell-group>
+      </view>
     </wd-form>
   </view>
 </template>
 
 <style scoped>
+.custom-from-style {
+
 :deep(.custom-radio){
   display: flex;
   padding: 4px;
 }
+
+:deep(.wd-form-item .wd-cell__wrapper){
+  gap: 12px;
+}
+:deep(.wd-form-item){
+  border-top: 0.6px solid #e8e8e8;
+  padding: 12px 6px;
+  margin: auto 6px;
+  width:calc(100% - 12px);
+}
+:deep(.no-border-top){
+  border-top: none;
+}
+}
 </style>

package/components/global-loading/global-loading.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { storeToRefs } from 'pinia'
-import { useToast } from 'wot-design-uni'
+import { useToast } from '@wot-ui/ui'
 import { defineOptions, nextTick, ref, watch } from 'vue'
 import { useGlobalLoading } from '../../composables/useGlobalLoading'
 import { getCurrentPath } from '../../utils/index'

package/components/global-message/global-message.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
-import { deepClone, isFunction } from 'wot-design-uni/components/common/util'
+import { CommonUtil, useDialog } from '@wot-ui/ui'
 import { storeToRefs } from 'pinia'
-import { useMessage } from 'wot-design-uni'
 import { defineOptions, nextTick, ref, watch } from 'vue'
 import { useGlobalMessage } from '../../composables/useGlobalMessage'
 import { getCurrentPath } from '../../utils/index'
@@ -12,7 +11,7 @@ defineOptions({
 
 const { messageOptions, currentPage } = storeToRefs(useGlobalMessage())
 
-const messageBox = useMessage('globalMessage')
+const dialog = useDialog()
 const currentPath = getCurrentPath()
 
 // #ifdef MP-ALIPAY
@@ -26,20 +25,25 @@ nextTick(() => {
 watch(() => messageOptions.value, (newVal) => {
   if (newVal) {
     if (currentPage.value === currentPath) {
-      const option = deepClone(newVal)
-      messageBox.show(option).then((res) => {
-        if (isFunction(option.success)) {
+      const option = CommonUtil.deepClone(newVal)
+      const method = option.type === 'confirm'
+        ? 'confirm'
+        : option.type === 'prompt'
+          ? 'prompt'
+          : 'alert'
+      dialog[method](option).then((res) => {
+        if (CommonUtil.isFunction(option.success)) {
           option.success(res)
         }
       }).catch((err) => {
-        if (isFunction(option.fail)) {
+        if (CommonUtil.isFunction(option.fail)) {
           option.fail(err)
         }
       })
     }
   }
   else {
-    messageBox.close()
+    dialog.close()
   }
 })
 </script>
@@ -56,9 +60,9 @@ export default {
 
 <template>
   <!-- #ifdef MP-ALIPAY -->
-  <wd-message-box v-if="hackAlipayVisible" selector="globalMessage" />
+  <wd-dialog v-if="hackAlipayVisible" />
   <!-- #endif -->
   <!-- #ifndef MP-ALIPAY -->
-  <wd-message-box selector="globalMessage" />
+  <wd-dialog />
   <!-- #endif -->
 </template>

package/components/global-toast/global-toast.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { storeToRefs } from 'pinia'
-import { useToast } from 'wot-design-uni'
+import { useToast } from '@wot-ui/ui'
 import { defineOptions, nextTick, ref, watch } from 'vue'
 import { useGlobalToast } from '../../composables/useGlobalToast'
 import { getCurrentPath } from '../../utils/index'

package/components/list-top-buttons/list-top-buttons.vue

@@ -14,7 +14,7 @@ function gotoAddPage() {
 </script>
 
 <template>
-  <view class="flex justify-end gap-1 .light:bg-white">
-    <wd-button v-if="buttons.includes('dtmplAdd')" type="icon" icon="add" @click="gotoAddPage" />
+  <view class="flex justify-end gap-1 py-2 pr-2 .light:bg-white">
+    <wd-icon v-if="buttons.includes('dtmplAdd')" name="plus" size="24px" class="text-[#6b7280]" @click="gotoAddPage" />
   </view>
 </template>

package/components/mulselect-picker/mulselect-picker.vue

@@ -75,8 +75,8 @@ function clearSelect() {
       <view class="h-3px w-17px" />
     </view>
     <view v-if="clearable" class="absolute bottom-0 right-0 top-0">
-      <wd-icon v-if="selectformatData" name="error-fill" size="17px" @click.stop="clearSelect" />
-      <wd-icon v-else name="arrow-right" size="17px" />
+      <wd-icon v-if="selectformatData" name="close-circle" size="17px" @click.stop="clearSelect" />
+      <wd-icon v-else name="right" size="17px" />
     </view>
   </view>
 </template>

package/components/privacy-popup/privacy-popup.vue

@@ -128,7 +128,7 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-@import 'wot-design-uni/components/wd-button/index.scss';
+@import '@wot-ui/ui/components/wd-button/index.scss';
 :deep(.wd-privacy-popup) {
   width: 600rpx;
   padding: 0 24rpx;

package/components/product-card/product-card.vue

@@ -53,7 +53,7 @@ function isControlType(item: Columns): string {
           :src="props.mainPicture ? formatItemData(props.data.fieldMap[props.mainPicture.sourceId], (isControlType(props.mainPicture) && isControlType(props.mainPicture)[0]))?.url ? formatItemData(props.data.fieldMap[props.mainPicture.sourceId], (isControlType(props.mainPicture) && isControlType(props.mainPicture)[0]))?.url : 'https://' : 'https://'"
         >
           <template #error>
-            <wd-status-tip>
+            <wd-empty>
               <template #image>
                 <view class="h-100px w-160px">
                   <!-- 图片占位 -->
@@ -64,7 +64,7 @@ function isControlType(item: Columns): string {
                   <!-- <svg t="1770269817485" class="icon w-full h-full" viewBox="0 0 1574 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10847" width="200" height="200"><path d="M994.927445 125.981073h-613.753943c-48.454259 0-87.217666 38.763407-87.217666 87.217665v613.753943c0 48.454259 38.763407 87.217666 87.217666 87.217666h613.753943c48.454259 0 87.217666-38.763407 87.217665-87.217666v-613.753943c0-48.454259-38.763407-87.217666-87.217665-87.217665z m-468.391167 206.73817c38.763407 0 71.066246 32.302839 71.066246 71.066246 0 38.763407-32.302839 71.066246-71.066246 71.066246-38.763407 0-71.066246-32.302839-71.066246-71.066246 0-38.763407 32.302839-71.066246 71.066246-71.066246z m-145.362776 449.009464l155.053627-197.047319 109.829653 132.44164 155.053628-197.047318 197.047319 261.652997H381.173502z" fill="#C3DEFA" p-id="10848"></path><path d="M1169.362776 235.810726h-613.753943c-48.454259 0-87.217666 38.763407-87.217666 87.217665v613.753943c0 48.454259 38.763407 87.217666 87.217666 87.217666h613.753943c48.454259 0 87.217666-38.763407 87.217666-87.217666V323.028391c0-48.454259-38.763407-87.217666-87.217666-87.217665z m-468.391167 206.73817c38.763407 0 71.066246 32.302839 71.066246 71.066246s-32.302839 71.066246-71.066246 71.066246c-38.763407 0-71.066246-32.302839-71.066246-71.066246s32.302839-71.066246 71.066246-71.066246z m-145.362776 449.009464l155.053628-197.047319 109.829653 132.44164 155.053627-197.047318 197.047319 261.652997H555.608833z m0 0" fill="#3A95F2" p-id="10849"></path><path d="M177.665615 784.958991H122.750789v-54.914827c0-12.921136-9.690852-22.611987-22.611988-22.611987-12.921136 0-22.611987 9.690852-22.611987 22.611987v54.914827H22.611987c-12.921136 0-22.611987 9.690852-22.611987 22.611987 0 12.921136 9.690852 22.611987 22.611987 22.611987h54.914827v54.914827c0 12.921136 9.690852 22.611987 22.611987 22.611987 12.921136 0 22.611987-9.690852 22.611988-22.611987v-54.914827h54.914826c12.921136 0 22.611987-9.690852 22.611988-22.611987 0-12.921136-9.690852-22.611987-22.611988-22.611987z m0 0M100.138801 432.858044h122.750789v122.750789H100.138801zM1288.883281 93.678233c0 35.533123 29.072555 61.375394 61.375394 61.375395 35.533123 0 61.375394-29.072555 61.375394-61.375395 0-35.533123-29.072555-61.375394-61.375394-61.375394-35.533123 0-61.375394 25.842271-61.375394 61.375394z m0 0" fill="#C3DEFA" p-id="10850"></path><path d="M1569.917981 794.649842l-93.678233-93.678233c-6.460568-6.460568-16.15142-6.460568-22.611988 0l-96.908517 93.678233c-6.460568 6.460568-6.460568 16.15142 0 22.611988l93.678233 93.678233c6.460568 6.460568 16.15142 6.460568 22.611988 0l93.678233-93.678233c9.690852-6.460568 9.690852-16.15142 3.230284-22.611988z m-106.599369 80.757098L1392.252366 807.570978l71.066246-71.066246 71.066246 71.066246-71.066246 67.835962zM303.646688 12.921136C297.18612 6.460568 290.725552 0 281.0347 0H45.223975C35.533123 0 29.072555 6.460568 22.611987 12.921136c-3.230284 9.690852 0 19.381703 6.460568 25.842271l119.520505 119.520505c3.230284 3.230284 9.690852 6.460568 16.151419 6.460567s9.690852-3.230284 12.921136-9.690851l119.520505-119.520505c6.460568-3.230284 6.460568-12.921136 6.460568-22.611987z m-138.902209 96.908517l-64.605678-64.605678h132.441641l-67.835963 64.605678z" fill="#3A95F2" p-id="10851"></path></svg> -->
                 </view>
               </template>
-            </wd-status-tip>
+            </wd-empty>
           </template>
           <template #loading>
             <view class="h-full flex items-center justify-center">