Lijy пре 1 година
родитељ
комит
20d0a288b0

+ 101 - 147
fhKeeper/formulahousekeeper/customerBuler-crm/package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
-        "@zmjs/form-design": "^0.1.16",
+        "@zmjs/form-design": "file:../plugIn/form-design-master/update",
         "animate.css": "^4.1.1",
         "axios": "^1.6.7",
         "echarts": "^5.5.0",
@@ -32,6 +32,104 @@
         "vue-tsc": "^1.8.27"
       }
     },
+    "../plugIn/form-design-master/build": {
+      "version": "0.1.16",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vueuse/core": "^8.2.3",
+        "ace-builds": "^1.4.14",
+        "element-plus": "^2.1.10",
+        "lodash-es": "^4.17.21",
+        "prismjs": "^1.28.0",
+        "vue": "^3.2.31",
+        "vue-prism-editor": "^2.0.0-alpha.2",
+        "vuedraggable": "^4.1.0"
+      },
+      "devDependencies": {
+        "@antfu/eslint-config": "^0.18.9",
+        "@iconify/json": "^2.1.31",
+        "@iconify/utils": "^1.0.32",
+        "@types/lodash-es": "^4.17.6",
+        "@types/node": "^17.0.23",
+        "@types/prismjs": "^1.26.0",
+        "@vitejs/plugin-vue": "^2.3.1",
+        "@vitejs/plugin-vue-jsx": "^1.3.9",
+        "eslint": "^8.12.0",
+        "postcss": "^8.4.12",
+        "postcss-html": "^1.3.0",
+        "postcss-scss": "^4.0.3",
+        "rollup": "^2.70.1",
+        "sass": "^1.49.11",
+        "stylelint": "^14.6.1",
+        "stylelint-config-recess-order": "^3.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-config-standard-vue": "^1.0.0",
+        "typescript": "^4.6.3",
+        "unocss": "^0.30.11",
+        "unplugin-auto-import": "^0.6.9",
+        "unplugin-vue-components": "^0.18.5",
+        "unplugin-vue-define-options": "^0.5.0",
+        "vite": "^2.9.1",
+        "vite-plugin-libcss": "^1.0.5",
+        "vue-tsc": "^0.34.7"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/zhiyuanzmj"
+      }
+    },
+    "../plugIn/form-design-master/update": {
+      "name": "@zmjs/form-design",
+      "version": "0.1.16",
+      "license": "MIT",
+      "dependencies": {
+        "@vueuse/core": "^8.2.3",
+        "ace-builds": "^1.4.14",
+        "element-plus": "^2.1.10",
+        "lodash-es": "^4.17.21",
+        "prismjs": "^1.28.0",
+        "vue": "^3.2.31",
+        "vue-prism-editor": "^2.0.0-alpha.2",
+        "vuedraggable": "^4.1.0"
+      },
+      "devDependencies": {
+        "@antfu/eslint-config": "^0.18.9",
+        "@iconify/json": "^2.1.31",
+        "@iconify/utils": "^1.0.32",
+        "@types/lodash-es": "^4.17.6",
+        "@types/node": "^17.0.23",
+        "@types/prismjs": "^1.26.0",
+        "@vitejs/plugin-vue": "^2.3.1",
+        "@vitejs/plugin-vue-jsx": "^1.3.9",
+        "eslint": "^8.12.0",
+        "postcss": "^8.4.12",
+        "postcss-html": "^1.3.0",
+        "postcss-scss": "^4.0.3",
+        "rollup": "^2.70.1",
+        "sass": "^1.49.11",
+        "stylelint": "^14.6.1",
+        "stylelint-config-recess-order": "^3.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-config-standard-vue": "^1.0.0",
+        "typescript": "^4.6.3",
+        "unocss": "^0.30.11",
+        "unplugin-auto-import": "^0.6.9",
+        "unplugin-vue-components": "^0.18.5",
+        "unplugin-vue-define-options": "^0.5.0",
+        "vite": "^2.9.1",
+        "vite-plugin-libcss": "^1.0.5",
+        "vue-tsc": "^0.34.7"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/zhiyuanzmj"
+      }
+    },
     "node_modules/@alloc/quick-lru": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
@@ -1027,117 +1125,8 @@
       }
     },
     "node_modules/@zmjs/form-design": {
-      "version": "0.1.16",
-      "resolved": "https://registry.npmjs.org/@zmjs/form-design/-/form-design-0.1.16.tgz",
-      "integrity": "sha512-RCjB1JbV1BKJrQ14jxez8WI72oKN3JXsMkLskZyni7tVEPjmTP8s/R3ZfFzchV0FVuZ4FZnRYNYrSDxBnpqmuw==",
-      "dependencies": {
-        "@vueuse/core": "^8.2.3",
-        "ace-builds": "^1.4.14",
-        "element-plus": "^2.1.10",
-        "lodash-es": "^4.17.21",
-        "prismjs": "^1.28.0",
-        "vue": "^3.2.31",
-        "vue-prism-editor": "^2.0.0-alpha.2",
-        "vuedraggable": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/zhiyuanzmj"
-      }
-    },
-    "node_modules/@zmjs/form-design/node_modules/@types/web-bluetooth": {
-      "version": "0.0.14",
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
-      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
-    },
-    "node_modules/@zmjs/form-design/node_modules/@vueuse/core": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.9.4.tgz",
-      "integrity": "sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==",
-      "dependencies": {
-        "@types/web-bluetooth": "^0.0.14",
-        "@vueuse/metadata": "8.9.4",
-        "@vueuse/shared": "8.9.4",
-        "vue-demi": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.1.0",
-        "vue": "^2.6.0 || ^3.2.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@zmjs/form-design/node_modules/@vueuse/core/node_modules/@vueuse/shared": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.9.4.tgz",
-      "integrity": "sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==",
-      "dependencies": {
-        "vue-demi": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.1.0",
-        "vue": "^2.6.0 || ^3.2.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@zmjs/form-design/node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
-      "hasInstallScript": true,
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@zmjs/form-design/node_modules/@vueuse/metadata": {
-      "version": "8.9.4",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.9.4.tgz",
-      "integrity": "sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==",
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/ace-builds": {
-      "version": "1.32.7",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.32.7.tgz",
-      "integrity": "sha512-ziv35kaYELFw4suWlotz/Xsl1/1LhWAbwFoD3zIgCgP9gXGECEsAM4GhiB0T0xZdmQjyv6hmAzO280g0+n4vGw=="
+      "resolved": "../plugIn/form-design-master/update",
+      "link": true
     },
     "node_modules/animate.css": {
       "version": "4.1.1",
@@ -2377,14 +2366,6 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
-    "node_modules/prismjs": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
-      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -2618,11 +2599,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/sortablejs": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
-      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
-    },
     "node_modules/source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
@@ -2984,17 +2960,6 @@
         }
       }
     },
-    "node_modules/vue-prism-editor": {
-      "version": "2.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/vue-prism-editor/-/vue-prism-editor-2.0.0-alpha.2.tgz",
-      "integrity": "sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.0"
-      }
-    },
     "node_modules/vue-router": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.0.tgz",
@@ -3036,17 +3001,6 @@
         "typescript": "*"
       }
     },
-    "node_modules/vuedraggable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
-      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
-      "dependencies": {
-        "sortablejs": "1.14.0"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.1"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@zmjs/form-design": "^0.1.16",
+    "@zmjs/form-design": "file:../plugIn/form-design-master/update",
     "animate.css": "^4.1.1",
     "axios": "^1.6.7",
     "echarts": "^5.5.0",

+ 0 - 2
fhKeeper/formulahousekeeper/plugIn/form-design-master/src/generate/GenerateForm.vue

@@ -108,7 +108,6 @@ export default defineComponent({
             })
               .then(resp => resp.json())
               .then((json) => {
-                console.log(json)
                 const res = json.data
                 if (res instanceof Array) {
                   item.options.remoteOptions = res.map(data => ({
@@ -116,7 +115,6 @@ export default defineComponent({
                     value: data[item.options.props.value],
                     children: data[item.options.props.children],
                   }))
-                  console.log(item.options.remoteOptions , '<== 最终的数据')
                 }
               })
           }