starfish-form-custom 1.0.25 → 1.0.27

package/dist/{formAction-a969e2cf.mjs → formAction-5fbc8d53.mjs}

@@ -11,7 +11,7 @@ import 'element-plus/es/components/button/style/css';
 import 'element-plus/es/components/tooltip/style/css';
 import { defineComponent, inject, ref, getCurrentInstance, reactive, onMounted, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, toDisplayString, createCommentVNode, createBlock, withCtx, createVNode, Fragment, renderList, withModifiers, createTextVNode } from 'vue';
 import { Codemirror } from 'vue-codemirror';
-import { _ as _export_sfc } from './main-c64812d2.mjs';
+import { _ as _export_sfc } from './main-7d7122a6.mjs';
 import 'element-plus/es/components/icon/style/css';
 import 'element-plus/es/components/checkbox/style/css';
 import '@element-plus/icons-vue';

package/dist/{index-d613dbb1.mjs → index-2249b02f.mjs}

@@ -13,9 +13,9 @@ import 'element-plus/es/components/dropdown-item/style/css';
 import 'element-plus/es/components/button/style/css';
 import 'element-plus/es/components/tooltip/style/css';
 import { defineComponent, getCurrentInstance, inject, computed, ref, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, createCommentVNode, createBlock, withCtx, createVNode, Fragment, renderList, createTextVNode } from 'vue';
-import { _ as _export_sfc, a as _, f as fieldProps, r as ruleList, b as ruleJsonData } from './main-c64812d2.mjs';
+import { _ as _export_sfc, a as _, f as fieldProps, r as ruleList, b as ruleJsonData } from './main-7d7122a6.mjs';
 import { Delete } from '@element-plus/icons-vue';
-import Dynamicform from './starfish-form-1b37792d.mjs';
+import Dynamicform from './starfish-form-96426334.mjs';
 import { Codemirror } from 'vue-codemirror';
 import 'element-plus/es/components/input/style/css';
 import 'element-plus/es/components/checkbox/style/css';

package/dist/{index-e4264580.mjs → index-a4faf6fb.mjs}

@@ -3,7 +3,7 @@ import 'element-plus/es/components/base/style/css';
 import 'element-plus/es/components/tooltip/style/css';
 import { defineComponent, ref, onMounted, onUnmounted, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, createCommentVNode, createBlock, withCtx } from 'vue';
 import E from 'wangeditor';
-import { _ as _export_sfc, g as getFormConfig, f as fieldProps, u as useWatch } from './main-c64812d2.mjs';
+import { _ as _export_sfc, g as getFormConfig, f as fieldProps, u as useWatch } from './main-7d7122a6.mjs';
 import 'element-plus/es/components/icon/style/css';
 import 'element-plus/es/components/input/style/css';
 import 'element-plus/es/components/checkbox/style/css';

package/dist/{index-2e818bbe.mjs → index-e0c4eec0.mjs}

@@ -6,7 +6,7 @@ import 'element-plus/es/components/button/style/css';
 import 'element-plus/es/components/main/style/css';
 import 'element-plus/es/components/tooltip/style/css';
 import { defineComponent, ref, onMounted, watch, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, createCommentVNode, createBlock, withCtx, createVNode, createTextVNode } from 'vue';
-import { _ as _export_sfc, a as _, g as getFormConfig, f as fieldProps, u as useWatch } from './main-c64812d2.mjs';
+import { _ as _export_sfc, a as _, g as getFormConfig, f as fieldProps, u as useWatch } from './main-7d7122a6.mjs';
 import JSONEditor from 'jsoneditor';
 import 'element-plus/es/components/icon/style/css';
 import 'element-plus/es/components/input/style/css';

package/dist/{main-c64812d2.mjs → main-7d7122a6.mjs}

@@ -4392,7 +4392,6 @@ const _sfc_main$2 = defineComponent({
       await nextTick();
       formStore.setFormCurrentId(gridList.value[index].list[e.oldIndex]?.id);
       formStore.setFormCurrentIndex(e.oldIndex);
-      console.log("grid", gridList.value[index].list);
       store.set("curList", gridList.value[index].list);
     };
     const currentId = computed(() => {
@@ -4555,27 +4554,28 @@ const _sfc_main$1 = defineComponent({
     useWatch(props);
     return {
       currentId,
-      async chooseClick(e, list, trIndex, tdIndex) {
-        props.item.data.trs[trIndex].tds[tdIndex].list = list.map((item) => {
-          return proxy.$Flex.jsonToForm(item);
+      chooseClick(e, list) {
+        list[e.oldIndex] = proxy.$Flex.jsonToForm(list[e.oldIndex]);
+        nextTick(() => {
+          formStore.setFormCurrentId(list[e.oldIndex].id);
+          formStore.setFormCurrentIndex(e.oldIndex);
+          store.set("curList", list);
         });
-        await nextTick();
-        formStore.setFormCurrentId(list[e.oldIndex].id);
-        formStore.setFormCurrentIndex(e.oldIndex);
-        console.log("table", list);
-        store.set("curList", list);
       },
       changePos(e, list) {
         formStore.setFormCurrentId(list[e.newIndex]?.id);
         formStore.setFormCurrentIndex(e.newIndex);
         store.set("curList", list);
       },
-      async addControl(e, list, trIndex, tdIndex) {
-        props.item.data.trs[trIndex].tds[tdIndex].list = list.map((item) => {
-          return proxy.$Flex.jsonToForm(item);
-        });
-        await nextTick();
-        formStore.setFormCurrentId(props.item.data.trs[trIndex].tds[tdIndex].list[e.newIndex].id);
+      addControl(e, list, trIndex, tdIndex) {
+        props.item.data.trs[trIndex].tds[tdIndex].list = list.map(
+          (item) => {
+            return proxy.$Flex.jsonToForm(item);
+          }
+        );
+        formStore.setFormCurrentId(
+          props.item.data.trs[trIndex].tds[tdIndex].list[e.newIndex].id
+        );
         formStore.setFormCurrentIndex(e.newIndex);
         store.set("curList", props.item.data.trs[trIndex].tds[tdIndex].list);
       }
@@ -5317,7 +5317,7 @@ Object.keys(files).forEach((fileName) => {
   }
 });
 const RichText = defineAsyncComponent({
-  loader: () => import('./index-e4264580.mjs'),
+  loader: () => import('./index-a4faf6fb.mjs'),
   loadingComponent: Loading
 });
 RichText.ControlType = "RichText";
@@ -5326,7 +5326,7 @@ RichText.icon = "icon-textEdit";
 RichText.formConfig = getFormConfig("RichText");
 utilFuns[RichText.ControlType] = RichText;
 const jsonEditor = defineAsyncComponent({
-  loader: () => import('./index-2e818bbe.mjs'),
+  loader: () => import('./index-e0c4eec0.mjs'),
   loadingComponent: Loading
 });
 jsonEditor.ControlType = "JsonEditor";
@@ -5336,14 +5336,14 @@ jsonEditor.formConfig = getFormConfig("JsonEditor", [{ fieldName: "default", com
 jsonEditor.rule = _.getJsonValidate();
 utilFuns[jsonEditor.ControlType] = jsonEditor;
 const formAction = defineAsyncComponent({
-  loader: () => import('./formAction-a969e2cf.mjs'),
+  loader: () => import('./formAction-5fbc8d53.mjs'),
   loadingComponent: Loading
 });
 formAction.ControlType = "FormAction";
 formAction.isHide = true;
 utilFuns[formAction.ControlType] = formAction;
 const Rule = defineAsyncComponent({
-  loader: () => import('./index-d613dbb1.mjs'),
+  loader: () => import('./index-2249b02f.mjs'),
   loadingComponent: Loading
 });
 Rule.ControlType = "Rule";
@@ -5352,7 +5352,7 @@ utilFuns[Rule.ControlType] = Rule;
 const install = (app) => {
   app.config.globalProperties.$formcomponents = utilFuns;
 };
-const Dynamicform = defineAsyncComponent(() => import('./starfish-form-1b37792d.mjs'));
+const Dynamicform = defineAsyncComponent(() => import('./starfish-form-96426334.mjs'));
 const main = {
   install
 };

package/dist/{starfish-form-1b37792d.mjs → starfish-form-96426334.mjs}

@@ -3,7 +3,7 @@ import 'element-plus/es/components/base/style/css';
 import 'element-plus/es/components/form/style/css';
 import 'element-plus/es/components/form-item/style/css';
 import { defineComponent, getCurrentInstance, ref, onMounted, openBlock, createElementBlock, createVNode, mergeProps, withCtx, Fragment, renderList, createBlock, resolveDynamicComponent, createCommentVNode, toRaw } from 'vue';
-import { _ as _export_sfc } from './main-c64812d2.mjs';
+import { _ as _export_sfc } from './main-7d7122a6.mjs';
 import 'element-plus/es/components/icon/style/css';
 import 'element-plus/es/components/input/style/css';
 import 'element-plus/es/components/checkbox/style/css';
@@ -56,6 +56,10 @@ const _sfc_main = defineComponent({
       default() {
         return {};
       }
+    },
+    readonly: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props, { emit }) {
@@ -78,7 +82,9 @@ const _sfc_main = defineComponent({
             });
           } else if (item.type == "func") {
             const mainData = props.formResult;
-            const func = eval(`((rule, value, callback, mainData = mainData) => {${item.value.func}})`);
+            const func = eval(
+              `((rule, value, callback, mainData = mainData) => {${item.value.func}})`
+            );
             result.push({
               validator: func,
               trigger: "blur"
@@ -167,7 +173,9 @@ const _sfc_main = defineComponent({
         } else {
           try {
             if (Array.isArray(item2.data.showRule)) {
-              item2.show = conditionChange(transformData(toRaw(item2.data.showRule)));
+              item2.show = conditionChange(
+                transformData(toRaw(item2.data.showRule))
+              );
             } else {
               item2.show = conditionChange(toRaw(item2.data.showRule));
             }
@@ -315,11 +323,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   ref: "controlObj",
                   onChange: _ctx.handleControlChange
                 }, _ctx.globalConfig, {
+                  readonly: _ctx.readonly,
                   item: item2,
                   data: _ctx.formResult || "{}",
                   drag: false,
                   size: "default"
-                }), null, 16, ["onChange", "item", "data"]))
+                }), null, 16, ["onChange", "readonly", "item", "data"]))
               ]),
               _: 2
             }, 1032, ["prop"])) : item2.show ? (openBlock(), createBlock(resolveDynamicComponent(item2.ControlType), mergeProps({
@@ -329,11 +338,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               onChange: _ctx.handleControlChange,
               key: item2.id
             }, _ctx.globalConfig, {
+              readonly: _ctx.readonly,
               item: item2,
               data: _ctx.formResult || "{}",
               drag: false,
               size: "default"
-            }), null, 16, ["onChange", "item", "data"])) : createCommentVNode("", true)
+            }), null, 16, ["onChange", "readonly", "item", "data"])) : createCommentVNode("", true)
           ], 64);
         }), 256))
       ]),

package/dist/starfish-form.mjs

@@ -1,4 +1,4 @@
-export { D as Dynamicform, m as default } from './main-c64812d2.mjs';
+export { D as Dynamicform, m as default } from './main-7d7122a6.mjs';
 import 'vue';
 import 'element-plus/es';
 import 'element-plus/es/components/base/style/css';

package/dist/types/form/src/main.d.ts

@@ -14,6 +14,10 @@ export declare const Dynamicform: DefineComponent<{
         type: ObjectConstructor;
         default(): {};
     };
+    readonly: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     rules: any;
     ruleForm: Ref<any>;
@@ -34,10 +38,15 @@ export declare const Dynamicform: DefineComponent<{
         type: ObjectConstructor;
         default(): {};
     };
+    readonly: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>>, {
     allFormList: any;
     formResult: Record<string, any>;
     globalConfig: Record<string, any>;
+    readonly: boolean;
 }>;
 declare const _default: {
     install: (app: App<any>) => void;

package/dist/types/form/src/starfish-form.vue.d.ts

@@ -14,6 +14,10 @@ declare const _sfc_main: DefineComponent<{
         type: ObjectConstructor;
         default(): {};
     };
+    readonly: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     rules: any;
     ruleForm: Ref<any>;
@@ -34,9 +38,14 @@ declare const _sfc_main: DefineComponent<{
         type: ObjectConstructor;
         default(): {};
     };
+    readonly: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>>, {
     allFormList: any;
     formResult: Record<string, any>;
     globalConfig: Record<string, any>;
+    readonly: boolean;
 }>;
 export default _sfc_main;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starfish-form-custom",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "main": "dist/starfish-form.mjs",
   "style": "dist/style.css",
   "module": "dist/starfish-form.mjs",

package/src/layout/grid.vue

@@ -62,7 +62,6 @@
         await nextTick();
         formStore.setFormCurrentId(gridList.value[index].list[e.oldIndex]?.id);
         formStore.setFormCurrentIndex(e.oldIndex);
-        console.log('grid', gridList.value[index].list)
         store.set("curList", gridList.value[index].list);
       };
       const currentId = computed(() => {

package/src/layout/table.vue

@@ -1,22 +1,71 @@
 <template>
   <div class="starfish-table_box">
-    <table class="table_layout" :class="item.data.borderShow ? 'table_layout_border' : ''">
+    <table
+      class="table_layout"
+      :class="item.data.borderShow ? 'table_layout_border' : ''"
+    >
       <tr v-for="(trItem, index) in item.data.trs" :key="index">
         <td v-for="(tdItem, tdIndex) in trItem.tds" :key="tdIndex">
           <template v-if="drag">
-            <draggable class="draggable-box" animation="300" ghostClass="itemGhost" v-model="tdItem.list" @add="addControl($event, tdItem.list, index, tdIndex)" group="starfish-form" @choose="chooseClick($event, tdItem.list, index, tdIndex)" item-key="id" @update="changePos($event, tdItem.list)">
+            <draggable
+              class="draggable-box"
+              animation="300"
+              ghostClass="itemGhost"
+              v-model="tdItem.list"
+              @add="addControl($event, tdItem.list, index, tdIndex)"
+              group="starfish-form"
+              @choose="chooseClick($event, tdItem.list, index, tdIndex)"
+              item-key="id"
+              @update="changePos($event, tdItem.list)"
+            >
               <template #item="{ element, index }">
-                <Shape v-if="element.data" :active="currentId == element.id" :currentIndex="index" :currentId="element.id" :len="tdItem.list.length" :item="element"> <component :is="element.ControlType" size="default" :drag="true" :item="element" :data="{}"></component></Shape>
+                <Shape
+                  v-if="element.data"
+                  :active="currentId == element.id"
+                  :currentIndex="index"
+                  :currentId="element.id"
+                  :len="tdItem.list.length"
+                  :item="element"
+                >
+                  <component
+                    :is="element.ControlType"
+                    size="default"
+                    :drag="true"
+                    :item="element"
+                    :data="{}"
+                  ></component
+                ></Shape>
               </template>
             </draggable>
           </template>
           <template v-else-if="!drag && tdItem.list.length > 0">
             <template v-for="listItem in tdItem.list">
-              <el-form-item :prop="listItem.data.fieldName"  :key="listItem.id" v-if="!listItem.layout">
-                <component ref="controlObj" @change="$emit('change')" :is="listItem.ControlType" :item="listItem" :data="data || '{}'" size="default" :drag="false" ></component>
+              <el-form-item
+                :prop="listItem.data.fieldName"
+                :key="listItem.id"
+                v-if="!listItem.layout"
+              >
+                <component
+                  ref="controlObj"
+                  @change="$emit('change')"
+                  :is="listItem.ControlType"
+                  :item="listItem"
+                  :data="data || '{}'"
+                  size="default"
+                  :drag="false"
+                ></component>
               </el-form-item>
               <template v-else>
-                <component ref="controlObj" @change="$emit('change')" size="default"  :key="listItem.id" :is="listItem.ControlType" :item="listItem" :data="data || '{}'" :drag="false" ></component>
+                <component
+                  ref="controlObj"
+                  @change="$emit('change')"
+                  size="default"
+                  :key="listItem.id"
+                  :is="listItem.ControlType"
+                  :item="listItem"
+                  :data="data || '{}'"
+                  :drag="false"
+                ></component>
               </template>
             </template>
           </template>
@@ -26,61 +75,67 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, getCurrentInstance, inject, computed, nextTick } from "vue";
-  import { getFormConfig } from "../utils/fieldConfig";
-  import fieldProps from "../utils/fieldProps";
-  import { useWatch } from "../utils/customHooks";
-  export default defineComponent({
-    ControlType: "TableLayout",
-    nameCn: "表格布局",
-    icon: "icon-biaoge1",
-    layout: true,
-    props: {
-      ...fieldProps,
-    },
-    formConfig: getFormConfig(
-      "TableLayout",
-      [
-        // { fieldName: "borderShow", component: "Switch", label: "是否显示边框" },
-        // {fieldName: 'borderWidth', component: 'InputNumber', label: "边框宽度"}
-      ],
-      ["required", "rule", "tip", "label"]
-    ),
-    setup(props) {
-      const { proxy } = getCurrentInstance() as any;
-      const { formStore, store } = inject("control") || {};
-      const currentId = computed(() => {
-        return formStore.get("currentId");
-      });
-      useWatch(props);
-      return {
-        currentId,
-        async chooseClick(e: any, list: any[], trIndex: number, tdIndex: number) {
-          props.item.data.trs[trIndex].tds[tdIndex].list = list.map((item: any) => {
-            return proxy.$Flex.jsonToForm(item);
-          });
-          await nextTick();
+import {
+  defineComponent,
+  getCurrentInstance,
+  inject,
+  computed,
+  nextTick,
+} from "vue";
+import { getFormConfig } from "../utils/fieldConfig";
+import fieldProps from "../utils/fieldProps";
+import { useWatch } from "../utils/customHooks";
+export default defineComponent({
+  ControlType: "TableLayout",
+  nameCn: "表格布局",
+  icon: "icon-biaoge1",
+  layout: true,
+  props: {
+    ...fieldProps,
+  },
+  formConfig: getFormConfig(
+    "TableLayout",
+    [
+      // { fieldName: "borderShow", component: "Switch", label: "是否显示边框" },
+      // {fieldName: 'borderWidth', component: 'InputNumber', label: "边框宽度"}
+    ],
+    ["required", "rule", "tip", "label"]
+  ),
+  setup(props) {
+    const { proxy } = getCurrentInstance() as any;
+    const { formStore, store } = inject("control") || {};
+    const currentId = computed(() => {
+      return formStore.get("currentId");
+    });
+    useWatch(props);
+    return {
+      currentId,
+      chooseClick(e: any, list: any[]) {
+        list[e.oldIndex] = proxy.$Flex.jsonToForm(list[e.oldIndex]);
+        nextTick(() => {
           formStore.setFormCurrentId(list[e.oldIndex].id);
           formStore.setFormCurrentIndex(e.oldIndex);
-          console.log('table', list);
-          store.set("curList", list);
-        },
-        changePos(e: any, list: any[]) {
-          formStore.setFormCurrentId(list[e.newIndex]?.id);
-          formStore.setFormCurrentIndex(e.newIndex);
           store.set("curList", list);
-        },
-        async addControl(e: any, list: any[], trIndex: number, tdIndex: number) {
-          props.item.data.trs[trIndex].tds[tdIndex].list = list.map((item: any) => {
+        });
+      },
+      changePos(e: any, list: any[]) {
+        formStore.setFormCurrentId(list[e.newIndex]?.id);
+        formStore.setFormCurrentIndex(e.newIndex);
+        store.set("curList", list);
+      },
+      addControl(e: any, list: any[], trIndex: number, tdIndex: number) {
+        props.item.data.trs[trIndex].tds[tdIndex].list = list.map(
+          (item: any) => {
             return proxy.$Flex.jsonToForm(item);
-          });
-          await nextTick();
-          formStore.setFormCurrentId(props.item.data.trs[trIndex].tds[tdIndex].list[e.newIndex].id);
-          formStore.setFormCurrentIndex(e.newIndex);
-          store.set("curList", props.item.data.trs[trIndex].tds[tdIndex].list);
-        },
-      };
-    },
-  });
+          }
+        );
+        formStore.setFormCurrentId(
+          props.item.data.trs[trIndex].tds[tdIndex].list[e.newIndex].id
+        );
+        formStore.setFormCurrentIndex(e.newIndex);
+        store.set("curList", props.item.data.trs[trIndex].tds[tdIndex].list);
+      },
+    };
+  },
+});
 </script>
-