-
{{i18nt('designer.widgetLabel.' + widget.type)}}
+
+ {{ i18nt('designer.widgetLabel.' + widget.type) }}
diff --git a/src/components/form-designer/form-widget/container-widget/grid-widget.vue b/src/components/form-designer/form-widget/container-widget/grid-widget.vue
index f75f91e81067a631b5ff98c2b0813ff3f08b863f..d506d24495a4474adb1374878bc80b624b55792e 100644
--- a/src/components/form-designer/form-widget/container-widget/grid-widget.vue
+++ b/src/components/form-designer/form-widget/container-widget/grid-widget.vue
@@ -9,85 +9,105 @@
-->
-
-
-
+
+
-
+
-
+
diff --git a/src/components/form-designer/form-widget/container-widget/index.js b/src/components/form-designer/form-widget/container-widget/index.js
index 79f6d00ab310199448597b23c3c405df5ab5315e..0485dd0bcfa85a87609155cc5d8f07900716f8ec 100644
--- a/src/components/form-designer/form-widget/container-widget/index.js
+++ b/src/components/form-designer/form-widget/container-widget/index.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import Vue from 'vue';
-const requireComponent = require.context('./', false, /\w+\.vue$/)
+const requireComponent = require.context('./', false, /\w+\.vue$/);
/**
* 容器组件时递归组件,且内部可以嵌套其他容器,局部注册会找不到组件,必须注册为全局组件,原因不明?!
@@ -19,6 +19,6 @@ end */
/* 全局注册!! */
requireComponent.keys().map(fileName => {
- let comp = requireComponent(fileName).default;
- Vue.component(comp.name, comp)
-})
+ let comp = requireComponent(fileName).default;
+ Vue.component(comp.name, comp);
+});
diff --git a/src/components/form-designer/form-widget/container-widget/popover-widget.vue b/src/components/form-designer/form-widget/container-widget/popover-widget.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6d2c244a065ae668c74c41d0970c60736ee5abed
--- /dev/null
+++ b/src/components/form-designer/form-widget/container-widget/popover-widget.vue
@@ -0,0 +1,83 @@
+
+
+
+
+ click 激活
+
+
+
+
+
+
+
+
+
diff --git a/src/components/form-designer/form-widget/container-widget/tab-widget.vue b/src/components/form-designer/form-widget/container-widget/tab-widget.vue
index e966aff1e5e5d9176609e83fb67b177765990b3d..5992beb0dd9fa51d5c52caac7dac0f03652ddd78 100644
--- a/src/components/form-designer/form-widget/container-widget/tab-widget.vue
+++ b/src/components/form-designer/form-widget/container-widget/tab-widget.vue
@@ -44,67 +44,67 @@
diff --git a/src/components/form-designer/form-widget/field-widget/button-widget.vue b/src/components/form-designer/form-widget/field-widget/button-widget.vue
index 758117f410595b3a9b55789edcebaf135b6289d3..5847caf03d6293c9ce4efd7c6cdda055b0c5c4a4 100644
--- a/src/components/form-designer/form-widget/field-widget/button-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/button-widget.vue
@@ -1,87 +1,98 @@
-
-
- {{field.options.label}}
+
+
+ {{ field.options.label }}
+
diff --git a/src/components/form-designer/form-widget/field-widget/cascader-widget.vue b/src/components/form-designer/form-widget/field-widget/cascader-widget.vue
index 5fa2a0ba915de7abed92977702314b283fa2922d..b173960f302a98e6aae10ed21b5044ed263c9090 100644
--- a/src/components/form-designer/form-widget/field-widget/cascader-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/cascader-widget.vue
@@ -1,120 +1,128 @@
-
-
+
diff --git a/src/components/form-designer/form-widget/field-widget/checkbox-widget.vue b/src/components/form-designer/form-widget/field-widget/checkbox-widget.vue
index b7e21b5b2f887e9ac390fb18cea4c86240d814ec..ef03efc4924868027022170f149a142be569f710 100644
--- a/src/components/form-designer/form-widget/field-widget/checkbox-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/checkbox-widget.vue
@@ -1,105 +1,129 @@
-
+
- {{item.label}}
+ {{ item.label }}
+
- {{item.label}}
+
+
+ {{ item.label }}
+
+
diff --git a/src/components/form-designer/form-widget/field-widget/color-widget.vue b/src/components/form-designer/form-widget/field-widget/color-widget.vue
index b02789c8bf46645c45759aa2b12aa6e3e6f000e4..bb12266df130223aa188807be1489ca6a02887a1 100644
--- a/src/components/form-designer/form-widget/field-widget/color-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/color-widget.vue
@@ -11,82 +11,82 @@
diff --git a/src/components/form-designer/form-widget/field-widget/date-widget.vue b/src/components/form-designer/form-widget/field-widget/date-widget.vue
index 5fd071b85d4c7b53e0170b646a62c3c979eb4dec..0e3b26b9e84e199af56dabae121c2b5cf102a9c6 100644
--- a/src/components/form-designer/form-widget/field-widget/date-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/date-widget.vue
@@ -1,103 +1,118 @@
-
-
+
+ :readonly="field.options.readonly"
+ :size="field.options.size"
+ :style="{width: field.options.inputWidth+field.options.inputWidthType}"
+ :type="field.options.type"
+ :value-format="field.options.valueFormat"
+ class="full-width-input"
+ :picker-options="optionFunction"
+ @blur="handleBlurCustomEvent"
+ @change="handleChangeEvent"
+ @focus="handleFocusCustomEvent">
diff --git a/src/components/form-designer/form-widget/field-widget/divider-widget.vue b/src/components/form-designer/form-widget/field-widget/divider-widget.vue
index a09117a2c2e9a9a3b61b242fa2472d8d715a3d0e..be70c69548bd4961f2ae427e2ac86025a1577afb 100644
--- a/src/components/form-designer/form-widget/field-widget/divider-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/divider-widget.vue
@@ -8,73 +8,73 @@
diff --git a/src/components/form-designer/form-widget/field-widget/html-text-widget.vue b/src/components/form-designer/form-widget/field-widget/html-text-widget.vue
index 6046b6546f0399be9688e991c4baab7c467226dc..d6fddd733e91fb881d43b7af4663bedcfaf993af 100644
--- a/src/components/form-designer/form-widget/field-widget/html-text-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/html-text-widget.vue
@@ -7,73 +7,73 @@
diff --git a/src/components/form-designer/form-widget/field-widget/number-widget.vue b/src/components/form-designer/form-widget/field-widget/number-widget.vue
index a68519213b0f01c102b5a77b83dd1b921a6fb03d..baca41f58211bed623045aadc993948e67df0553 100644
--- a/src/components/form-designer/form-widget/field-widget/number-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/number-widget.vue
@@ -1,103 +1,112 @@
-
-
+
diff --git a/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue b/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
index 9705220f0455103cb08831969d5a4580d96a860e..a7d97b52024e9c19e30ad749fc01eeb85b55d56c 100644
--- a/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
@@ -26,224 +26,224 @@
diff --git a/src/components/form-designer/form-widget/field-widget/slider-widget.vue b/src/components/form-designer/form-widget/field-widget/slider-widget.vue
index ecbe13c36b3e86be3616f30ddc7df8133ad014be..673b02703a4acc4994ee429dc9c22bb548f20619 100644
--- a/src/components/form-designer/form-widget/field-widget/slider-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/slider-widget.vue
@@ -12,82 +12,82 @@
diff --git a/src/components/form-designer/form-widget/field-widget/static-text-widget.vue b/src/components/form-designer/form-widget/field-widget/static-text-widget.vue
index 6962bb7d7537896ba5a934c1b56e3796a1791fbd..53f0ba5e7abb9fa712f39b8e0d5ab84ff315b274 100644
--- a/src/components/form-designer/form-widget/field-widget/static-text-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/static-text-widget.vue
@@ -1,83 +1,90 @@
-
-
- {{field.options.textContent}}
+
+
+ {{ field.options.textContent }}
+
diff --git a/src/components/form-designer/form-widget/field-widget/switch-widget.vue b/src/components/form-designer/form-widget/field-widget/switch-widget.vue
index 5b433d54a748ad94140e877e128392d4fb2cf8f4..c7873177bec86cb6bb421cd1b4d277b4acf899cb 100644
--- a/src/components/form-designer/form-widget/field-widget/switch-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/switch-widget.vue
@@ -13,82 +13,82 @@
diff --git a/src/components/form-designer/form-widget/field-widget/time-range-widget.vue b/src/components/form-designer/form-widget/field-widget/time-range-widget.vue
index 8a83704bb16ad40881046e2adc1a79bc2c0e4a5e..774143f553620c9679e3cc0df69926b056ee06ff 100644
--- a/src/components/form-designer/form-widget/field-widget/time-range-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/time-range-widget.vue
@@ -2,103 +2,105 @@
-
diff --git a/src/components/form-designer/form-widget/field-widget/time-widget.vue b/src/components/form-designer/form-widget/field-widget/time-widget.vue
index b4f15aad380c5f77dee8141ba7dcf2a3adba8ef6..889607a9be4f1086091891e69eb38639e0ebfc43 100644
--- a/src/components/form-designer/form-widget/field-widget/time-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget/time-widget.vue
@@ -1,103 +1,109 @@
-
-
+
+ :readonly="field.options.readonly"
+ :size="field.options.size"
+ :style="{width: field.options.inputWidth+field.options.inputWidthType}"
+ class="full-width-input"
+ value-format="HH:mm:ss"
+ @blur="handleBlurCustomEvent"
+ @change="handleChangeEvent"
+ @focus="handleFocusCustomEvent">
diff --git a/src/components/form-designer/form-widget/functionalUnit.vue b/src/components/form-designer/form-widget/functionalUnit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f51f9bd595b2b79dd2a70b2f1355ea254263041f
--- /dev/null
+++ b/src/components/form-designer/form-widget/functionalUnit.vue
@@ -0,0 +1,441 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/form-designer/form-widget/index.vue b/src/components/form-designer/form-widget/index.vue
index 6358dcf31a9c3e9468d046b1f8abacd2d32b1471..d796d5c4d6a4507e96dea257a0dfc9e7ff94a2c2 100644
--- a/src/components/form-designer/form-widget/index.vue
+++ b/src/components/form-designer/form-widget/index.vue
@@ -6,174 +6,187 @@
{{i18nt('designer.noWidgetHint')}}
-
+
-
+
+
+
-
+
+
-
-
+