bm-admin-ui 1.0.50-alpha → 1.0.51-alpha

package/es/components/form-create/index.js

@@ -1537,6 +1537,15 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           createElementVNode("span", _hoisted_3$3, toDisplayString(unref(countText)), 1),
           createElementVNode("div", _hoisted_4$3, [
             unref(importFeature) && !__props.hidden ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+              createElementVNode("input", {
+                ref_key: "inputRef",
+                ref: inputRef,
+                style: { "display": "none" },
+                name: "file",
+                type: "file",
+                accept: "text/csv",
+                onChange: handleChange
+              }, null, 544),
               createVNode(unref(Button), {
                 disabled: __props.disabled,
                 onClick: handleDownload
@@ -1554,16 +1563,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                   createTextVNode("\u6279\u91CF\u5BFC\u5165")
                 ]),
                 _: 1
-              }, 8, ["disabled"]),
-              createElementVNode("input", {
-                ref_key: "inputRef",
-                ref: inputRef,
-                style: { "display": "none" },
-                name: "file",
-                type: "file",
-                accept: "text/csv",
-                onChange: handleChange
-              }, null, 544)
+              }, 8, ["disabled"])
             ], 64)) : createCommentVNode("v-if", true),
             unref(deleteFeature) && !__props.hidden ? (openBlock(), createBlock(unref(Button), {
               key: 1,
@@ -3152,7 +3152,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           } else if (name === "materialTemp") {
             rule2.props.disabled = formPermission.disabled;
           } else {
-            rule2.props.disabled = true;
+            if (!rule2.props) {
+              rule2.props = {
+                disabled: true
+              };
+            } else {
+              rule2.props.disabled = true;
+            }
           }
         }
         if (formPermission.hidden) {

package/es/components/form-designer/index.js

@@ -1,5 +1,5 @@
 import { withInstall } from 'bm-admin-ui/es/utils/with-install';
-import { defineComponent, openBlock, createElementBlock, normalizeStyle, toDisplayString, computed, resolveComponent, normalizeClass, unref, createBlock, createCommentVNode, withCtx, createVNode, createTextVNode, withModifiers, ref, watch, createElementVNode, nextTick, Fragment, isRef, renderList, renderSlot, createStaticVNode, reactive, onBeforeUnmount, resolveDynamicComponent } from 'vue';
+import { defineComponent, openBlock, createElementBlock, normalizeStyle, toDisplayString, computed, resolveComponent, normalizeClass, unref, createBlock, createCommentVNode, withCtx, createVNode, createTextVNode, withModifiers, ref, watch as watch$1, createElementVNode, nextTick, Fragment, isRef, renderList, renderSlot, createStaticVNode, reactive, onBeforeUnmount, resolveDynamicComponent } from 'vue';
 import uniqueId from 'bm-admin-ui/es/utils/uniqueId';
 import Draggable from 'vuedraggable';
 import { Tooltip, FormItemRest, Input, Button, RadioGroup, Radio, DatePicker, Checkbox, Tabs, TabPane, Row, Col, Dropdown, Menu, CheckboxGroup, MenuItem, Divider, Switch, Select, Layout, LayoutSider, LayoutContent, message } from 'ant-design-vue';
@@ -848,7 +848,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     function emitSetValue(val) {
       emits("setValue", val);
     }
-    watch(
+    watch$1(
       props.options,
       (val) => {
         handleRepeatOption(val);
@@ -1235,10 +1235,21 @@ var checkbox = {
 const _hoisted_1$b = { class: "bm-default-date" };
 const _sfc_main$d = /* @__PURE__ */ defineComponent({
   __name: "default-date",
-  props: ["defaultRadioValue", "defalueDateValue"],
+  props: [
+    "defaultRadioValue",
+    "defalueDateValue",
+    "formCreateInject"
+  ],
   emits: ["change"],
   setup(__props, { emit: emits }) {
     const props = __props;
+    const format = computed(
+      () => props.formCreateInject.api.getRule("props.format").value
+    );
+    const extraProps = computed(() => ({
+      picker: format.value === "YYYY-MM" ? "month" : "",
+      showTime: format.value === "YYYY-MM-DD HH:mm"
+    }));
     const radioValue = ref(props.defaultRadioValue);
     const dateValue = ref(props.defalueDateValue);
     function emitChange(dateValue2) {
@@ -1253,6 +1264,9 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       dateValue.value = date;
       emitChange(date);
     }
+    watch(format, () => {
+      handleDateChange("");
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$b, [
         createVNode(unref(FormItemRest), null, {
@@ -1290,11 +1304,13 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
               key: 0,
               style: { width: "100%", marginTop: "8px" },
               value: dateValue.value,
-              format: "YYYY-MM-DD",
-              "value-format": "YYYY-MM-DD",
+              format: unref(format),
+              "value-format": unref(format),
+              picker: unref(extraProps).picker,
+              "show-time": unref(extraProps).showTime,
               placeholder: "\u8BF7\u9009\u62E9",
               onChange: handleDateChange
-            }, null, 8, ["value"])) : createCommentVNode("v-if", true)
+            }, null, 8, ["value", "format", "value-format", "picker", "show-time"])) : createCommentVNode("v-if", true)
           ]),
           _: 1
         })
@@ -2509,7 +2525,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       uploadPicRule.hidden = uploadPictureRule.hidden;
       rules.value = [...rules.value];
     }
-    watch(
+    watch$1(
       () => props.formCreateInject.rule.config.uploadPictureRule,
       handleUploadPicRule,
       {
@@ -2728,8 +2744,15 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
   __name: "product-info",
   props: ["formCreateInject"],
   setup(__props) {
+    const props = __props;
+    const isInTable = computed(
+      () => props.formCreateInject.api.config.parentType === "TableWidget"
+    );
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(Row), null, {
+      return unref(isInTable) ? (openBlock(), createBlock(unref(Input), {
+        key: 0,
+        placeholder: "\u8BF7\u8F93\u5165"
+      })) : (openBlock(), createBlock(unref(Row), { key: 1 }, {
         default: withCtx(() => [
           createVNode(unref(Col), {
             class: "bm-product-info-item",
@@ -2758,7 +2781,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
           }), 128))
         ]),
         _: 1
-      });
+      }));
     };
   }
 });
@@ -2826,7 +2849,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       emitChangeEvt();
     }
     init();
-    watch(visible, (val) => {
+    watch$1(visible, (val) => {
       visibleChange(val);
     });
     return (_ctx, _cache) => {
@@ -2993,10 +3016,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         }
       });
     }
-    watch(checkedValue, (checkedValue2) => {
+    watch$1(checkedValue, (checkedValue2) => {
       checkedValueChange(checkedValue2);
     });
-    watch(selectValue, (selectValue2, oldSelectValue) => {
+    watch$1(selectValue, (selectValue2, oldSelectValue) => {
       selectValueChange(selectValue2);
       shopLinkProduct(selectValue2, oldSelectValue);
       handleChange(selectValue2);
@@ -3649,7 +3672,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     function getPopupContainer() {
       return document.body;
     }
-    watch(
+    watch$1(
       childRules,
       (val) => {
         emits("change", val);
@@ -3807,11 +3830,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           rule.props.autoSize = true;
         }
         if (rule.config.config.name === "product" && parentType === WidgetType.TableWidget) {
-          rule.type = "input";
-          delete rule.component;
           rule.title.title = "\u5546\u54C1\u7F16\u53F7";
-          rule.props = {};
-          rule.props.placeholder = "\u8BF7\u8F93\u5165";
         }
       }
     });
@@ -4126,7 +4145,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         requiredRule.props.disabled = !!flowCondition[activeRule.value.field];
       }
     }
-    watch(
+    watch$1(
       () => props.formRules,
       (formRules) => {
         formRules && edit(formRules);
@@ -4135,10 +4154,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         immediate: true
       }
     );
-    watch(activeProps, (activeProps2) => {
+    watch$1(activeProps, (activeProps2) => {
       flowConditionEffect(activeProps2, props.flowCondition);
     });
-    watch(
+    watch$1(
       () => props.flowCondition,
       (flowCondition) => {
         flowConditionEffect(activeProps.value, flowCondition);

package/lib/components/form-create/index.js

@@ -1547,6 +1547,15 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
           vue.createElementVNode("span", _hoisted_3$3, vue.toDisplayString(vue.unref(countText)), 1),
           vue.createElementVNode("div", _hoisted_4$3, [
             vue.unref(importFeature) && !__props.hidden ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+              vue.createElementVNode("input", {
+                ref_key: "inputRef",
+                ref: inputRef,
+                style: { "display": "none" },
+                name: "file",
+                type: "file",
+                accept: "text/csv",
+                onChange: handleChange
+              }, null, 544),
               vue.createVNode(vue.unref(antDesignVue.Button), {
                 disabled: __props.disabled,
                 onClick: handleDownload
@@ -1564,16 +1573,7 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
                   vue.createTextVNode("\u6279\u91CF\u5BFC\u5165")
                 ]),
                 _: 1
-              }, 8, ["disabled"]),
-              vue.createElementVNode("input", {
-                ref_key: "inputRef",
-                ref: inputRef,
-                style: { "display": "none" },
-                name: "file",
-                type: "file",
-                accept: "text/csv",
-                onChange: handleChange
-              }, null, 544)
+              }, 8, ["disabled"])
             ], 64)) : vue.createCommentVNode("v-if", true),
             vue.unref(deleteFeature) && !__props.hidden ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Button), {
               key: 1,
@@ -3162,7 +3162,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           } else if (name === "materialTemp") {
             rule2.props.disabled = formPermission.disabled;
           } else {
-            rule2.props.disabled = true;
+            if (!rule2.props) {
+              rule2.props = {
+                disabled: true
+              };
+            } else {
+              rule2.props.disabled = true;
+            }
           }
         }
         if (formPermission.hidden) {

package/lib/components/form-designer/index.js

@@ -1245,10 +1245,21 @@ var checkbox = {
 const _hoisted_1$b = { class: "bm-default-date" };
 const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
   __name: "default-date",
-  props: ["defaultRadioValue", "defalueDateValue"],
+  props: [
+    "defaultRadioValue",
+    "defalueDateValue",
+    "formCreateInject"
+  ],
   emits: ["change"],
   setup(__props, { emit: emits }) {
     const props = __props;
+    const format = vue.computed(
+      () => props.formCreateInject.api.getRule("props.format").value
+    );
+    const extraProps = vue.computed(() => ({
+      picker: format.value === "YYYY-MM" ? "month" : "",
+      showTime: format.value === "YYYY-MM-DD HH:mm"
+    }));
     const radioValue = vue.ref(props.defaultRadioValue);
     const dateValue = vue.ref(props.defalueDateValue);
     function emitChange(dateValue2) {
@@ -1263,6 +1274,9 @@ const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
       dateValue.value = date;
       emitChange(date);
     }
+    watch(format, () => {
+      handleDateChange("");
+    });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$b, [
         vue.createVNode(vue.unref(antDesignVue.FormItemRest), null, {
@@ -1300,11 +1314,13 @@ const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
               key: 0,
               style: { width: "100%", marginTop: "8px" },
               value: dateValue.value,
-              format: "YYYY-MM-DD",
-              "value-format": "YYYY-MM-DD",
+              format: vue.unref(format),
+              "value-format": vue.unref(format),
+              picker: vue.unref(extraProps).picker,
+              "show-time": vue.unref(extraProps).showTime,
               placeholder: "\u8BF7\u9009\u62E9",
               onChange: handleDateChange
-            }, null, 8, ["value"])) : vue.createCommentVNode("v-if", true)
+            }, null, 8, ["value", "format", "value-format", "picker", "show-time"])) : vue.createCommentVNode("v-if", true)
           ]),
           _: 1
         })
@@ -2738,8 +2754,15 @@ const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
   __name: "product-info",
   props: ["formCreateInject"],
   setup(__props) {
+    const props = __props;
+    const isInTable = vue.computed(
+      () => props.formCreateInject.api.config.parentType === "TableWidget"
+    );
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Row), null, {
+      return vue.unref(isInTable) ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
+        key: 0,
+        placeholder: "\u8BF7\u8F93\u5165"
+      })) : (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Row), { key: 1 }, {
         default: vue.withCtx(() => [
           vue.createVNode(vue.unref(antDesignVue.Col), {
             class: "bm-product-info-item",
@@ -2768,7 +2791,7 @@ const _sfc_main$9 = /* @__PURE__ */ vue.defineComponent({
           }), 128))
         ]),
         _: 1
-      });
+      }));
     };
   }
 });
@@ -3817,11 +3840,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           rule.props.autoSize = true;
         }
         if (rule.config.config.name === "product" && parentType === WidgetType.TableWidget) {
-          rule.type = "input";
-          delete rule.component;
           rule.title.title = "\u5546\u54C1\u7F16\u53F7";
-          rule.props = {};
-          rule.props.placeholder = "\u8BF7\u8F93\u5165";
         }
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-admin-ui",
-  "version": "1.0.50-alpha",
+  "version": "1.0.51-alpha",
   "private": false,
   "description": "An Admin Component Library for Bm",
   "license": "UNLICENSED",