diff --git a/src/components/business/line-layout/index.vue b/src/components/business/line-layout/index.vue
new file mode 100644
index 0000000..d4a9b74
--- /dev/null
+++ b/src/components/business/line-layout/index.vue
@@ -0,0 +1,45 @@
+
+
+ change('x', value)" />
+ change('y', value)" />
+ change('width', value)" />
+ change('height', value)" />
+
+
+
diff --git a/src/components/modules/widgets/wGroup/wGroupStyle.vue b/src/components/modules/widgets/wGroup/wGroupStyle.vue
index 1c42533..b34cd27 100644
--- a/src/components/modules/widgets/wGroup/wGroupStyle.vue
+++ b/src/components/modules/widgets/wGroup/wGroupStyle.vue
@@ -9,12 +9,13 @@
-
+
+
@@ -44,6 +45,7 @@ import { storeToRefs } from 'pinia'
import { TUpdateWidgetPayload } from '@/store/design/widget/actions/widget'
import { TupdateLayerIndexData } from '@/store/design/widget/actions/layer'
import { TUpdateAlignData } from '@/store/design/widget/actions/align'
+import LineLayout from '@/components/business/line-layout/index.vue'
// import { useSetupMapGetters } from '@/common/hooks/mapGetters'
type TState = {
diff --git a/src/components/modules/widgets/wImage/wImageStyle.vue b/src/components/modules/widgets/wImage/wImageStyle.vue
index 1776860..ac5f60a 100644
--- a/src/components/modules/widgets/wImage/wImageStyle.vue
+++ b/src/components/modules/widgets/wImage/wImageStyle.vue
@@ -3,18 +3,19 @@
* @Date: 2021-08-09 11:41:53
* @Description:
* @LastEditors: xi_zi
- * @LastEditTime: 2024-04-03 13:44:42
+ * @LastEditTime: 2024-04-04 11:13:38
-->
-
+
+
@@ -87,6 +88,7 @@ import { useCanvasStore, useControlStore, useForceStore, useWidgetStore } from '
import { TUpdateWidgetPayload } from '@/store/design/widget/actions/widget'
import { TupdateLayerIndexData } from '@/store/design/widget/actions/layer'
import { TUpdateAlignData } from '@/store/design/widget/actions/align'
+import LineLayout from '@/components/business/line-layout/index.vue'
type TState = {
picBoxShow: boolean
diff --git a/src/components/modules/widgets/wQrcode/wQrcodeStyle.vue b/src/components/modules/widgets/wQrcode/wQrcodeStyle.vue
index cc1009a..2d89e2d 100644
--- a/src/components/modules/widgets/wQrcode/wQrcodeStyle.vue
+++ b/src/components/modules/widgets/wQrcode/wQrcodeStyle.vue
@@ -2,19 +2,20 @@
* @Author: ShawnPhang
* @Date: 2021-08-09 11:41:53
* @Description:
- * @LastEditors: ShawnPhang
- * @LastEditTime: 2023-06-29 17:53:23
+ * @LastEditors: xi_zi
+ * @LastEditTime: 2024-04-04 11:13:31
-->
-
+
+
@@ -29,7 +30,16 @@
finish('dotColor', value)" />
finish('dotColor2', value)" />
- finish('dotRotation', value)" />
+ finish('dotRotation', value)"
+ />
finish('value', value)" />
@@ -77,15 +87,16 @@ import { storeToRefs } from 'pinia'
import { useControlStore, useForceStore, useWidgetStore } from '@/store'
import { TUpdateWidgetPayload } from '@/store/design/widget/actions/widget'
import { TUpdateAlignData } from '@/store/design/widget/actions/align'
+import LineLayout from '@/components/business/line-layout/index.vue'
type TState = {
activeNames: string[]
- innerElement: TWQrcodeSetting,
- tag: boolean,
- ingoreKeys: string[],
- layerIconList: TIconItemSelectData[],
- alignIconList: TIconItemSelectData[],
- localization: QrCodeLocalizationData,
+ innerElement: TWQrcodeSetting
+ tag: boolean
+ ingoreKeys: string[]
+ layerIconList: TIconItemSelectData[]
+ alignIconList: TIconItemSelectData[]
+ localization: QrCodeLocalizationData
}
const state = reactive({
@@ -98,12 +109,10 @@ const state = reactive({
localization,
})
-
const controlStore = useControlStore()
const widgetStore = useWidgetStore()
const forceStore = useForceStore()
-
// const {
// dActiveElement, dWidgets
// } = useSetupMapGetters(['dActiveElement', 'dWidgets'])
@@ -121,7 +130,7 @@ watch(
if (Number(newValue.uuid) == -1) {
state.innerElement.cropEdit = false
widgetStore.updateWidgetData({
- uuid: lastUuid ?? "",
+ uuid: lastUuid ?? '',
key: 'cropEdit',
value: false,
})
@@ -134,7 +143,7 @@ watch(
lastUuid = newValue.uuid
}
},
- { deep: true }
+ { deep: true },
)
watch(
@@ -142,7 +151,7 @@ watch(
(newValue, oldValue) => {
changeValue()
},
- { deep: true }
+ { deep: true },
)
function created() {
@@ -168,13 +177,10 @@ function changeValue() {
for (let key in state.innerElement) {
const itemKey = key as keyof TWQrcodeSetting
if (state.ingoreKeys.indexOf(key) !== -1) {
- (dActiveElement.value as Record)[itemKey] = state.innerElement[itemKey]
- } else if (
- key !== 'setting' && key !== 'record' &&
- state.innerElement[itemKey] !== (dActiveElement.value as Record)[itemKey]
- ) {
+ ;(dActiveElement.value as Record)[itemKey] = state.innerElement[itemKey]
+ } else if (key !== 'setting' && key !== 'record' && state.innerElement[itemKey] !== (dActiveElement.value as Record)[itemKey]) {
widgetStore.updateWidgetData({
- uuid: dActiveElement.value?.uuid || "",
+ uuid: dActiveElement.value?.uuid || '',
key: key as TUpdateWidgetPayload['key'],
value: state.innerElement[itemKey] as TUpdateWidgetPayload['value'],
})
@@ -205,7 +211,7 @@ function finish(key: string, value: number | number[] | string) {
function layerAction(item: TIconItemSelectData) {
console.log(item)
widgetStore.updateLayerIndex({
- uuid: dActiveElement.value?.uuid || "",
+ uuid: dActiveElement.value?.uuid || '',
value: item.value as number,
})
// store.dispatch("updateLayerIndex", {
@@ -217,7 +223,7 @@ function layerAction(item: TIconItemSelectData) {
async function alignAction(item: TIconItemSelectData) {
widgetStore.updateAlign({
align: item.value as TUpdateAlignData['align'],
- uuid: dActiveElement.value?.uuid || "",
+ uuid: dActiveElement.value?.uuid || '',
})
// store.dispatch("updateAlign", {
// align: item.value,
@@ -237,7 +243,7 @@ async function uploadImgDone(img: TUploadDoneData) {
// this.innerElement.width = img.width
// this.innerElement.height = img.height * (this.innerElement.width / img.width)
state.innerElement.url = img.url
-
+
// store.commit('setShowMoveable', true)
controlStore.setShowMoveable(true)
}
diff --git a/src/components/modules/widgets/wSvg/wSvgStyle.vue b/src/components/modules/widgets/wSvg/wSvgStyle.vue
index b7d9047..2593289 100644
--- a/src/components/modules/widgets/wSvg/wSvgStyle.vue
+++ b/src/components/modules/widgets/wSvg/wSvgStyle.vue
@@ -9,12 +9,13 @@
-
+
+
@@ -50,6 +51,7 @@ import { storeToRefs } from 'pinia'
import { useControlStore, useWidgetStore } from '@/store'
import { TUpdateWidgetPayload } from '@/store/design/widget/actions/widget'
import { TUpdateAlignData } from '@/store/design/widget/actions/align'
+import LineLayout from '@/components/business/line-layout/index.vue'
type TState = {
activeNames: string[]
diff --git a/src/components/modules/widgets/wText/wTextStyle.vue b/src/components/modules/widgets/wText/wTextStyle.vue
index 6263835..dbf8f00 100644
--- a/src/components/modules/widgets/wText/wTextStyle.vue
+++ b/src/components/modules/widgets/wText/wTextStyle.vue
@@ -2,12 +2,13 @@
-
+
+
@@ -69,6 +70,7 @@ import { storeToRefs } from 'pinia';
import { useControlStore, useForceStore, useWidgetStore } from '@/store';
import { TUpdateWidgetPayload } from '@/store/design/widget/actions/widget';
import { TUpdateAlignData } from '@/store/design/widget/actions/align';
+import LineLayout from '@/components/business/line-layout/index.vue'
type TState = {
activeNames: string[],