Merge remote-tracking branch 'yudao/dev' into dev-to-dev

This commit is contained in:
puhui999
2023-06-24 01:48:36 +08:00
298 changed files with 1259 additions and 683 deletions

View File

@@ -167,7 +167,7 @@
<!-- 商品属性添加 Form 表单 -->
<ProductPropertyAddForm ref="attributesAddFormRef" :propertyList="propertyList" />
</template>
<script lang="ts" name="ProductSpuBasicInfoForm" setup>
<script lang="ts" setup>
import { PropType } from 'vue'
import { isArray } from '@/utils/is'
import { copyValueToTarget } from '@/utils'
@@ -200,6 +200,8 @@ const imagePreview = (args) => {
}
// ====== end ======
defineOptions({ name: 'ProductSpuBasicInfoForm' })
const message = useMessage() // 消息弹窗
const props = defineProps({

View File

@@ -26,13 +26,16 @@
</template>
</Descriptions>
</template>
<script lang="ts" name="DescriptionForm" setup>
<script lang="ts" setup>
import type { Spu } from '@/api/mall/product/spu'
import { Editor } from '@/components/Editor'
import { PropType } from 'vue'
import { propTypes } from '@/utils/propTypes'
import { copyValueToTarget } from '@/utils'
import { descriptionSchema } from './spu.data'
defineOptions({ name: 'DescriptionForm' })
const message = useMessage() // 消息弹窗
const { allSchemas } = useCrudSchemas(descriptionSchema)

View File

@@ -83,17 +83,19 @@
</template>
</Descriptions>
</template>
<script lang="ts" name="OtherSettingsForm" setup>
<script lang="ts" setup>
import type { Spu } from '@/api/mall/product/spu'
import { PropType } from 'vue'
import { propTypes } from '@/utils/propTypes'
import { copyValueToTarget } from '@/utils'
import { otherSettingsSchema } from './spu.data'
const { allSchemas } = useCrudSchemas(otherSettingsSchema)
defineOptions({ name: 'OtherSettingsForm' })
const message = useMessage() // 消息弹窗
const { allSchemas } = useCrudSchemas(otherSettingsSchema)
const props = defineProps({
propFormData: {
type: Object as PropType<Spu>,

View File

@@ -40,10 +40,12 @@
</el-col>
</template>
<script lang="ts" name="ProductAttributes" setup>
<script lang="ts" setup>
import { ElInput } from 'element-plus'
import * as PropertyApi from '@/api/mall/product/property'
defineOptions({ name: 'ProductAttributes' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const inputValue = ref('') // 输入框值

View File

@@ -17,9 +17,11 @@
</template>
</Dialog>
</template>
<script lang="ts" name="ProductPropertyAddForm" setup>
<script lang="ts" setup>
import * as PropertyApi from '@/api/mall/product/property'
defineOptions({ name: 'ProductPropertyForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗

View File

@@ -251,7 +251,7 @@
<slot name="extension"></slot>
</el-table>
</template>
<script lang="ts" name="SkuList" setup>
<script lang="ts" setup>
import { PropType, Ref } from 'vue'
import { copyValueToTarget } from '@/utils'
import { propTypes } from '@/utils/propTypes'
@@ -260,6 +260,8 @@ import type { Property, Sku, Spu } from '@/api/mall/product/spu'
import { createImageViewer } from '@/components/ImageViewer'
import { RuleConfig } from '@/views/mall/product/spu/components/index'
defineOptions({ name: 'SkuList' })
const props = defineProps({
propFormData: {
type: Object as PropType<Spu>,