super-page-designer 2.0.89 → 2.0.92

package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./fileupload-attr.vue2.js";
-/* empty css                     */
+import "./fileupload-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./input-number-attr.vue2.js";
-/* empty css                       */
+import "./input-number-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./inputtext-attr.vue2.js";
-/* empty css                    */
+import "./inputtext-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/label/label-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./label-attr.vue2.js";
-/* empty css                */
+import "./label-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/label/label-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./placeholder-attr.vue2.js";
-/* empty css                      */
+import "./placeholder-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./radio-attr.vue2.js";
-/* empty css                */
+import "./radio-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/select/select-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./select-attr.vue2.js";
-/* empty css                 */
+import "./select-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/select/select-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/select/select-design.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./select-design.vue2.js";
-/* empty css                   */
+import "./select-design.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/select/select-design.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./switch-attr.vue2.js";
-/* empty css                 */
+import "./switch-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/switch/switch-design.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./switch-design.vue2.js";
-/* empty css                   */
+import "./switch-design.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/switch/switch-design.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./tag-attr.vue2.js";
-/* empty css              */
+import "./tag-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./textarea-attr.vue2.js";
-/* empty css                   */
+import "./textarea-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.js

@@ -42,7 +42,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     function fieldChange(val, row) {
       row.fieldalias = "";
-      if (val.length == 0) return;
+      if (val.length == 0)
+        return;
       props.fieldList.forEach((item) => {
         val.forEach((Ttem) => {
           if (item.dbColumnName === Ttem) {

package/dist/es/components/design/views/assemblys/page/page-attr-base.vue.js

@@ -71,7 +71,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const systemVersion = tableInfo.systemVersion ? tableInfo.systemVersion : props.configure.systemVersion;
         queryTableFields(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
           props.configure.modelFields = tableFields;
-          changeFeieldToMap(props.configure.modelFieldsMap, tableFields);
+          props.configure.modelFieldsMap = changeFeieldToMap(props.configure.modelFieldsMap, tableFields);
           pageContextUtil.setPageContext(props.configure);
         });
       }

package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.d.ts

@@ -11,6 +11,14 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => void;
     };
+    dataFieldNameList: {
+        type: ArrayConstructor;
+        default: () => any[];
+    };
+    paramTypes: {
+        type: ArrayConstructor;
+        default: any;
+    };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     close: (...args: any[]) => void;
     remove: (...args: any[]) => void;
@@ -28,13 +36,23 @@ declare const _default: import('vue').DefineComponent<{
         type: ObjectConstructor;
         default: () => void;
     };
+    dataFieldNameList: {
+        type: ArrayConstructor;
+        default: () => any[];
+    };
+    paramTypes: {
+        type: ArrayConstructor;
+        default: any;
+    };
 }>> & {
     onClose?: (...args: any[]) => any;
     onRemove?: (...args: any[]) => any;
     onSave?: (...args: any[]) => any;
 }, {
     list: unknown[];
+    paramTypes: unknown[];
     fieldNameList: unknown[];
     fieldMap: Record<string, any>;
+    dataFieldNameList: unknown[];
 }, {}>;
 export default _default;

package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js

@@ -3,6 +3,7 @@ import { CirclePlus, Delete, Top, Bottom } from "@element-plus/icons-vue";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import "element-plus";
 import { getOperators } from "../../../../utils/data-table-util.js";
+import { getModelOptionsByFields } from "../../../../utils/page-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "combination",
   props: {
@@ -18,6 +19,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    dataFieldNameList: {
+      type: Array,
+      default: () => []
+    },
+    paramTypes: {
+      type: Array,
+      default: null
     }
   },
   emits: ["remove", "save", "close"],
@@ -27,6 +36,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const currentRow = ref({});
     const tableData = ref([]);
     const operationArr = ref([]);
+    const objModelOptions = ref([]);
+    if (props.fieldNameList && props.fieldNameList.length > 0) {
+      objModelOptions.value = getModelOptionsByFields(props.fieldNameList);
+    }
+    const dataModelOptions = ref([]);
+    let dataFieldList = props.dataFieldNameList;
+    if (!props.dataFieldNameList || props.dataFieldNameList.length === 0) {
+      dataModelOptions.value = objModelOptions.value;
+    } else {
+      dataModelOptions.value = getModelOptionsByFields(dataFieldList);
+    }
     initTable();
     function initTable() {
       tableData.value = props.list;
@@ -288,8 +308,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   createVNode(BindVariable, {
                     size: "default",
                     modelValue: scope.row.propValue,
+                    dataModelOptions: dataModelOptions.value,
+                    objModelOptions: objModelOptions.value,
+                    paramTypes: __props.paramTypes,
                     "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
-                  }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                  }, null, 8, ["modelValue", "dataModelOptions", "objModelOptions", "paramTypes", "onUpdate:modelValue"])
                 ]),
                 _: 1
               }),

package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr-base.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import _sfc_main$1 from "../../common/common-attr-size.vue.js";
-/* empty css                                    */
+import "../../form/common/dimension-input.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "pictureflow-attr-base",

package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./pictureflow-attr.vue2.js";
-/* empty css                      */
+import "./pictureflow-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr-base.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import _sfc_main$1 from "../../common/common-attr-size.vue.js";
-/* empty css                                    */
+import "../../form/common/dimension-input.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./texthistory-attr.vue2.js";
-/* empty css                      */
+import "./texthistory-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./workflowbutton-attr.vue2.js";
-/* empty css                         */
+import "./workflowbutton-attr.vue3.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/design/page-design.vue.js

@@ -94,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const systemVersion = pageDesign2.tableSysVersion ? pageDesign2.tableSysVersion : pageDesign2.systemVersion;
         queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
           pageDesign2.modelFields = tableFields;
-          changeFeieldToMap(pageDesign2.modelFieldsMap, tableFields);
+          pageDesign2.modelFieldsMap = changeFeieldToMap(pageDesign2.modelFieldsMap, tableFields);
           pageDesignUtil.setPageContext(pageDesign2);
         });
       }
@@ -164,12 +164,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return function() {
         let context = this;
         let args = arguments;
-        if (timeout) clearTimeout(timeout);
+        if (timeout)
+          clearTimeout(timeout);
         let callNow = !timeout;
         timeout = setTimeout(() => {
           timeout = null;
         }, wait);
-        if (callNow) fn.apply(context, args);
+        if (callNow)
+          fn.apply(context, args);
       };
     }
     function workflowDefVersionChange(newDef) {
@@ -332,9 +334,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             version: pageDesign.value.workflowVersion,
             "system-code": pageDesign.value.systemCode,
             "system-publish-version": pageDesign.value.systemVersion,
+            "page-code": pageDesign.value.code,
             onBack: _ctx.goBack,
             onChangeDefVersion: workflowDefVersionChange
-          }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "onBack"])), [
+          }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "page-code", "onBack"])), [
             [vShow, clickType.value === "workflow"]
           ]) : createCommentVNode("", true),
           clickType.value === "service" ? (openBlock(), createBlock(unref(ServiceFlowDesginer), {

package/dist/es/components/design/views/design/page-event/config.vue.js

@@ -1,7 +1 @@
-import _sfc_main from "./config.vue3.js";
-/* empty css            */
-import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26f79956"]]);
-export {
-  config as default
-};
+

package/dist/es/components/design/views/design/page-event/config.vue2.js

@@ -0,0 +1,7 @@
+import _sfc_main from "./config.vue3.js";
+import "./config.vue.js";
+import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
+const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26f79956"]]);
+export {
+  config as default
+};

package/dist/es/components/design/views/design/page-event/config.vue3.js

@@ -123,7 +123,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function myCompletions(context) {
       let word = context.matchBefore(/\w*|logicContext\./);
       if (word) {
-        if (word.from == word.to && !context.explicit) return null;
+        if (word.from == word.to && !context.explicit)
+          return null;
         if ((word == null ? void 0 : word.text) === "logicContext.") {
           return {
             from: word.from,

package/dist/es/components/design/views/design/page-event/page-event-content.vue.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, onMounted, onUnmounted, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, withDirectives, vShow, unref, createTextVNode, toDisplayString, Fragment, renderList, createBlock } from "vue";
 import { ElMessageBox, ElMessage } from "element-plus";
-import config from "./config.vue.js";
+import config from "./config.vue2.js";
 import { standardButtonOperations } from "../../../utils/assemblys-config.js";
 import { findDesignItemByUuid, getUuidv4, deepCopy } from "../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";

package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.js

@@ -54,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             o.name = "button-detail";
             if (option.value === "lineEditCreate") {
               options.splice(0, 0, o);
-            } else {
+            } else if (option.value != "search") {
               options.push(o);
             }
             o.index = btnIndex++;
@@ -266,6 +266,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!tableItem.items) {
         tableItem.items = [];
       }
+      debugger;
+      let displayOrderStart = 2;
       if (model.fieldInfos) {
         const templateItem = tableItem.items[tableItem.items.length - 1];
         for (let f of model.fieldInfos) {
@@ -275,7 +277,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const newColumn = deepCopy(templateItem);
           newColumn.uuid = getUuidv4();
           newColumn.name = f.componentName ? f.componentName : "";
+          newColumn.title = f.title;
+          newColumn.props.base.displayOrder = displayOrderStart++;
           newColumn.props.base.name = f.title;
+          newColumn.props.base.listColumnFixed = "false";
+          newColumn.dataType = f.dataType;
           if (f.align) {
             newColumn.props.base.alignTittle = f.align;
           }
@@ -306,6 +312,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       generateListOperateColumn(tableItem);
+      console.log("addList--------tableItem=", tableItem);
       if (!tableItem.props.dataOrigin) {
         tableItem.props.dataOrigin = {};
       }

package/dist/es/components/design/views/design/view/components/quick-add-fields.vue.js

@@ -258,7 +258,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               uuid: getUuidv4(),
               fieldName: f.dbColumnName,
               title: f.alias,
-              width: 8
+              width: 8,
+              dataType: f.dataType
             };
             if (props.model.pageType == "form") {
               if (f.type == "DATE" || f.type == "TIME") {

package/dist/es/components/design/views/design/view/page-switch.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./page-switch.vue2.js";
-/* empty css                 */
+import "./page-switch.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const PageSwitch = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-56a8e877"]]);
 export {

package/dist/es/components/design/views/design/view/page-switch.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/design/view/view-design-display.vue.js

@@ -15,7 +15,7 @@ import "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import "@codemirror/search";
-/* empty css                        */
+import "../page-event/config.vue.js";
 import "../../../utils/assemblys-config.js";
 import "../../../../../stores/page-store.js";
 import "../../../../../stores/event-undo-redo-store.js";

package/dist/es/index.js

@@ -1,5 +1,5 @@
-/* empty css                       */
-/* empty css                          */
+import "./assets/design-attr.css.js";
+import "./assets/fonts/iconfont.css.js";
 import { default as default2 } from "./components/design/views/design/page-design.vue.js";
 export {
   default2 as Design

package/dist/es/stores/page-store.js

@@ -1,6 +1,7 @@
 import { ref } from "vue";
 import { defineStore } from "pinia";
 import { FuncType } from "super-page-runtime";
+import { getModelOptionsByFields } from "../components/design/utils/page-table-util.js";
 const usePageContextStore = defineStore("pageContextUtil", () => {
   const pageContext = ref({ systemCode: "", systemVersion: -1 });
   ref([]);
@@ -15,15 +16,7 @@ const usePageContextStore = defineStore("pageContextUtil", () => {
   }
   function setPageContextVarOptions(pageObject) {
     if (pageObject && pageObject.modelFields) {
-      pageContextVarOptions.value.dataOptions = [];
-      pageObject.modelFields.forEach((element) => {
-        pageContextVarOptions.value.dataOptions.push({
-          value: element.dbColumnName,
-          // element.name
-          label: element.alias,
-          alias: element.alias
-        });
-      });
+      pageContextVarOptions.value.dataOptions = getModelOptionsByFields(pageObject.modelFields);
       pageContextVarOptions.value.pageVarOptions = setVarOptions(pageObject.variables);
     }
   }
@@ -31,7 +24,8 @@ const usePageContextStore = defineStore("pageContextUtil", () => {
     const tempVarOptions = [];
     if (variables) {
       variables.forEach((element) => {
-        if (element.name === "bbb") ;
+        if (element.name === "bbb")
+          ;
         const item = {
           code: element.code,
           value: element.name,